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

Commit 9114d02f 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: add sd card detect definition for msm8994"

parents 92a2e35f 7eb1177a

arch/arm/boot/dts/qcom/msm8994-cdp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -55,6 +55,17 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

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



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 125 0

			1 &intc 0 221 0

			2 &pm8994_gpios 8 0x3>;

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

	cd-gpios = <&pm8994_gpios 8 0x1>;



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

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
@@ -405,6 +416,17 @@ 
		qcom,master-en = <1>;

	};



	gpio@c700 { /* GPIO 8 */

		qcom,mode = <0>;                /* Digital in */

		qcom,pull = <0>;                /* PULL up 30uA */

		qcom,output-type = <0>;         /* CMOS logic */

		qcom,invert = <1>;              /* Output high */

		qcom,vin-sel = <2>;             /* Logical 1 voltage value 1.8v */

		qcom,src-sel = <0>;             /* Constant */

		qcom,out-strength = <1>;        /* Low drive strength */

		qcom,master-en = <1>;           /* Enable GPIO */

	};



	gpio@c800 { /* GPIO 9 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */

arch/arm/boot/dts/qcom/msm8994-mtp.dtsi

+22 −0
Original line number Diff line number Diff line
@@ -55,6 +55,17 @@ 
	qcom,vdd-io-voltage-level = <1800000 2950000>;

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



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 125 0

			1 &intc 0 221 0

			2 &pm8994_gpios 8 0x3>;

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

	cd-gpios = <&pm8994_gpios 8 0x1>;



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

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off>;
@@ -397,6 +408,17 @@ 
		qcom,master-en = <1>;

	};



	gpio@c700 { /* GPIO 8 */

		qcom,mode = <0>;                /* Digital in */

		qcom,pull = <0>;                /* PULL up 30uA */

		qcom,output-type = <0>;         /* CMOS logic */

		qcom,invert = <0>;              /* Output high */

		qcom,vin-sel = <2>;             /* Logical 1 voltage value 1.8v */

		qcom,src-sel = <0>;             /* Constant */

		qcom,out-strength = <1>;        /* Low drive strength */

		qcom,master-en = <1>;           /* Enable GPIO */

	};



	gpio@c800 { /* GPIO 9 */

		qcom,mode = <1>;		/* Digital output */

		qcom,output-type = <0>;		/* CMOS logic */