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

Commit fb07145d 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 EPM pin control"

parents 50b0bc34 03c73db6

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

+43 −8
Original line number Diff line number Diff line
@@ -135,20 +135,55 @@ 
			};

		};



		spi_0 {

		spi_0_active {

			/* MOSI, MISO, CLK */

			qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;

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

			qcom,pin-func = <1>;

			label = "spi_0";

			label = "spi_0-active";



			spi_0_active: spi_0_active {

					       drive-strength = <6>;

					       bias-pull-up;

			spi_0_active: spi_active {

			       drive-strength = <12>;

			       bias-disable = <0>;

		        };

		};



			spi_0_sleep: spi_0_sleep {

					       drive-strength = <6>;

					       bias-pull-up;

		spi_0_suspend {

			/* MOSI, MISO, CLK */

			qcom,pins = <&gp 0>, <&gp 1>, <&gp 3>;

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

			qcom,pin-func = <1>;

			label = "spi_0-suspend";



			spi_0_sleep: spi_sleep {

			       drive-strength = <2>;

			       bias-pull-down;

		        };

		};



		spi_cs1_active {

			/* CS1 */

			qcom,pins = <&gp 8>;

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

			qcom,pin-func = <4>;

			label = "spi_0-cs1-active";



			spi_0_cs1_active: cs1_active {

			       drive-strength = <2>;

			       bias-disable = <0>;

		        };

		};



		spi_cs1_suspend {

			/* CS1 */

			qcom,pins = <&gp 8>;

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

			qcom,pin-func = <4>;

			label = "spi_0-cs1-suspend";



			spi_0_cs1_sleep: cs1_sleep {

			       drive-strength = <2>;

			       bias-disable = <0>;

		        };

		};

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

+3 −3
Original line number Diff line number Diff line
@@ -1124,7 +1124,7 @@ 
			status = "disabled";

		};



	spi_0: spi@f9923000 { /* BLSP1 QUP1 */

	spi_0: spi_epm: spi@f9923000 { /* BLSP1 QUP1 */

		compatible = "qcom,spi-qup-v2";

		#address-cells = <1>;

		#size-cells = <0>;
@@ -1143,8 +1143,8 @@ 
		qcom,master-id = <86>;

		qcom,use-pinctrl;

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

		pinctrl-0 = <&spi_0_active>;

		pinctrl-1 = <&spi_0_sleep>;

		pinctrl-0 = <&spi_0_active &spi_0_cs1_active>;

		pinctrl-1 = <&spi_0_sleep &spi_0_cs1_sleep>;



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