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>

diff --git a/arch/arm/boot/dts/snowball.dts b/arch/arm/boot/dts/snowball.dts
index 34bfd79fb0734087c2aa4c99ba402a1b3e23609a..359c6d67915656635ff9f5c02306c300044df005 100644 (file)
--- 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 482b86ef757dc7cb69d8f2cd2aefbb54c9bc0444..ea0242a095afdaf18a0c3736e543f5c987fc0455 100644 (file)
--- 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,