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

Commit 4b0fbae0 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "pinctrl: msm: Add support to config RCLK"

parents 39859f0d 3cea01d0

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

+2 −1
Original line number Diff line number Diff line
@@ -67,7 +67,8 @@ 
			/* 0-3 for sdc1 4-6 for sdc2 */

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0, CMD -> 1, DATA -> 2, RCLK -> 3*/

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2, RCLK -> 3 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};

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

+7 −8
Original line number Diff line number Diff line
@@ -29,12 +29,11 @@ 
		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

			/* 0-2 for sdc1 3-5 for sdc2 */

			qcom,num-pins = <6>;

			/* 0-2 for sdc1 4-6 for sdc2 */

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0 */

			/* CMD -> 1 */

			/* DATA -> 2 */

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};

		pmx_sdc1_clk {
@@ -80,7 +79,7 @@ 
		};



		pmx_sdc2_clk {

			qcom,pins = <&sdc 3>;

			qcom,pins = <&sdc 4>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {
@@ -94,7 +93,7 @@ 
		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 4>;

			qcom,pins = <&sdc 5>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-cmd";

			sdc2_cmd_on: cmd_on {
@@ -108,7 +107,7 @@ 
		};



		pmx_sdc2_data {

			qcom,pins = <&sdc 5>;

			qcom,pins = <&sdc 6>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-data";

			sdc2_data_on: data_on {

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

+7 −9
Original line number Diff line number Diff line
@@ -47,12 +47,11 @@ 
		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

			/* 0-2 for sdc1 3-5 for sdc2 */

			qcom,num-pins = <6>;

			/* 0-2 for sdc1 4-6 for sdc2 */

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0 */

			/* CMD -> 1 */

			/* DATA -> 2 */

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};
@@ -99,7 +98,7 @@ 
		};



		pmx_sdc2_clk {

			qcom,pins = <&sdc 3>;

			qcom,pins = <&sdc 4>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {
@@ -113,7 +112,7 @@ 
		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 4>;

			qcom,pins = <&sdc 5>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-cmd";

			sdc2_cmd_on: cmd_on {
@@ -127,7 +126,7 @@ 
		};



		pmx_sdc2_data {

			qcom,pins = <&sdc 5>;

			qcom,pins = <&sdc 6>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-data";

			sdc2_data_on: data_on {
@@ -141,4 +140,3 @@ 
		};

	};

};

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

+8 −9
Original line number Diff line number Diff line
@@ -46,12 +46,11 @@ 
		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

			/* 0-2 for sdc1 3-5 for sdc2 */

			qcom,num-pins = <6>;

			/* 0-2 for sdc1 4-6 for sdc2 */

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0 */

			/* CMD -> 1 */

			/* DATA -> 2 */

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};

		pmx_sdc1_clk {
@@ -97,7 +96,7 @@ 
		};



		pmx_sdc2_clk {

			qcom,pins = <&sdc 3>;

			qcom,pins = <&sdc 4>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {
@@ -111,7 +110,7 @@ 
		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 4>;

			qcom,pins = <&sdc 5>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-cmd";

			sdc2_cmd_on: cmd_on {
@@ -125,7 +124,7 @@ 
		};



		pmx_sdc2_data {

			qcom,pins = <&sdc 5>;

			qcom,pins = <&sdc 6>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-data";

			sdc2_data_on: data_on {

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

+7 −6
Original line number Diff line number Diff line
@@ -61,10 +61,11 @@ 
		/* SDC pin type */

		sdc: sdc {

			qcom,pin-type-sdc;

			/* 0-2 for sdc1 3-5 for sdc2 */

			qcom,num-pins = <6>;

			/* 0-2 for sdc1 4-6 for sdc2 */

			qcom,num-pins = <7>;

			/* Order of pins */

			/* CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC1: CLK -> 0, CMD -> 1, DATA -> 2 */

			/* SDC2: CLK -> 4, CMD -> 5, DATA -> 6 */

			#qcom,pin-cells = <1>;

		};
@@ -111,7 +112,7 @@ 
		};



		pmx_sdc2_clk {

			qcom,pins = <&sdc 3>;

			qcom,pins = <&sdc 4>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-clk";

			sdc2_clk_on: clk_on {
@@ -125,7 +126,7 @@ 
		};



		pmx_sdc2_cmd {

			qcom,pins = <&sdc 4>;

			qcom,pins = <&sdc 5>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-cmd";

			sdc2_cmd_on: cmd_on {
@@ -139,7 +140,7 @@ 
		};



		pmx_sdc2_data {

			qcom,pins = <&sdc 5>;

			qcom,pins = <&sdc 6>;

			qcom,num-grp-pins = <1>;

			label = "sdc2-data";

			sdc2_data_on: data_on {