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

Commit 19d1b976 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 SDIO in sdhc2 for apq8017 config-1/3/8"

parents e5c91c68 814631df

arch/arm/boot/dts/qcom/apq8017-no-pmi-cdp.dtsi

+38 −0
Original line number Diff line number Diff line
@@ -87,3 +87,41 @@ 
		status = "disabled";

	};

};



&sdhc_2 {

	/* device core power supply */

	/delete-property/vdd-supply;

	/delete-property/qcom,vdd-voltage-level;

	/delete-property/qcom,vdd-current-level;



	/* device communication power supply */

	vdd-io-supply = <&pm8917_l5>;

	qcom,vdd-io-always-on;

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

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



	qcom,core_3_0v_support;

	qcom,nonremovable;



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

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on

			&sdc2_wlan_gpio_active>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

			&sdc2_wlan_gpio_sleep>;



	#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 &tlmm 124 0x4>;

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



	/delete-property/cd-gpios;

	/delete-property/qcom,devfreq,freq-table;



	status = "ok";



};

arch/arm/boot/dts/qcom/apq8017-pmi8937-cdp-wcd-rome.dts

+38 −0
Original line number Diff line number Diff line
@@ -27,3 +27,41 @@ 
&blsp1_uart1 {

	status = "ok";

};



&sdhc_2 {

	/* device core power supply */

	/delete-property/vdd-supply;

	/delete-property/qcom,vdd-voltage-level;

	/delete-property/qcom,vdd-current-level;



	/* device communication power supply */

	vdd-io-supply = <&pm8917_l5>;

	qcom,vdd-io-always-on;

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

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



	qcom,core_3_0v_support;

	qcom,nonremovable;



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

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on

			&sdc2_wlan_gpio_active>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

			&sdc2_wlan_gpio_sleep>;



	#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 &tlmm 124 0x4>;

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



	/delete-property/cd-gpios;

	/delete-property/qcom,devfreq,freq-table;



	status = "ok";



};

arch/arm/boot/dts/qcom/apq8017-pmi8950-cdp-wcd-rome.dts

+38 −0
Original line number Diff line number Diff line
@@ -27,3 +27,41 @@ 
&blsp1_uart1 {

	status = "ok";

};



&sdhc_2 {

	/* device core power supply */

	/delete-property/vdd-supply;

	/delete-property/qcom,vdd-voltage-level;

	/delete-property/qcom,vdd-current-level;



	/* device communication power supply */

	vdd-io-supply = <&pm8917_l5>;

	qcom,vdd-io-always-on;

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

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



	qcom,core_3_0v_support;

	qcom,nonremovable;



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

	pinctrl-0 = <&sdc2_clk_on &sdc2_cmd_on &sdc2_data_on

			&sdc2_wlan_gpio_active>;

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off

			&sdc2_wlan_gpio_sleep>;



	#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 &tlmm 124 0x4>;

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



	/delete-property/cd-gpios;

	/delete-property/qcom,devfreq,freq-table;



	status = "ok";



};

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

+19 −0
Original line number Diff line number Diff line
@@ -687,6 +687,25 @@ 
			 };

		};



		sdc2_wlan_gpio {

			sdc2_wlan_gpio_active: sdc2_wlan_gpio_active {

				config {

					pins = "gpio99";

					output-high;

					drive-strength = <8>;

					bias-pull-up;

				};

			};

			sdc2_wlan_gpio_sleep: sdc2_wlan_gpio_sleep {

				config {

					pins = "gpio99";

					output-low;

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		wcd9xxx_intr {

			wcd_intr_default: wcd_intr_default{

				mux {