Skip to contentSkip to conversation

arm64: dts: qcom: x1-dell-thena: Move PERST and Wake GPIOs to PCIe port nodes

PATCH Applied Val Packett 2 participants 3 messages Mar 12 – May 13

Subsystems (3)
Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support
lore
Share & tools
lore

Val Packett

author
#0 lore raw

PATCH v4 1/2 arm64: dts: qcom: x1-dell-thena: Move PERST and Wake GPIOs to PCIe port nodes

Recently the DTs for most Hamoa-based devices received this change, but the Thena dtsi (common for Dell Latitude and Inspiron SKUs) was skipped. Apply the change to it.

Fixes 960609b22be5 ("arm64: dts: qcom: hamoa: Move PHY, PERST, and Wake GPIOs to PCIe port nodes and add port Nodes for all PCIe ports")
Reviewed-by Dmitry Baryshkov <[email protected]>
Reviewed-by Konrad Dybcio <[email protected]>
Reviewed-by Abel Vesa <[email protected]>
Signed-off-by Val Packett <[email protected]>

---
v4: Pull R-b and actually use the correct 'reset-gpios' instead of 'perst-gpios'
(oops! 3 reviews and now I spotted it while reviewing a different patch)
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: https://lore.kernel.org/all/[email protected]/

---
 arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi +8 -6
index bf04a12b16bc..d5018fdbdedb 100644
@@ -1081,9 +1081,6 @@ &mdss_dp3_phy {
 };
 
 &pcie4 {
-	perst-gpios = <&tlmm 146 GPIO_ACTIVE_LOW>;
-	wake-gpios = <&tlmm 148 GPIO_ACTIVE_LOW>;
-
 	pinctrl-0 = <&pcie4_default>;
 	pinctrl-names = "default";
 

@@ -1098,6 +1095,9 @@ &pcie4_phy {
 };
 
 &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>;

@@ -1115,9 +1115,6 @@ wifi@0 {
 };
 
 &pcie6a {
-	perst-gpios = <&tlmm 152 GPIO_ACTIVE_LOW>;
-	wake-gpios = <&tlmm 154 GPIO_ACTIVE_LOW>;
-
 	vddpe-3v3-supply = <&vreg_nvme>;
 
 	pinctrl-0 = <&pcie6a_default>;

@@ -1133,6 +1130,11 @@ &pcie6a_phy {
 	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";
Signature · 1 line
2.52.0
author
#1 lore raw

PATCH v4 2/2 arm64: dts: qcom: x1-dell-thena: remove i2c20 (battery SMBus) and reserve its pins

i2c20 is used by the battmgr service on the ADSP to communicate with the SBS interface of the battery. Initializing it from Linux would break the battmgr functionality when booted in EL2. Mark those pins as reserved.

Fixes e7733b42111c ("arm64: dts: qcom: Add support for Dell Inspiron 7441 / Latitude 7455")
Reviewed-by Konrad Dybcio <[email protected]>
Reviewed-by Abel Vesa <[email protected]>
Signed-off-by Val Packett <[email protected]>

---
v4: Pull R-b
v3: https://lore.kernel.org/all/[email protected]/
v2: https://lore.kernel.org/all/[email protected]/
v1: doesn't exist. oops, at v1 this wasn't a series, just the PCIe GPIO patch

---
 arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)
arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi +1 -6
index d5018fdbdedb..967535b2bce7 100644
@@ -982,12 +982,6 @@ &i2c8 {
 	status = "okay";
 };
 
-&i2c20 {
-	clock-frequency = <400000>;
-
-	status = "okay";
-};
-
 &lpass_tlmm {
 	spkr_01_sd_n_active: spkr-01-sd-n-active-state {
 		pins = "gpio12";

@@ -1308,6 +1302,7 @@ right_tweeter: speaker@0,1 {
 &tlmm {
 	gpio-reserved-ranges = <44 4>,  /* SPI11 (TPM) */
 			       <76 4>,  /* SPI19 (TZ Protected) */
+			       <80 2>,  /* I2C20 (Battery SMBus) */
 			       <238 1>; /* UFS Reset */
 
 	cam_rgb_default: cam-rgb-default-state {
Signature · 1 line
2.52.0
maintainer Applied
#2 lore raw

Re: (subset) [PATCH v4 1/2] arm64: dts: qcom: x1-dell-thena: Move PERST and Wake GPIOs to PCIe port nodes

In reply to Val Packett
Quoted 5 lines · Val Packett

Recently the DTs for most Hamoa-based devices received this change, but the Thena dtsi (common for Dell Latitude and Inspiron SKUs) was skipped. Apply the change to it.

Applied, thanks!

[2/2] arm64: dts: qcom: x1-dell-thena: remove i2c20 (battery SMBus) and reserve its pins

      commit: 4b15b03166cc5d28e9912287b1f9b6607c8710ec

Best regards,

Signature · 1 line
Bjorn Andersson <[email protected]>