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

Commit e639932e authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'imx-fixes-4.3-2' of... 

Merge tag 'imx-fixes-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into fixes

Pull "The i.MX fixes for 4.3, 2nd round:" from Shawn Guo:

It includes a single fix for i.MX7D, which corrects the base address of
UART2 in device tree.

* tag 'imx-fixes-4.3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
  ARM: dts: imx7d: Fix UART2 base address
parents 8c803854 178b2d09

arch/arm/boot/dts/imx7d.dtsi

+2 −2
Original line number Diff line number Diff line
@@ -588,10 +588,10 @@ 
				status = "disabled";

			};



			uart2: serial@30870000 {

			uart2: serial@30890000 {

				compatible = "fsl,imx7d-uart",

					     "fsl,imx6q-uart";

				reg = <0x30870000 0x10000>;

				reg = <0x30890000 0x10000>;

				interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>;

				clocks = <&clks IMX7D_UART2_ROOT_CLK>,

					<&clks IMX7D_UART2_ROOT_CLK>;