Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 70280561 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: enable hot plug support of SD cards on sdm845" into msm-4.9

parents 12f01317 dd416c4e

arch/arm64/boot/dts/qcom/sdm845-cdp.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -122,6 +122,17 @@ 
	status = "ok";

};



&extcon_storage_cd {

	gpio = <&tlmm 126 GPIO_ACTIVE_LOW>;

	debounce-ms = <200>;

	irq-flags = <IRQ_TYPE_EDGE_BOTH>;



	pinctrl-names = "default";

	pinctrl-0 = <&storage_cd>;



	status = "ok";

};



&ufsphy_card {

	compatible = "qcom,ufs-phy-qmp-v3";
@@ -164,6 +175,8 @@ 
				50000000 100000000 200000000>;

	qcom,bus-speed-mode = "SDR12", "SDR25", "SDR50", "DDR50", "SDR104";



	extcon = <&extcon_storage_cd>;



	status = "ok";

};

arch/arm64/boot/dts/qcom/sdm845-pinctrl.dtsi

+13 −0
Original line number Diff line number Diff line
@@ -112,6 +112,19 @@ 
			};

		};



		storage_cd: storage_cd {

			mux {

				pins = "gpio126";

				function = "gpio";

			};



			config {

				pins = "gpio126";

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

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

			};

		};



		sdc2_clk_on: sdc2_clk_on {

			config {

				pins = "sdc2_clk";

arch/arm64/boot/dts/qcom/sdm845.dtsi

+6 −0
Original line number Diff line number Diff line
@@ -1378,6 +1378,12 @@ 
		status = "disabled";

	};



	extcon_storage_cd: extcon_storage_cd {

		compatible = "extcon-gpio";

		extcon-id = <62>; /* EXTCON_MECHANICAL */

		status = "disabled";

	};



	ufsphy_card: ufsphy_card@1da7000 {

		reg = <0x1da7000 0xda8>; /* PHY regs */

		reg-names = "phy_mem";