Skip to content

Commit dd41599

Browse files
krishnachaitanya-linuxZiyue Zhang
authored andcommitted
FROMLIST: arm64: dts: qcom: msm8996: Move PCIe phy and
The PCIe phy reference and the perst/wake GPIO properties are per root port and belong in the root port node (pcie@0), not in the RC controller node. Move phys and phy-names from the controller to pcie0_port0, pcie1_port0, and pcie2_port0, adding labels to these nodes to allow board-level overrides. Move perst-gpios/wake-gpios from the controller overrides to the respective port nodes in the board files, renaming perst-gpios to reset-gpios to match the binding used in the root port context. Signed-off-by: Krishna Chaitanya Chundru <krishna.chaitanya.chundru@oss.qualcomm.com> Link: https://lore.kernel.org/all/20260611-wake-v2-37-2744251b1181@oss.qualcomm.com/
1 parent d7d9017 commit dd41599

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

arch/arm64/boot/dts/qcom/msm8996-oneplus-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -210,7 +210,7 @@
210210
};
211211

212212
&pcie0 {
213-
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
213+
&pcie0_port0 {
214214
vddpe-3v3-supply = <&wlan_en>;
215215
vdda-supply = <&vreg_l28a_0p925>;
216216
status = "okay";

arch/arm64/boot/dts/qcom/msm8996-sony-xperia-tone.dtsi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@
191191
};
192192

193193
&pcie0 {
194-
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
195-
wake-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
194+
reset-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
195+
&pcie0_port0 {
196196
vddpe-3v3-supply = <&wlan_en>;
197197
vdda-supply = <&pm8994_l28>;
198198
status = "okay";

arch/arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@
279279
vddpe-3v3-supply = <&wlan_en>;
280280
vdda-supply = <&vreg_l28a_0p925>;
281281

282-
perst-gpios = <&tlmm 35 GPIO_ACTIVE_LOW>;
282+
&pcie0_port0 {
283283
wake-gpios = <&tlmm 37 GPIO_ACTIVE_LOW>;
284284
};
285285

arch/arm64/boot/dts/qcom/msm8996.dtsi

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1901,7 +1901,7 @@
19011901
reg-names = "parf", "dbi", "elbi","config";
19021902

19031903
phys = <&pciephy_0>;
1904-
phy-names = "pciephy";
1904+
phys = <&pciephy_0>;
19051905

19061906
#address-cells = <3>;
19071907
#size-cells = <2>;
@@ -1951,7 +1951,7 @@
19511951
"bus_master",
19521952
"bus_slave";
19531953

1954-
pcie@0 {
1954+
pcie0_port0: pcie@0 {
19551955
device_type = "pci";
19561956
reg = <0x0 0x0 0x0 0x0 0x0>;
19571957
bus-range = <0x01 0xff>;
@@ -1978,7 +1978,7 @@
19781978
reg-names = "parf", "dbi", "elbi","config";
19791979

19801980
phys = <&pciephy_1>;
1981-
phy-names = "pciephy";
1981+
phys = <&pciephy_1>;
19821982

19831983
#address-cells = <3>;
19841984
#size-cells = <2>;
@@ -2028,7 +2028,7 @@
20282028
"bus_master",
20292029
"bus_slave";
20302030

2031-
pcie@0 {
2031+
pcie1_port0: pcie@0 {
20322032
device_type = "pci";
20332033
reg = <0x0 0x0 0x0 0x0 0x0>;
20342034
bus-range = <0x01 0xff>;
@@ -2053,7 +2053,7 @@
20532053
reg-names = "parf", "dbi", "elbi","config";
20542054

20552055
phys = <&pciephy_2>;
2056-
phy-names = "pciephy";
2056+
phys = <&pciephy_2>;
20572057

20582058
#address-cells = <3>;
20592059
#size-cells = <2>;
@@ -2102,7 +2102,7 @@
21022102
"bus_master",
21032103
"bus_slave";
21042104

2105-
pcie@0 {
2105+
pcie2_port0: pcie@0 {
21062106
device_type = "pci";
21072107
reg = <0x0 0x0 0x0 0x0 0x0>;
21082108
bus-range = <0x01 0xff>;

0 commit comments

Comments
 (0)