On Fri, Apr 12, 2024 at 07:03:25PM +0000, Volodymyr Babchuk wrote:

There are two issues with SDHC2 configuration for SA8155P-ADP, which prevent use of SDHC2 and causes issues with ethernet:

• Card Detect pin for SHDC2 on SA8155P-ADP is connected to gpio4 of PMM8155AU_1, not to SoC itself. SoC's gpio4 is used for DWMAC TX. If sdhc driver probes after dwmac driver, it reconfigures gpio4 and this breaks Ethernet MAC.

• pinctrl configuration mentions gpio96 as CD pin. It seems it was copied from some SM8150 example, because as mentioned above, correct CD pin is gpio4 on PMM8155AU_1.

This patch fixes both mentioned issues by providing correct pin handle and pinctrl configuration.

Fixes: 0deb2624e2d0 ("arm64: dts: qcom: sa8155p-adp: Add support for uSD card") Cc: stable@vger.kernel.org Signed-off-by: Volodymyr Babchuk volodymyr_babchuk@epam.com

Thanks for making all the changes and fixing all these issues! FWIW:

Reviewed-by: Stephan Gerhold stephan@gerhold.net

---

In v3:

• Moved regulator changes to a separate patch
• Renamed pinctrl node
• Moved pinctrl node so it will appear in alphabetical order

In v2:

• Added "Fixes:" tag
• CCed stable ML
• Fixed pinctrl configuration
• Extended voltage range for L13C voltage regulator

---

arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 30 ++++++++++-------------- 1 file changed, 13 insertions(+), 17 deletions(-)

diff --git a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts index 5e4287f8c8cd1..b2cf2c988336c 100644 --- a/arch/arm64/boot/dts/qcom/sa8155p-adp.dts +++ b/arch/arm64/boot/dts/qcom/sa8155p-adp.dts @@ -367,6 +367,16 @@ queue0 { }; }; +&pmm8155au_1_gpios {

• pmm8155au_1_sdc2_cd: sdc2-cd-default-state {

• pins = "gpio4";
  

• function = "normal";
  

• input-enable;
  

• bias-pull-up;
  

• power-source = <0>;
  

• };

+};

&qupv3_id_1 { status = "okay"; }; @@ -384,10 +394,10 @@ &remoteproc_cdsp { &sdhc_2 { status = "okay";

• cd-gpios = <&tlmm 4 GPIO_ACTIVE_LOW>;

• cd-gpios = <&pmm8155au_1_gpios 4 GPIO_ACTIVE_LOW>; pinctrl-names = "default", "sleep";

• pinctrl-0 = <&sdc2_on>;
• pinctrl-1 = <&sdc2_off>;

• pinctrl-0 = <&sdc2_on &pmm8155au_1_sdc2_cd>;
• pinctrl-1 = <&sdc2_off &pmm8155au_1_sdc2_cd>; vqmmc-supply = <&vreg_l13c_2p96>; /* IO line power */ vmmc-supply = <&vreg_l17a_2p96>; /* Card power line */ bus-width = <4>;

@@ -505,13 +515,6 @@ data-pins { bias-pull-up; /* pull up */ drive-strength = <16>; /* 16 MA */ };

• sd-cd-pins {
  

• 	pins = "gpio96";
  

• 	function = "gpio";
  

• 	bias-pull-up;		/* pull up */
  

• 	drive-strength = <2>;	/* 2 MA */
  

• };
  

  };

sdc2_off: sdc2-off-state { @@ -532,13 +535,6 @@ data-pins { bias-pull-up; /* pull up */ drive-strength = <2>; /* 2 MA */ };

• sd-cd-pins {
  

• 	pins = "gpio96";
  

• 	function = "gpio";
  

• 	bias-pull-up;		/* pull up */
  

• 	drive-strength = <2>;	/* 2 MA */
  

• };
  

  };

usb2phy_ac_en1_default: usb2phy-ac-en1-default-state { -- 2.44.0