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

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

Merge "ARM: dts: msm: Enable SD card support on Lahaina"

parents f40c4876 5a47daf3

qcom/lahaina-cdp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -85,13 +85,13 @@ 
	qcom,vdd-io-voltage-level = <1808000 2960000>;

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



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

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

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

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

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;



	status = "disabled";

	status = "ok";

};

qcom/lahaina-mtp.dtsi

+4 −4
Original line number Diff line number Diff line
@@ -87,13 +87,13 @@ 
	qcom,vdd-io-voltage-level = <1808000 2960000>;

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



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

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

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

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

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;



	status = "disabled";

	status = "ok";

};

qcom/lahaina-pinctrl.dtsi

+32 −41
Original line number Diff line number Diff line
@@ -82,64 +82,55 @@ 
		};

	};



	storage_cd: storage_cd {

		mux {

			pins = "gpio92";

			function = "gpio";

	sdc2_on: sdc2_on {

		clk {

			pins = "sdc2_clk";

			bias-disable;

			drive-strength = <16>;

		};



		config {

			pins = "gpio92";

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

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

		};

		cmd {

			pins = "sdc2_cmd";

			bias-pull-up;

			drive-strength = <10>;

		};



	sdc2_clk_on: sdc2_clk_on {

		config {

			pins = "sdc2_clk";

			bias-disable;		/* NO pull */

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

		};

		data {

			pins = "sdc2_data";

			bias-pull-up;

			drive-strength = <10>;

		};



	sdc2_clk_off: sdc2_clk_off {

		config {

			pins = "sdc2_clk";

			bias-disable;		/* NO pull */

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

		sd-cd {

			pins = "gpio92";

			bias-pull-up;

			drive-strength = <2>;

		};

	};



	sdc2_cmd_on: sdc2_cmd_on {

		config {

			pins = "sdc2_cmd";

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

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

		};

	sdc2_off: sdc2_off {

		clk {

			pins = "sdc2_clk";

			bias-disable;

			drive-strength = <2>;

		};



	sdc2_cmd_off: sdc2_cmd_off {

		config {

		cmd {

			pins = "sdc2_cmd";

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

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

		};

			bias-pull-up;

			drive-strength = <2>;

		};



	sdc2_data_on: sdc2_data_on {

		config {

		data {

			pins = "sdc2_data";

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

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

		};

			bias-pull-up;

			drive-strength = <2>;

		};



	sdc2_data_off: sdc2_data_off {

		config {

			pins = "sdc2_data";

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

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

		sd-cd {

			pins = "gpio92";

			bias-disable;

			drive-strength = <2>;

		};

	};

qcom/lahaina-qrd.dtsi

+18 −0
Original line number Diff line number Diff line
@@ -32,6 +32,24 @@ 
	status = "ok";

};



&sdhc_2 {

	vdd-supply = <&pm8350c_l9>;

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

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



	vdd-io-supply = <&pm8350c_l6>;

	qcom,vdd-io-voltage-level = <1808000 2960000>;

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



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

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;



	status = "disabled";

};



&swr_dmic_01 {

	status = "disabled";

};

qcom/lahaina-rumi.dtsi

+3 −3
Original line number Diff line number Diff line
@@ -58,9 +58,9 @@ 
	qcom,vdd-io-voltage-level = <1808000 2960000>;

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



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

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

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

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

	pinctrl-0 = <&sdc2_on>;

	pinctrl-1 = <&sdc2_off>;



	cd-gpios = <&tlmm 92 GPIO_ACTIVE_LOW>;