Skip to content

FROMGIT: arm64: dts: qcom: hamoa: Fix incomplete Root Port property migration #571

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sgaud-quic merged 1 commit into from
May 13, 2026
Merged

FROMGIT: arm64: dts: qcom: hamoa: Fix incomplete Root Port property migration #571

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 10 additions & 6 deletions arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1032,9 +1032,6 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

Expand All @@ -1048,10 +1045,12 @@
status = "okay";
};

&pcie6a {
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
};

&pcie6a {
vddpe-3v3-supply = <&vreg_nvme>;

pinctrl-0 = <&pcie6a_default>;
Expand All @@ -1067,6 +1066,11 @@
status = "okay";
};

&pcie6a_port0 {
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
};

&pm8550_gpios {
rtmr0_default: rtmr0-reset-n-active-state {
pins = "gpio10";
Expand Down
24 changes: 15 additions & 9 deletions arch/arm64/boot/dts/qcom/x1-crd.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1299,15 +1299,17 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

status = "okay";
};

&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
};

&pcie4_phy {
vdda-phy-supply = <&vreg_l3i_0p8>;
vdda-pll-supply = <&vreg_l3e_1p2>;
Expand All @@ -1316,9 +1318,6 @@
};

&pcie5 {
perst-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>;

vddpe-3v3-supply = <&vreg_wwan>;

pinctrl-0 = <&pcie5_default>;
Expand All @@ -1334,10 +1333,12 @@
status = "okay";
};

&pcie6a {
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
&pcie5_port0 {
reset-gpios = <&tlmm 149 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 151 GPIO_ACTIVE_LOW>;
};

&pcie6a {
vddpe-3v3-supply = <&vreg_nvme>;

pinctrl-names = "default";
Expand All @@ -1353,6 +1354,11 @@
status = "okay";
};

&pcie6a_port0 {
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
};

&pm8550_gpios {
kypd_vol_up_n: kypd-vol-up-n-state {
pins = "gpio6";
Expand Down
14 changes: 8 additions & 6 deletions arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1081,9 +1081,6 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

Expand All @@ -1098,6 +1095,9 @@
};

&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;
Expand All @@ -1115,9 +1115,6 @@
};

&pcie6a {
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;

vddpe-3v3-supply = <&vreg_nvme>;

pinctrl-0 = <&pcie6a_default>;
Expand All @@ -1126,6 +1123,11 @@
status = "okay";
};

&pcie6a_port0 {
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
};

&pcie6a_phy {
vdda-phy-supply = <&vreg_l1d_0p8>;
vdda-pll-supply = <&vreg_l2j_1p2>;
Expand Down
14 changes: 8 additions & 6 deletions arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1065,9 +1065,6 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

Expand All @@ -1082,6 +1079,9 @@
};

&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;
Expand All @@ -1099,9 +1099,6 @@
};

&pcie6a {
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;

vddpe-3v3-supply = <&vreg_nvme>;

pinctrl-0 = <&pcie6a_default>;
Expand All @@ -1110,6 +1107,11 @@
status = "okay";
};

&pcie6a_port0 {
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
};

&pcie6a_phy {
vdda-phy-supply = <&vreg_l1d_0p8>;
vdda-pll-supply = <&vreg_l2j_1p2>;
Expand Down
6 changes: 3 additions & 3 deletions arch/arm64/boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1177,9 +1177,6 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

Expand All @@ -1194,6 +1191,9 @@
};

&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;
Expand Down
14 changes: 8 additions & 6 deletions arch/arm64/boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1082,9 +1082,6 @@
};

&pcie4 {
perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

pinctrl-0 = <&pcie4_default>;
pinctrl-names = "default";

Expand All @@ -1099,6 +1096,9 @@
};

&pcie4_port0 {
reset-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;

wifi@0 {
compatible = "pci17cb,1107";
reg = <0x10000 0x0 0x0 0x0 0x0>;
Expand All @@ -1116,9 +1116,6 @@
};

&pcie6a {
perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;

vddpe-3v3-supply = <&vreg_nvme>;

pinctrl-0 = <&pcie6a_default>;
Expand All @@ -1134,6 +1131,11 @@
status = "okay";
};

&pcie6a_port0 {
reset-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
};

&pm8550_pwm {
status = "okay";
};
Expand Down