diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 17:13:20 +0200 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 17:13:20 +0200 |
| commit | e639932e01c096eb280086401d8e3a597e41a3b1 (patch) | |
| tree | 0fb6757d66b9d689d141b3a4022f94dd0b9820f3 | |
| parent | Merge tag 'berlin-fixes-for-4.3-1' of git://git.infradead.org/users/hesselba/... (diff) | |
| parent | ARM: dts: imx7d: Fix UART2 base address (diff) | |
| download | linux-e639932e01c096eb280086401d8e3a597e41a3b1.tar.xz linux-e639932e01c096eb280086401d8e3a597e41a3b1.zip | |
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
| -rw-r--r-- | arch/arm/boot/dts/imx7d.dtsi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx7d.dtsi b/arch/arm/boot/dts/imx7d.dtsi index b738ce0f9d9b..6e444bb873f9 100644 --- a/arch/arm/boot/dts/imx7d.dtsi +++ b/arch/arm/boot/dts/imx7d.dtsi @@ -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>; |