diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:13:20 -0400 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2015-10-14 11:13:20 -0400 |
| commit | e639932e01c096eb280086401d8e3a597e41a3b1 (patch) | |
| tree | 0fb6757d66b9d689d141b3a4022f94dd0b9820f3 | |
| parent | 8c803854ba06bcd86755c8754943041b110dd537 (diff) | |
| parent | 178b2d09afc05a46f68b190c6594f3a429bc2385 (diff) | |
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 @@ | |||
| 588 | status = "disabled"; | 588 | status = "disabled"; |
| 589 | }; | 589 | }; |
| 590 | 590 | ||
| 591 | uart2: serial@30870000 { | 591 | uart2: serial@30890000 { |
| 592 | compatible = "fsl,imx7d-uart", | 592 | compatible = "fsl,imx7d-uart", |
| 593 | "fsl,imx6q-uart"; | 593 | "fsl,imx6q-uart"; |
| 594 | reg = <0x30870000 0x10000>; | 594 | reg = <0x30890000 0x10000>; |
| 595 | interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; | 595 | interrupts = <GIC_SPI 27 IRQ_TYPE_LEVEL_HIGH>; |
| 596 | clocks = <&clks IMX7D_UART2_ROOT_CLK>, | 596 | clocks = <&clks IMX7D_UART2_ROOT_CLK>, |
| 597 | <&clks IMX7D_UART2_ROOT_CLK>; | 597 | <&clks IMX7D_UART2_ROOT_CLK>; |