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

Commit 8128854b 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: Switch to UART0 for msm8909"

parents 65688484 3a948415

arch/arm/boot/dts/qcom/msm8909-cdp.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ 
	};

	};

};

};





&blsp1_uart2 {

&blsp1_uart1 {

	status = "ok";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

	pinctrl-0 = <&uart_console_sleep>;

arch/arm/boot/dts/qcom/msm8909-mtp.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -83,7 +83,7 @@ 
	};

	};

};

};





&blsp1_uart2 {

&blsp1_uart1 {

	status = "ok";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

	pinctrl-0 = <&uart_console_sleep>;

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

+2 −2
Original line number Original line Diff line number Diff line
@@ -31,9 +31,9 @@ 
		};

		};





		pmx-uartconsole {

		pmx-uartconsole {

			qcom,pins = <&gp 20>, <&gp 21>;

			qcom,pins = <&gp 4>, <&gp 5>;

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

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

			qcom,pin-func = <3>;

			qcom,pin-func = <2>;

			label = "uart-console";

			label = "uart-console";

			uart_console_sleep: uart-console {

			uart_console_sleep: uart-console {

				drive-strength = <2>;

				drive-strength = <2>;

arch/arm/boot/dts/qcom/msm8909-qrd.dtsi

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,7 +18,7 @@ 
	compatible = "qcom,msm8909-qrd", "qcom,msm8909", "qcom,qrd";

	compatible = "qcom,msm8909-qrd", "qcom,msm8909", "qcom,qrd";

};

};





&blsp1_uart2 {

&blsp1_uart1 {

	status = "ok";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

	pinctrl-0 = <&uart_console_sleep>;

arch/arm/boot/dts/qcom/msm8909-rumi.dts

+1 −1
Original line number Original line Diff line number Diff line
@@ -41,7 +41,7 @@ 
	status = "disabled";

	status = "disabled";

};

};





&blsp1_uart2 {

&blsp1_uart1 {

	status = "ok";

	status = "ok";

	pinctrl-names = "default";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

	pinctrl-0 = <&uart_console_sleep>;