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

Commit 6835bf31 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: Add support for SD card detect for MSM8916"

parents bf201204 8ea9b741

arch/arm/boot/dts/qcom/msm8916-pinctrl.dtsi

+14 −0
Original line number Diff line number Diff line
@@ -43,6 +43,20 @@ 
			};

		};



		sdhc2_cd_pin {

			qcom,pins = <&gp 38>;

			qcom,num-grp-pins = <1>;

			qcom,pin-func = <1>;

			label = "cd-gpio";

			sdc2_cd_on: cd_on {

				drive-strength = <2>;

				bias-pull-up;

			};

			sdc2_cd_off: cd_off {

				drive-strength = <2>;

				bias-disable;

			};

		};



		/* SDC pin type */

		sdc: sdc {

arch/arm/boot/dts/qcom/msm8916-rumi.dts

+4 −3
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ 


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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
@@ -81,6 +81,7 @@ 
			1 &intc 0 221 0

			2 &msm_gpio 38 0>;

	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&msm_gpio 38 0x1>;



	vdd-supply = <&pm8916_l11>;

	qcom,vdd-voltage-level = <2800000 2950000>;
@@ -91,8 +92,8 @@ 
	qcom,vdd-io-current-level = <200 50000>;



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

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_on &sdc2_data_on>;

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

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



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

arch/arm/boot/dts/qcom/msm8916-sim.dts

+4 −3
Original line number Diff line number Diff line
@@ -67,7 +67,7 @@ 


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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_on &sdc1_data_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off>;



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;

	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";
@@ -86,6 +86,7 @@ 
			1 &intc 0 221 0

			2 &msm_gpio 38 0>;

	interrupt-names = "hc_irq", "pwr_irq", "status_irq";

	cd-gpios = <&msm_gpio 38 0x1>;



	vdd-supply = <&pm8916_l11>;

	qcom,vdd-voltage-level = <1800000 2950000>;
@@ -96,8 +97,8 @@ 
	qcom,vdd-io-current-level = <200 50000>;



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

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_on &sdc2_data_on>;

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

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



	qcom,clk-rates = <400000 25000000 50000000 100000000 200000000>;