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

Commit 21864791 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 DT entries to use mmc features in sdm670"

parents 42c66340 6ef06c1c

arch/arm64/boot/dts/qcom/sdm670-cdp.dtsi

+13 −2
Original line number Original line Diff line number Diff line
@@ -91,8 +91,19 @@ 
	qcom,vdd-io-current-level = <200 22000>;

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





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

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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 0 204 0

			1 &intc 0 0 222 0

			2 &tlmm 96 0>;

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

	cd-gpios = <&tlmm 96 0x1>;





	status = "ok";

	status = "ok";

};

};

arch/arm64/boot/dts/qcom/sdm670-mtp.dtsi

+13 −2
Original line number Original line Diff line number Diff line
@@ -91,8 +91,19 @@ 
	qcom,vdd-io-current-level = <200 22000>;

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





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

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

	pinctrl-0 = <&sdc2_clk_on  &sdc2_cmd_on &sdc2_data_on>;

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

	pinctrl-1 = <&sdc2_clk_off &sdc2_cmd_off &sdc2_data_off &sdc2_cd_off>;



	#address-cells = <0>;

	interrupt-parent = <&sdhc_2>;

	interrupts = <0 1 2>;

	#interrupt-cells = <1>;

	interrupt-map-mask = <0xffffffff>;

	interrupt-map = <0 &intc 0 0 204 0

			1 &intc 0 0 222 0

			2 &tlmm 96 0>;

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

	cd-gpios = <&tlmm 96 0x1>;





	status = "ok";

	status = "ok";

};

};

arch/arm64/boot/dts/qcom/sdm670-pinctrl.dtsi

+26 −0
Original line number Original line Diff line number Diff line
@@ -1258,6 +1258,32 @@ 
			};

			};

		};

		};





		sdc2_cd_on: cd_on {

			mux {

				pins = "gpio96";

				function = "gpio";

			};



			config {

				pins = "gpio96";

				drive-strength = <2>;

				bias-pull-up;

			};

		};



		sdc2_cd_off: cd_off {

			mux {

				pins = "gpio96";

				function = "gpio";

			};



			config {

				pins = "gpio96";

				drive-strength = <2>;

				bias-disable;

			};

		};



		/* USB C analog configuration */

		/* USB C analog configuration */

		wcd_usbc_analog_en1 {

		wcd_usbc_analog_en1 {

			wcd_usbc_analog_en1_idle: wcd_usbc_ana_en1_idle {

			wcd_usbc_analog_en1_idle: wcd_usbc_ana_en1_idle {

arch/arm64/boot/dts/qcom/sdm670.dtsi

+77 −0
Original line number Original line Diff line number Diff line
@@ -1933,6 +1933,46 @@ 




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

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





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

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

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

			/* No vote */

			<78 512 0 0>, <1 606 0 0>,

			/* 400 KB/s*/

			<78 512 1046 1600>,

			<1 606 1600 1600>,

			/* 20 MB/s */

			<78 512 52286 80000>,

			<1 606 80000 80000>,

			/* 25 MB/s */

			<78 512 65360 100000>,

			<1 606 100000 100000>,

			/* 50 MB/s */

			<78 512 130718 200000>,

			<1 606 133320 133320>,

			/* 100 MB/s */

			<78 512 130718 200000>,

			<1 606 150000 150000>,

			/* 200 MB/s */

			<78 512 261438 400000>,

			<1 606 300000 300000>,

			/* 400 MB/s */

			<78 512 261438 400000>,

			<1 606 300000 300000>,

			/* Max. bandwidth */

			<78 512 1338562 4096000>,

			<1 606 1338562 4096000>;

		qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000

			100000000 200000000 400000000 4294967295>;



		/* PM QoS */

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

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

		qcom,pm-qos-cpu-groups = <0x3f 0xc0>;

		qcom,pm-qos-cmdq-latency-us = <70 70>, <70 70>;

		qcom,pm-qos-legacy-latency-us = <70 70>, <70 70>;



		clocks = <&clock_gcc GCC_SDCC1_AHB_CLK>,

		clocks = <&clock_gcc GCC_SDCC1_AHB_CLK>,

			<&clock_gcc GCC_SDCC1_APPS_CLK>;

			<&clock_gcc GCC_SDCC1_APPS_CLK>;

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

		clock-names = "iface_clk", "core_clk";
@@ -1960,6 +2000,43 @@ 
				      "SDR104";

				      "SDR104";





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

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



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

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

		qcom,msm-bus,num-paths = <2>;

		qcom,msm-bus,vectors-KBps =

			/* No vote */

			<81 512 0 0>, <1 608 0 0>,

			/* 400 KB/s*/

			<81 512 1046 1600>,

			<1 608 1600 1600>,

			/* 20 MB/s */

			<81 512 52286 80000>,

			<1 608 80000 80000>,

			/* 25 MB/s */

			<81 512 65360 100000>,

			<1 608 100000 100000>,

			/* 50 MB/s */

			<81 512 130718 200000>,

			<1 608 133320 133320>,

			/* 100 MB/s */

			<81 512 261438 200000>,

			<1 608 150000 150000>,

			/* 200 MB/s */

			<81 512 261438 400000>,

			<1 608 300000 300000>,

			/* Max. bandwidth */

			<81 512 1338562 4096000>,

			<1 608 1338562 4096000>;

		qcom,bus-bw-vectors-bps = <0 400000 20000000 25000000 50000000

			100000000 200000000 4294967295>;



		/* PM QoS */

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

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

		qcom,pm-qos-cpu-groups = <0x3f 0xc0>;

		qcom,pm-qos-legacy-latency-us = <70 70>, <70 70>;



		clocks = <&clock_gcc GCC_SDCC2_AHB_CLK>,

		clocks = <&clock_gcc GCC_SDCC2_AHB_CLK>,

			<&clock_gcc GCC_SDCC2_APPS_CLK>;

			<&clock_gcc GCC_SDCC2_APPS_CLK>;

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

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