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

Commit 6b24dd5a 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: mdm : Enable SD card support on mdm9640 MTP"

parents ff605d64 24dc667f

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

+21 −0
Original line number Diff line number Diff line
@@ -249,6 +249,27 @@ 
	status = "ok";

};



&sdhc_1 {

	vdd-supply = <&sd_slot_vreg>;

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

	qcom,vdd-current-level = <9000 800000>;



	vdd-io-supply = <&pmd9635_l14>;

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

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



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

	pinctrl-0 = <&pmx_sdc1_clk_on &pmx_sdc1_cmd_on &pmx_sdc1_data_on

							&pmx_sdc1_cd_on>;

	pinctrl-1 = <&pmx_sdc1_clk_off &pmx_sdc1_cmd_off &pmx_sdc1_data_off>;



	cd-gpios = <&tlmm_pinmux 81 0x1>;



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



	status = "ok";

};



&usb3 {

	vbus_dwc3-supply = <&smb1357_otg_supply>;

	qcom,cpe-gpio = <&tlmm_pinmux 87 0>;

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

+25 −0
Original line number Diff line number Diff line
@@ -135,6 +135,31 @@ 
			};

		};



		pmx_sdc1_cd {

			pmx_sdc1_cd_on: cd_on {

				mux {

					pins = "gpio81";

					function = "gpio";

				};

				config {

					pins = "gpio81";

					drive-strength = <2>;

					bias-pull-up;

				};

			};

			pmx_sdc1_cd_off: cd_off {

				mux {

					pins = "gpio81";

					function = "gpio";

				};

				config {

					pins = "gpio81";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		/* blsp_spi1_groups */



		spi0_default: spi0_default {

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

+6 −1
Original line number Diff line number Diff line
@@ -1006,7 +1006,6 @@ 
		interrupts = <0 123 0>, <0 138 0>;

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



		qcom,cpu-dma-latency-us = <701>;

		qcom,msm-bus,name = "sdhc1";

		qcom,msm-bus,num-cases = <8>;

		qcom,msm-bus,num-paths = <1>;
@@ -1024,6 +1023,12 @@ 
			 <&clock_gcc clk_gcc_sdcc1_apps_clk>;

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



		qcom,pm-qos-irq-type = "affine_cores";

		qcom,pm-qos-irq-cpu = <0>;

		qcom,pm-qos-irq-latency = <110 110>;



		qcom,bus-width = <4>;

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

		status = "disabled";

	};