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

Commit ae46503f 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 SDC1 on sdxhedgehog boards"

parents eeab4737 338c813c

arch/arm/boot/dts/qcom/sdxhedgehog-emmc-cdp.dts

+21 −0
Original line number Diff line number Diff line
@@ -27,3 +27,24 @@ 
		qcom,client-id = <0x00000001>;

	};

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmdcalifornium_l6>;

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

	qcom,vdd-io-current-level = <100 200000>;



	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-width = <8>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

			  200000000>;

	qcom,devfreq,freq-table = <50000000 200000000>;

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

	qcom,nonremovable;



	status = "ok";

};

arch/arm/boot/dts/qcom/sdxhedgehog-emmc-mtp.dts

+21 −0
Original line number Diff line number Diff line
@@ -31,3 +31,24 @@ 
&qnand_1 {

	status = "disabled";

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmdcalifornium_l6>;

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

	qcom,vdd-io-current-level = <100 200000>;



	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-width = <8>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

			  200000000>;

	qcom,devfreq,freq-table = <50000000 200000000>;

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

	qcom,nonremovable;



	status = "ok";

};

arch/arm/boot/dts/qcom/sdxhedgehog-nand-cdp.dts

+21 −0
Original line number Diff line number Diff line
@@ -24,3 +24,24 @@ 
&qnand_1 {

	status = "ok";

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;



	vdd-io-supply = <&pmdcalifornium_l7>;

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

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



	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-width = <4>;

	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

			  200000000>;

	qcom,devfreq,freq-table = <50000000 200000000>;



	/* TODO: Add card detect GPIO */



	status = "ok";

};

arch/arm/boot/dts/qcom/sdxhedgehog-nand-dualwifi-cdp.dts

+30 −0
Original line number Diff line number Diff line
@@ -28,3 +28,33 @@ 
&smb1351_otg_supply {

	status = "disabled";

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;

	vdd-io-supply = <&pmdcalifornium_l6>;

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

	qcom,vdd-io-always-on;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

							200000000>;

	qcom,bus-width = <4>;

	qcom,nonremovable;



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

	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 123 0

			1 &intc 0 138 0

			2 &tlmm_pinmux 81 0x4>;

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



	status = "ok";

};

arch/arm/boot/dts/qcom/sdxhedgehog-nand-dualwifi-mtp.dts

+30 −0
Original line number Diff line number Diff line
@@ -20,3 +20,33 @@ 
		     "qcom,mtp";

	qcom,board-id = <8 3>, <8 0x103>;

};



&sdhc_1 {

	vdd-supply = <&sdc_vreg>;

	vdd-io-supply = <&pmdcalifornium_l6>;

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

	qcom,vdd-io-always-on;

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



	qcom,clk-rates = <400000 20000000 25000000 50000000 100000000

							200000000>;

	qcom,bus-width = <4>;

	qcom,nonremovable;



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

	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 123 0

			1 &intc 0 138 0

			2 &tlmm_pinmux 81 0x4>;

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



	status = "ok";

};