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

Commit be6d15b3 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: move SD card detect to legacy mechanism for SDM845"

parents def0cbe9 0a97523c

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

+3 −14
Original line number Original line Diff line number Diff line
@@ -121,17 +121,6 @@ 
	status = "ok";

	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";

};



&sdhc_2 {

&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

	qcom,vdd-voltage-level = <2950000 2960000>;
@@ -142,10 +131,10 @@ 
	qcom,vdd-io-current-level = <200 22000>;

	qcom,vdd-io-current-level = <200 22000>;





	pinctrl-names = "active", "sleep";

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;





	extcon = <&extcon_storage_cd>;

	cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;





	status = "ok";

	status = "ok";

};

};

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

+3 −14
Original line number Original line Diff line number Diff line
@@ -209,17 +209,6 @@ 
	status = "ok";

	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";

};



&sdhc_2 {

&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

	qcom,vdd-voltage-level = <2950000 2960000>;
@@ -230,10 +219,10 @@ 
	qcom,vdd-io-current-level = <200 22000>;

	qcom,vdd-io-current-level = <200 22000>;





	pinctrl-names = "active", "sleep";

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;





	extcon = <&extcon_storage_cd>;

	cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;





	status = "ok";

	status = "ok";

};

};

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

+3 −14
Original line number Original line Diff line number Diff line
@@ -126,17 +126,6 @@ 
	status = "ok";

	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";

};



&sdhc_2 {

&sdhc_2 {

	vdd-supply = <&pm8998_l21>;

	vdd-supply = <&pm8998_l21>;

	qcom,vdd-voltage-level = <2950000 2960000>;

	qcom,vdd-voltage-level = <2950000 2960000>;
@@ -147,10 +136,10 @@ 
	qcom,vdd-io-current-level = <200 22000>;

	qcom,vdd-io-current-level = <200 22000>;





	pinctrl-names = "active", "sleep";

	pinctrl-names = "active", "sleep";

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on &storage_cd>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &storage_cd>;





	extcon = <&extcon_storage_cd>;

	cd-gpios = <&tlmm 126 GPIO_ACTIVE_LOW>;





	status = "ok";

	status = "ok";

};

};

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

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

		status = "disabled";

	};

	};





	extcon_storage_cd: extcon_storage_cd {

		compatible = "extcon-gpio";

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

		status = "disabled";

	};



	sdhc_2: sdhci@8804000 {

	sdhc_2: sdhci@8804000 {

		compatible = "qcom,sdhci-msm-v5";

		compatible = "qcom,sdhci-msm-v5";

		reg = <0x8804000 0x1000>;

		reg = <0x8804000 0x1000>;