diff options
3 files changed, 22 insertions, 22 deletions
diff --git a/target/linux/adm8668/files/arch/mips/adm8668/irq.c b/target/linux/adm8668/files/arch/mips/adm8668/irq.c index 62b7d2dc32..9d3b2b9b83 100644 --- a/target/linux/adm8668/files/arch/mips/adm8668/irq.c +++ b/target/linux/adm8668/files/arch/mips/adm8668/irq.c @@ -108,7 +108,7 @@ static void __init init_adm8668_irqs(void) /* disable all interrupts for the moment */ intc_write_reg(IRQ_MASK, IRQ_DISABLE_REG); - for (i = 0; i <= INT_LVL_MAX; i++) + for (i = 0; i <= ADM8668_IRQ_MAX; i++) irq_set_chip_and_handler(i, &adm8668_irq_type, handle_level_irq); diff --git a/target/linux/adm8668/files/arch/mips/adm8668/platform.c b/target/linux/adm8668/files/arch/mips/adm8668/platform.c index 71f3eca142..7cd56b7879 100644 --- a/target/linux/adm8668/files/arch/mips/adm8668/platform.c +++ b/target/linux/adm8668/files/arch/mips/adm8668/platform.c @@ -54,7 +54,7 @@ static struct amba_device adm8668_uart0_device = { .flags = IORESOURCE_MEM, }, .irq = { - INT_LVL_UART0, + ADM8668_UART0_IRQ, -1 }, .periphid = 0x0041010, @@ -67,7 +67,7 @@ static struct resource eth0_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = INT_LVL_LAN, + .start = ADM8668_LAN_IRQ, .flags = IORESOURCE_IRQ, }, }; @@ -91,7 +91,7 @@ static struct resource eth1_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = INT_LVL_WAN, + .start = ADM8668_WAN_IRQ, .flags = IORESOURCE_IRQ, }, }; @@ -138,8 +138,8 @@ static struct resource usb_resources[] = { .flags = IORESOURCE_MEM, }, { - .start = INT_LVL_USB, - .end = INT_LVL_USB, + .start = ADM8668_USB_IRQ, + .end = ADM8668_USB_IRQ, .flags = IORESOURCE_IRQ, }, }; diff --git a/target/linux/adm8668/files/arch/mips/include/asm/mach-adm8668/adm8668.h b/target/linux/adm8668/files/arch/mips/include/asm/mach-adm8668/adm8668.h index e39addfd61..8a16863c08 100644 --- a/target/linux/adm8668/files/arch/mips/include/asm/mach-adm8668/adm8668.h +++ b/target/linux/adm8668/files/arch/mips/include/asm/mach-adm8668/adm8668.h @@ -28,22 +28,22 @@ #define ADM8668_PCIDAT_BASE 0x12400000 /* interrupt levels */ -#define INT_LVL_SWI 1 -#define INT_LVL_COMMS_RX 2 -#define INT_LVL_COMMS_TX 3 -#define INT_LVL_TIMERINT0 4 -#define INT_LVL_TIMERINT1 5 -#define INT_LVL_UART0 6 -#define INT_LVL_LAN 7 -#define INT_LVL_WAN 8 -#define INT_LVL_WLAN 9 -#define INT_LVL_GPIO 10 -#define INT_LVL_IDE 11 -#define INT_LVL_PCI2 12 -#define INT_LVL_PCI1 13 -#define INT_LVL_PCI0 14 -#define INT_LVL_USB 15 -#define INT_LVL_MAX INT_LVL_USB +#define ADM8668_SWI_IRQ 1 +#define ADM8668_COMMS_RX_IRQ 2 +#define ADM8668_COMMS_TX_IRQ 3 +#define ADM8668_TIMER0_IRQ 4 +#define ADM8668_TIMER1_IRQ 5 +#define ADM8668_UART0_IRQ 6 +#define ADM8668_LAN_IRQ 7 +#define ADM8668_WAN_IRQ 8 +#define ADM8668_WLAN_IRQ 9 +#define ADM8668_GPIO_IRQ 10 +#define ADM8668_IDE_IRQ 11 +#define ADM8668_PCI2_IRQ 12 +#define ADM8668_PCI1_IRQ 13 +#define ADM8668_PCI0_IRQ 14 +#define ADM8668_USB_IRQ 15 +#define ADM8668_IRQ_MAX ADM8668_USB_IRQ /* register access macros */ #define ADM8668_CONFIG_REG(_reg) \ |