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

Commit f074a100 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 SDHC support for msm8909"

parents cd8a6105 5ef18c5d

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

+49 −0
Original line number Diff line number Diff line
@@ -103,3 +103,52 @@ 
&qcom_tzlog {

	status = "okay";

};



&sdhc_1 {

	vdd-supply = <&pm8909_l8>;

	qcom,vdd-voltage-level = <2900000 2900000>;

	qcom,vdd-current-level = <200 400000>;



	vdd-io-supply = <&pm8909_l5>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

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



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

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

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



	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	 #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 &msm_gpio 38 0>;

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

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



	vdd-supply = <&pm8909_l11>;

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

	qcom,vdd-current-level = <15000 400000>;



	vdd-io-supply = <&pm8909_l12>;

	qcom,vdd-io-voltage-level = <1800000 2950000>;

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



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

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





	status = "ok";

};

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

+48 −0
Original line number Diff line number Diff line
@@ -103,3 +103,51 @@ 
&qcom_tzlog {

	status = "okay";

};



&sdhc_1 {

	vdd-supply = <&pm8909_l8>;

	qcom,vdd-voltage-level = <2900000 2900000>;

	qcom,vdd-current-level = <200 400000>;



	vdd-io-supply = <&pm8909_l5>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

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



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

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

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



	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	 #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 &msm_gpio 38 0>;

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

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



	vdd-supply = <&pm8909_l11>;

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

	qcom,vdd-current-level = <15000 400000>;



	vdd-io-supply = <&pm8909_l12>;

	qcom,vdd-io-voltage-level = <1800000 2950000>;

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



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

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



	status = "ok";

};

arch/arm/boot/dts/qcom/msm8909-qrd.dtsi

+48 −0
Original line number Diff line number Diff line
@@ -43,3 +43,51 @@ 
&qcom_tzlog {

	status = "okay";

};



&sdhc_1 {

	vdd-supply = <&pm8909_l8>;

	qcom,vdd-voltage-level = <2900000 2900000>;

	qcom,vdd-current-level = <200 400000>;



	vdd-io-supply = <&pm8909_l5>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

	qcom,vdd-io-voltage-level = <1800000 1800000>;

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



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

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

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



	qcom,bus-speed-mode = "HS200_1p8v", "DDR_1p8v";

	qcom,nonremovable;



	status = "ok";

};



&sdhc_2 {

	 #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 &msm_gpio 38 0>;

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

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



	vdd-supply = <&pm8909_l11>;

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

	qcom,vdd-current-level = <15000 400000>;



	vdd-io-supply = <&pm8909_l12>;

	qcom,vdd-io-voltage-level = <1800000 2950000>;

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



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

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



	status = "ok";

};

arch/arm/boot/dts/qcom/msm8909.dtsi

+1 −0
Original line number Diff line number Diff line
@@ -794,6 +794,7 @@ 
		clocks = <&clock_gcc clk_gcc_sdcc1_ahb_clk>,

			 <&clock_gcc clk_gcc_sdcc1_apps_clk>;

		clock-names = "iface_clk", "core_clk";

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



		status = "disabled";

	};