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

Commit 39ed3985 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 blsp1_uart0 address for msmtitanium"

parents da732425 5fd92657

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
&soc {

};



&blsp1_uart2 {

&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

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

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 
&soc {

};



&blsp1_uart2 {

&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

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

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

};



&blsp1_uart2 {

&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_active>;

arch/arm/boot/dts/qcom/msmtitanium-sim.dts

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
	qcom,board-id= <16 0>;

};



&blsp1_uart2 {

&blsp1_uart0 {

	status = "ok";

	pinctrl-names = "default";

	pinctrl-0 = <&uart_console_sleep>;

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

+4 −4
Original line number Diff line number Diff line
@@ -456,12 +456,12 @@ 
		};

	};



	blsp1_uart2: serial@78b0000 {

	blsp1_uart0: serial@78af000 {

		compatible = "qcom,msm-lsuart-v14";

		reg = <0x78b0000 0x200>;

		interrupts = <0 108 0>;

		reg = <0x78af000 0x200>;

		interrupts = <0 107 0>;

		status = "disabled";

		clocks = <&clock_gcc clk_gcc_blsp1_uart2_apps_clk>,

		clocks = <&clock_gcc clk_gcc_blsp1_uart1_apps_clk>,

		<&clock_gcc clk_gcc_blsp1_ahb_clk>;

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

	};