Unverified Commit 5549d1e3 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'qcom-arm64-fixes-for-6.9-2' of... 

Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes

One more Qualcomm Arm64 DeviceTree fix for v6.9

On ths SA8155P automotive platform, the wrong gpio controller is defined
for the SD-card detect pin, which depending on probe ordering of things
cause ethernet to be broken. The card detect pin reference is corrected
to solve this problem.

* tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux:
  arm64: dts: qcom: sa8155p-adp: fix SDHC2 CD pin configuration

Link: https://lore.kernel.org/r/20240427153817.1430382-1-andersson@kernel.org


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents e845bcc8 819fe8c9

arch/arm64/boot/dts/qcom/sa8155p-adp.dts

+13 −17
Original line number Diff line number Diff line
@@ -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 {