target/linux/ar71xx/patches-3.8/025-ath79-remove-ATH79_MISC_IRQ_-defines.patch

   1 From f4414336ae509d20c043264bc9f8f6bafb0e8a6f Mon Sep 17 00:00:00 2001
   2 From: Gabor Juhos <juhosg@openwrt.org>
   3 Date: Thu, 7 Feb 2013 19:32:24 +0000
   4 Subject: [PATCH] ath79: remove ATH79_MISC_IRQ_* defines
   5
   6 commit fd633cf1cfe978003888dc78ff94f926fbe7dd8a upstream.
   7
   8 Use the ATH79_MISC_IRQ() macro instead.
   9
  10 Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
  11 Patchwork: http://patchwork.linux-mips.org/patch/4930/
  12 Signed-off-by: John Crispin <blogic@openwrt.org>
  13 ---
  14  arch/mips/ath79/dev-common.c           |    6 +++---
  15  arch/mips/ath79/dev-usb.c              |    2 +-
  16  arch/mips/ath79/irq.c                  |    2 +-
  17  arch/mips/include/asm/mach-ath79/irq.h |   13 -------------
  18  4 files changed, 5 insertions(+), 18 deletions(-)
  19
  20 --- a/arch/mips/ath79/dev-common.c
  21 +++ b/arch/mips/ath79/dev-common.c
  22 @@ -36,7 +36,7 @@ static struct resource ath79_uart_resour
  23  static struct plat_serial8250_port ath79_uart_data[] = {
  24         {
  25                 .mapbase        = AR71XX_UART_BASE,
  26 -               .irq            = ATH79_MISC_IRQ_UART,
  27 +               .irq            = ATH79_MISC_IRQ(3),
  28                 .flags          = AR71XX_UART_FLAGS,
  29                 .iotype         = UPIO_MEM32,
  30                 .regshift       = 2,
  31 @@ -62,8 +62,8 @@ static struct resource ar933x_uart_resou
  32                 .flags  = IORESOURCE_MEM,
  33         },
  34         {
  35 -               .start  = ATH79_MISC_IRQ_UART,
  36 -               .end    = ATH79_MISC_IRQ_UART,
  37 +               .start  = ATH79_MISC_IRQ(3),
  38 +               .end    = ATH79_MISC_IRQ(3),
  39                 .flags  = IORESOURCE_IRQ,
  40         },
  41  };
  42 --- a/arch/mips/ath79/dev-usb.c
  43 +++ b/arch/mips/ath79/dev-usb.c
  44 @@ -107,7 +107,7 @@ static void __init ath79_usb_setup(void)
  45         mdelay(900);
  46
  47         ath79_usb_init_resource(ath79_ohci_resources, AR71XX_OHCI_BASE,
  48 -                               AR71XX_OHCI_SIZE, ATH79_MISC_IRQ_OHCI);
  49 +                               AR71XX_OHCI_SIZE, ATH79_MISC_IRQ(6));
  50         platform_device_register(&ath79_ohci_device);
  51
  52         ath79_usb_init_resource(ath79_ehci_resources, AR71XX_EHCI_BASE,
  53 --- a/arch/mips/ath79/irq.c
  54 +++ b/arch/mips/ath79/irq.c
  55 @@ -265,7 +265,7 @@ void __init arch_init_irq(void)
  56                 BUG();
  57         }
  58
  59 -       cp0_perfcount_irq = ATH79_MISC_IRQ_PERFC;
  60 +       cp0_perfcount_irq = ATH79_MISC_IRQ(5);
  61         mips_cpu_irq_init();
  62         ath79_misc_irq_init();
  63
  64 --- a/arch/mips/include/asm/mach-ath79/irq.h
  65 +++ b/arch/mips/include/asm/mach-ath79/irq.h
  66 @@ -26,19 +26,6 @@
  67  #define ATH79_IP2_IRQ_COUNT    2
  68  #define ATH79_IP2_IRQ(_x)      (ATH79_IP2_IRQ_BASE + (_x))
  69
  70 -#define ATH79_MISC_IRQ_TIMER   (ATH79_MISC_IRQ_BASE + 0)
  71 -#define ATH79_MISC_IRQ_ERROR   (ATH79_MISC_IRQ_BASE + 1)
  72 -#define ATH79_MISC_IRQ_GPIO    (ATH79_MISC_IRQ_BASE + 2)
  73 -#define ATH79_MISC_IRQ_UART    (ATH79_MISC_IRQ_BASE + 3)
  74 -#define ATH79_MISC_IRQ_WDOG    (ATH79_MISC_IRQ_BASE + 4)
  75 -#define ATH79_MISC_IRQ_PERFC   (ATH79_MISC_IRQ_BASE + 5)
  76 -#define ATH79_MISC_IRQ_OHCI    (ATH79_MISC_IRQ_BASE + 6)
  77 -#define ATH79_MISC_IRQ_DMA     (ATH79_MISC_IRQ_BASE + 7)
  78 -#define ATH79_MISC_IRQ_TIMER2  (ATH79_MISC_IRQ_BASE + 8)
  79 -#define ATH79_MISC_IRQ_TIMER3  (ATH79_MISC_IRQ_BASE + 9)
  80 -#define ATH79_MISC_IRQ_TIMER4  (ATH79_MISC_IRQ_BASE + 10)
  81 -#define ATH79_MISC_IRQ_ETHSW   (ATH79_MISC_IRQ_BASE + 12)
  82 -
  83  #include_next <irq.h>
  84
  85  #endif /* __ASM_MACH_ATH79_IRQ_H */