Skip to contentSkip to conversation

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

PATCH Superseded Val Packett 2 participants 6 messages Feb 10 – Feb 12

Subsystems (3)
Device tree bindings Arm Qualcomm mailing list Arm Qualcomm support

v1 of 4 Superseded Latest is v4 →

lore
Share & tools
lore

Val Packett

author
#0 lore raw

PATCH 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]>
Signed-off-by Val Packett <[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..fcf2845beb3c 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 {
+	perst-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 {
+	perst-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 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")
Signed-off-by Val Packett <[email protected]>

---
Wow.. I was pulling my hair out trying to figure out why I had the "broken battmgr in EL2" issue that absolutely no one else had on other laptops, turns out I did it to myself.

---
 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 fcf2845beb3c..255728970c1d 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
Reviewed-by on v1 2/2
#2 lore raw

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

Quoted 10 lines · Val Packett

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")
Signed-off-by Val Packett <[email protected]>

---
Wow.. I was pulling my hair out trying to figure out why I had the "broken battmgr in EL2" issue that absolutely no one else had on other laptops, turns out I did it to myself.
---

It's good you found it..

Reviewed-by Konrad Dybcio <[email protected]>

Konrad

#3 lore raw
In reply to Val Packett
Quoted 6 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.

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]>

huh?

Konrad

Quoted 2 lines
Signed-off-by Val Packett <[email protected]>

---

author
#4 lore raw
Quoted 10 lines · Konrad Dybcio
Quoted 6 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.

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]>

huh?

Konrad

Oops! Sorry, I *completely* forgot the entire concept of versions somehow..

This was a v2: pull R-b and Fixes tags,

v1: https://lore.kernel.org/all/[email protected]/

~val

Reviewed-by
#5 lore raw
Quoted 11 lines · Val Packett
Quoted 9 lines · Konrad Dybcio
Quoted 6 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.

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]>

huh?

Quoted 7 lines
Quoted 1 line

Konrad

Oops! Sorry, I *completely* forgot the entire concept of versions somehow..

This was a v2: pull R-b and Fixes tags,

v1: https://lore.kernel.org/all/[email protected]/

happens to the best of us

Reviewed-by Konrad Dybcio <[email protected]>

Konrad