Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,7 @@ properties:
- qcom,pm8994
- qcom,pm8998
- qcom,pma8084
- qcom,pmau0102
- qcom,pmc8180
- qcom,pmc8180c
- qcom,pmc8380
Expand All @@ -95,6 +96,7 @@ properties:
- qcom,pmk8550
- qcom,pmk8850
- qcom,pmm8155au
- qcom,pmm8650au
- qcom,pmm8654au
- qcom,pmp8074
- qcom,pmr735a
Expand Down
2 changes: 2 additions & 0 deletions Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,7 @@ properties:
- qcom,pm8994-gpio
- qcom,pm8998-gpio
- qcom,pma8084-gpio
- qcom,pmau0102-gpio
- qcom,pmc8180-gpio
- qcom,pmc8180c-gpio
- qcom,pmc8380-gpio
Expand All @@ -75,6 +76,7 @@ properties:
- qcom,pmk8550-gpio
- qcom,pmk8850-gpio
- qcom,pmm8155au-gpio
- qcom,pmm8650au-gpio
- qcom,pmm8654au-gpio
- qcom,pmp8074-gpio
- qcom,pmr735a-gpio
Expand Down
2 changes: 2 additions & 0 deletions arch/arm64/boot/dts/qcom/nord-embedded.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
#include <dt-bindings/soc/qcom,rpmh-rsc.h>

#include "nord.dtsi"
#include "pmm8650au-nord.dtsi"
#include "pmau0102-nord.dtsi"

/ {
clk_virt: interconnect-clk-virt {
Expand Down
9 changes: 4 additions & 5 deletions arch/arm64/boot/dts/qcom/nord-ride-sx.dts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator.h>

#include "nord-embedded.dtsi"
#include "nord-pmics.dtsi"

/ {
model = "Qualcomm Technologies, Inc. Nord Ride SX";
Expand Down Expand Up @@ -74,7 +73,7 @@
regulator-name = "usb2_vbus";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
gpio = <&pmic_h_gpios 3 GPIO_ACTIVE_HIGH>;
gpio = <&pmau0102_h_gpios 3 GPIO_ACTIVE_HIGH>;
enable-active-high;
regulator-always-on;
};
Expand Down Expand Up @@ -533,7 +532,7 @@

vdd1v8-supply = <&vreg_l3l_1p8>;

reset-gpios = <&pmic_i_gpios 9 GPIO_ACTIVE_LOW>;
reset-gpios = <&pmau0102_i_gpios 9 GPIO_ACTIVE_LOW>;
};

usb1_repeater: redriver@4f {
Expand All @@ -543,7 +542,7 @@

vdd1v8-supply = <&vreg_l3l_1p8>;

reset-gpios = <&pmic_i_gpios 10 GPIO_ACTIVE_LOW>;
reset-gpios = <&pmau0102_i_gpios 10 GPIO_ACTIVE_LOW>;
};

usb2_repeater: redriver@47 {
Expand All @@ -553,7 +552,7 @@

vdd1v8-supply = <&vreg_l3l_1p8>;

reset-gpios = <&pmic_l_gpios 3 GPIO_ACTIVE_LOW>;
reset-gpios = <&pmau0102_l_gpios 3 GPIO_ACTIVE_LOW>;
};
};

Expand Down
4 changes: 3 additions & 1 deletion arch/arm64/boot/dts/qcom/nord.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -1721,15 +1721,17 @@
reg = <0x0 0x0c400000 0x0 0x3000>,
<0x0 0x0c500000 0x0 0x400000>,
<0x0 0x0c440000 0x0 0x80000>,
<0x0 0x0c4c0000 0x0 0x20000>,
<0x0 0x0c4c0000 0x0 0x10000>,
<0x0 0x0c42d000 0x0 0x4000>;
reg-names = "core",
"chnls",
"obsrvr",
"intr",
"cnfg";
cell-index = <0>;
qcom,channel = <0>;
qcom,ee = <0>;
qcom,bus-id = <0>;
interrupts-extended = <&pdc 1 IRQ_TYPE_LEVEL_HIGH>;
interrupt-names = "periph_irq";
interrupt-controller;
Expand Down
Loading