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

Commit 876d5731 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: Change pinctrl settings for BLSP1 UART3 for msmcobalt"

parents 90a7cf7d 38c509c5

arch/arm/boot/dts/qcom/msmcobalt-blsp.dtsi

+4 −2
Original line number Diff line number Diff line
@@ -736,8 +736,10 @@ 
		clocks = <&clock_gcc clk_gcc_blsp1_uart3_apps_clk>,

		    <&clock_gcc clk_gcc_blsp1_ahb_clk>;

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

		pinctrl-0 = <&blsp1_uart3_sleep>;

		pinctrl-1 = <&blsp1_uart3_active>;

		pinctrl-0 = <&blsp1_uart3_tx_sleep>, <&blsp1_uart3_rxcts_sleep>,

					<&blsp1_uart3_rfr_sleep>;

		pinctrl-1 = <&blsp1_uart3_tx_active>,

			<&blsp1_uart3_rxcts_active>, <&blsp1_uart3_rfr_active>;



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

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

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

+71 −17
Original line number Diff line number Diff line
@@ -1223,32 +1223,86 @@ 
			};

		};



		blsp1_uart3_active: blsp1_uart3_active {

		blsp1_uart3: blsp1_uart3 {

			blsp1_uart3_tx_active: blsp1_uart3_tx_active {

				mux {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					function = "blsp_uart3_a";

				};



				config {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					drive-strength = <2>;

					bias-disable;

				};

			};



		blsp1_uart3_sleep: blsp1_uart3_sleep {

			blsp1_uart3_tx_sleep: blsp1_uart3_tx_sleep {

				mux {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					function = "gpio";

				};



				config {

				pins = "gpio45", "gpio46", "gpio47", "gpio48";

					pins = "gpio45";

					drive-strength = <2>;

					bias-pull-up;

				};

			};



			blsp1_uart3_rxcts_active: blsp1_uart3_rxcts_active {

				mux {

					pins = "gpio46", "gpio47";

					function = "blsp_uart3_a";

				};



				config {

					pins = "gpio46", "gpio47";

					drive-strength = <2>;

					bias-disable;

				};

			};



			blsp1_uart3_rxcts_sleep: blsp1_uart3_rxcts_sleep {

				mux {

					pins = "gpio46", "gpio47";

					function = "gpio";

				};



				config {

					pins = "gpio46", "gpio47";

					drive-strength = <2>;

					bias-no-pull;

				};

			};



			blsp1_uart3_rfr_active: blsp1_uart3_rfr_active {

				mux {

					pins = "gpio48";

					function = "blsp_uart3_a";

				};



				config {

					pins = "gpio48";

					drive-strength = <2>;

					bias-disable;

				};

			};



			blsp1_uart3_rfr_sleep: blsp1_uart3_rfr_sleep {

				mux {

					pins = "gpio48";

					function = "gpio";

				};



				config {

					pins = "gpio48";

					drive-strength = <2>;

					bias-no-pull;

				};

			};

		};



		cam_sensor_rear2_suspend: cam_sensor_rear2_suspend {

			/* RESET, STANDBY */

			mux {