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

Commit 242531a3 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "ARM: dts: msm: Add eMMC, SD card support on sdm429w"

parents 4fa6254f ff856260

arch/arm64/boot/dts/qcom/sda429-wdp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -11,3 +11,44 @@ 
 * GNU General Public License for more details.

 */





&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&L19A>;

	qcom,vdd-voltage-level = <2900000 3200000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&L13A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	status = "ok";

};



&sdhc_2 {

	/* device core power supply for sd card*/

	vdd-supply = <&vreg_sd_vdd>;

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

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



	/* device communication power supply for msm_io*/

	vdd-io-supply = <&vreg_sd_pad>;

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

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



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

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



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



	status = "disabled";

};

arch/arm64/boot/dts/qcom/sda429-wtp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -11,3 +11,44 @@ 
 * GNU General Public License for more details.

 */





&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&L19A>;

	qcom,vdd-voltage-level = <2900000 3200000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&L13A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	status = "ok";

};



&sdhc_2 {

	/* device core power supply for sd card*/

	vdd-supply = <&vreg_sd_vdd>;

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

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



	/* device communication power supply for msm_io*/

	vdd-io-supply = <&vreg_sd_pad>;

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

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



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

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



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



	status = "disabled";

};

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

+152 −0
Original line number Diff line number Diff line
@@ -625,5 +625,157 @@ 
				};

			};

		};



		pmx_sdc1_rclk {

			sdc1_rclk_on: sdc1_rclk_on {

				config {

					pins = "sdc1_rclk";

					bias-pull-down; /* pull down */

				};

			};



			sdc1_rclk_off: sdc1_rclk_off {

				config {

					pins = "sdc1_rclk";

					bias-pull-down; /* pull down */

				};

			};

		};



		pmx_sdc1_clk {

			sdc1_clk_on: sdc1_clk_on {

				config {

					pins = "sdc1_clk";

					bias-disable; /* NO pull */

					drive-strength = <16>; /* 16 MA */

				};

			};



			sdc1_clk_off: sdc1_clk_off {

				config {

					pins = "sdc1_clk";

					bias-disable; /* NO pull */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};



		pmx_sdc1_cmd {

			sdc1_cmd_on: sdc1_cmd_on {

				config {

					pins = "sdc1_cmd";

					bias-pull-up; /* pull up */

					drive-strength = <10>; /* 10 MA */

				};

			};



			sdc1_cmd_off: sdc1_cmd_off {

				config {

					pins = "sdc1_cmd";

					bias-pull-up; /* pull up */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};



		pmx_sdc1_data {

			sdc1_data_on: sdc1_data_on {

				config {

					pins = "sdc1_data";

					bias-pull-up; /* pull up */

					drive-strength = <10>; /* 10 MA */

				};

			};



			sdc1_data_off: sdc1_data_off {

				config {

					pins = "sdc1_data";

					bias-pull-up; /* pull up */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};



		sdhc2_cd_pin {

			sdc2_cd_on: cd_on {

				mux {

					pins = "gpio67";

					function = "gpio";

				};



				config {

					pins = "gpio67";

					drive-strength = <2>;

					bias-pull-up;

				};

			};



			sdc2_cd_off: cd_off {

				mux {

					pins = "gpio67";

					function = "gpio";

				};



				config {

					pins = "gpio67";

					drive-strength = <2>;

					bias-disable;

				};

			};

		};



		pmx_sdc2_clk {

			sdc2_clk_on: sdc2_clk_on {

				config {

					pins = "sdc2_clk";

					drive-strength = <16>; /* 16 MA */

					bias-disable; /* NO pull */

				};

			};



			sdc2_clk_off: sdc2_clk_off {

				config {

					pins = "sdc2_clk";

					bias-disable; /* NO pull */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};



		pmx_sdc2_cmd {

			sdc2_cmd_on: sdc2_cmd_on {

				config {

					pins = "sdc2_cmd";

					bias-pull-up; /* pull up */

					drive-strength = <16>; /* 16 MA */

				};

			};



			sdc2_cmd_off: sdc2_cmd_off {

				config {

					pins = "sdc2_cmd";

					bias-pull-up; /* pull up */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};



		pmx_sdc2_data {

			sdc2_data_on: sdc2_data_on {

				config {

					pins = "sdc2_data";

					bias-pull-up; /* pull up */

					drive-strength = <16>; /* 16 MA */

				};

			};



			sdc2_data_off: sdc2_data_off {

				config {

					pins = "sdc2_data";

					bias-pull-up; /* pull up */

					drive-strength = <2>; /* 2 MA */

				};

			};

		};

	};

};

arch/arm64/boot/dts/qcom/sdm429-wdp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -11,3 +11,44 @@ 
 * GNU General Public License for more details.

 */





&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&L19A>;

	qcom,vdd-voltage-level = <2900000 3200000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&L13A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	status = "ok";

};



&sdhc_2 {

	/* device core power supply for sd card*/

	vdd-supply = <&vreg_sd_vdd>;

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

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



	/* device communication power supply for msm_io*/

	vdd-io-supply = <&vreg_sd_pad>;

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

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



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

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



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



	status = "disabled";

};

arch/arm64/boot/dts/qcom/sdm429-wtp.dtsi

+41 −0
Original line number Diff line number Diff line
@@ -11,3 +11,44 @@ 
 * GNU General Public License for more details.

 */





&sdhc_1 {

	/* device core power supply */

	vdd-supply = <&L19A>;

	qcom,vdd-voltage-level = <2900000 3200000>;

	qcom,vdd-current-level = <200 570000>;



	/* device communication power supply */

	vdd-io-supply = <&L13A>;

	qcom,vdd-io-always-on;

	qcom,vdd-io-lpm-sup;

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

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



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

	pinctrl-0 = <&sdc1_clk_on &sdc1_cmd_on &sdc1_data_on &sdc1_rclk_on>;

	pinctrl-1 = <&sdc1_clk_off &sdc1_cmd_off &sdc1_data_off &sdc1_rclk_off>;



	status = "ok";

};



&sdhc_2 {

	/* device core power supply for sd card*/

	vdd-supply = <&vreg_sd_vdd>;

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

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



	/* device communication power supply for msm_io*/

	vdd-io-supply = <&vreg_sd_pad>;

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

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



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

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



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



	status = "disabled";

};