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

Commit 0e8b6431 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 clock and enable uart on sdxpoorwills" into msm-4.9

parents 68d3de5d 8dce5869

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

+1 −0
Original line number Diff line number Diff line
@@ -26,4 +26,5 @@ 
&blsp1_uart2 {

	pinctrl-names = "default";

	pinctrl-0 = <&uart2_console_active>;

	status = "ok";

};

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

+3 −0
Original line number Diff line number Diff line
@@ -153,5 +153,8 @@ 
		reg = <0x831000 0x200>;

		interrupts = <0 26 0>;

		status = "disabled";

		clocks = <&clock_gcc GCC_BLSP1_UART2_APPS_CLK>,

			<&clock_gcc GCC_BLSP1_AHB_CLK>;

		clock-names = "core", "iface";

	};

};