Merge git://www.linux-watchdog.org/linux-watchdog

[karo-tx-linux.git] / arch / mips / ath79 / dev-common.c

diff --git a/arch/mips/ath79/dev-common.c b/arch/mips/ath79/dev-common.c
index ea3a8140e72861c7525863a901cf23107c72f5d1..a3a2741d06882b6b0ee908eaf5559ee4bda9f38a 100644 (file)
--- a/arch/mips/ath79/dev-common.c
+++ b/arch/mips/ath79/dev-common.c
@@ -36,7 +36,7 @@ static struct resource ath79_uart_resources[] = {
 static struct plat_serial8250_port ath79_uart_data[] = {
        {
                .mapbase        = AR71XX_UART_BASE,
-               .irq            = ATH79_MISC_IRQ_UART,
+               .irq            = ATH79_MISC_IRQ(3),
                .flags          = AR71XX_UART_FLAGS,
                .iotype         = UPIO_MEM32,
                .regshift       = 2,
@@ -62,8 +62,8 @@ static struct resource ar933x_uart_resources[] = {
                .flags  = IORESOURCE_MEM,
        },
        {
-               .start  = ATH79_MISC_IRQ_UART,
-               .end    = ATH79_MISC_IRQ_UART,
+               .start  = ATH79_MISC_IRQ(3),
+               .end    = ATH79_MISC_IRQ(3),
                .flags  = IORESOURCE_IRQ,
        },
 };
@@ -90,7 +90,8 @@ void __init ath79_register_uart(void)
        if (soc_is_ar71xx() ||
            soc_is_ar724x() ||
            soc_is_ar913x() ||
-           soc_is_ar934x()) {
+           soc_is_ar934x() ||
+           soc_is_qca955x()) {
                ath79_uart_data[0].uartclk = clk_get_rate(clk);
                platform_device_register(&ath79_uart_device);
        } else if (soc_is_ar933x()) {