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

Commit 615e5557 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 SDIO on dualwifi platforms of sdxpoorwillis"

parents 2e37b653 b607ce9a

arch/arm/boot/dts/qcom/sdxpoorwills-dualwifi-cdp.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -11,3 +11,28 @@ 
 */



#include "sdxpoorwills-cdp.dtsi"



&sdhc_1 {

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



	qcom,core_3_0v_support;

	qcom,nonremovable;



	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on

					&sdc1_wlan_gpio_active>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off

					&sdc1_wlan_gpio_sleep>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_1>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 210 0

			1 &intc 0 227 0

			2 &tlmm 82 0x4>;

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



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

	/delete-property/ cd-gpios;

};

arch/arm/boot/dts/qcom/sdxpoorwills-dualwifi-mtp.dtsi

+25 −0
Original line number Diff line number Diff line
@@ -11,3 +11,28 @@ 
 */



#include "sdxpoorwills-mtp.dtsi"



&sdhc_1 {

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



	qcom,core_3_0v_support;

	qcom,nonremovable;



	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on

					&sdc1_wlan_gpio_active>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off

					&sdc1_wlan_gpio_sleep>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_1>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 210 0

			1 &intc 0 227 0

			2 &tlmm 82 0x4>;

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



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

	/delete-property/ cd-gpios;

};

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

+28 −0
Original line number Diff line number Diff line
@@ -1585,6 +1585,34 @@ 
			};

		};



		sdc1_wlan_gpio_active: sdc1_wlan_gpio_active {

			mux {

				pins = "gpio81";

				function = "gpio";

			};



			config {

				pins = "gpio81";

				output-high;

				drive-strength = <8>;

				bias-pull-up;

			};

		};



		sdc1_wlan_gpio_sleep: sdc1_wlan_gpio_sleep {

			mux {

				pins = "gpio81";

				function = "gpio";

			};



			config {

				pins = "gpio81";

				drive-strength = <2>;

				bias-pull-down;

				output-low;

			};

		};



		smb_int_default: smb_int_default {

			mux {

				pins = "gpio42";