diff options
| author | Lee Jones <lee.jones@linaro.org> | 2012-03-07 18:35:04 +0100 |
|---|---|---|
| committer | Arnd Bergmann <arnd@arndb.de> | 2012-03-16 20:48:46 +0100 |
| commit | 4905af0e13a665da5f72d2629e93161ba781d03b (patch) | |
| tree | de661eb4c83a2e70b3c553a02d563f94a882aa5b /arch/arm | |
| parent | ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree (diff) | |
| download | linux-4905af0e13a665da5f72d2629e93161ba781d03b.tar.xz linux-4905af0e13a665da5f72d2629e93161ba781d03b.zip | |
ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
Enables the 3 UARTs found on a u8500 using DT.
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Reviewed-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Lee Jones <lee.jones@linaro.org>
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/snowball.dts | 12 | ||||
| -rw-r--r-- | arch/arm/mach-ux500/board-mop500.c | 4 |
2 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts index 34bfd79fb073..359c6d679156 100644 --- a/arch/arm/boot/dts/snowball.dts +++ b/arch/arm/boot/dts/snowball.dts @@ -96,6 +96,18 @@ status = "enabled"; }; + uart@80120000 { + status = "okay"; + }; + + uart@80121000 { + status = "okay"; + }; + + uart@80007000 { + status = "okay"; + }; + i2c@80004000 { tc3589x@42 { //compatible = "tc3589x"; diff --git a/arch/arm/mach-ux500/board-mop500.c b/arch/arm/mach-ux500/board-mop500.c index 482b86ef757d..ea0242a095af 100644 --- a/arch/arm/mach-ux500/board-mop500.c +++ b/arch/arm/mach-ux500/board-mop500.c @@ -746,6 +746,9 @@ MACHINE_END #ifdef CONFIG_MACH_UX500_DT struct of_dev_auxdata u8500_auxdata_lookup[] __initdata = { + OF_DEV_AUXDATA("arm,pl011", 0x80120000, "uart0", &uart0_plat), + OF_DEV_AUXDATA("arm,pl011", 0x80121000, "uart1", &uart1_plat), + OF_DEV_AUXDATA("arm,pl011", 0x80007000, "uart2", &uart2_plat), {}, }; @@ -802,7 +805,6 @@ static void __init u8500_init_machine(void) } mop500_i2c_init(parent); mop500_spi_init(parent); - mop500_uart_init(parent); i2c_register_board_info(0, mop500_i2c0_devices, i2c0_devs); i2c_register_board_info(2, mop500_i2c2_devices, |