diff options
Diffstat (limited to 'target/linux/ar71xx/files/arch/mips')
-rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c | 8 | ||||
-rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/irq.c | 32 | ||||
-rw-r--r-- | target/linux/ar71xx/files/arch/mips/ar71xx/setup.c | 2 |
3 files changed, 21 insertions, 21 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c b/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c index 52fcf5084..25ec06205 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/ar71xx.c @@ -35,8 +35,8 @@ void ar71xx_device_stop(u32 mask) unsigned long flags; local_irq_save(flags); - ar71xx_reset_wr(RESET_REG_RESET_MODULE, - ar71xx_reset_rr(RESET_REG_RESET_MODULE) | mask); + ar71xx_reset_wr(AR71XX_RESET_REG_RESET_MODULE, + ar71xx_reset_rr(AR71XX_RESET_REG_RESET_MODULE) | mask); local_irq_restore(flags); } EXPORT_SYMBOL_GPL(ar71xx_device_stop); @@ -46,8 +46,8 @@ void ar71xx_device_start(u32 mask) unsigned long flags; local_irq_save(flags); - ar71xx_reset_wr(RESET_REG_RESET_MODULE, - ar71xx_reset_rr(RESET_REG_RESET_MODULE) & ~mask); + ar71xx_reset_wr(AR71XX_RESET_REG_RESET_MODULE, + ar71xx_reset_rr(AR71XX_RESET_REG_RESET_MODULE) & ~mask); local_irq_restore(flags); } EXPORT_SYMBOL_GPL(ar71xx_device_start); diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c index 171dd63f1..eda747441 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/irq.c @@ -26,8 +26,8 @@ static void ar71xx_pci_irq_dispatch(void) { u32 pending; - pending = ar71xx_reset_rr(RESET_REG_PCI_INT_STATUS) & - ar71xx_reset_rr(RESET_REG_PCI_INT_ENABLE); + pending = ar71xx_reset_rr(AR71XX_RESET_REG_PCI_INT_STATUS) & + ar71xx_reset_rr(AR71XX_RESET_REG_PCI_INT_ENABLE); if (pending & PCI_INT_DEV0) do_IRQ(AR71XX_PCI_IRQ_DEV0); @@ -45,15 +45,15 @@ static void ar71xx_pci_irq_dispatch(void) static void ar71xx_pci_irq_unmask(unsigned int irq) { irq -= AR71XX_PCI_IRQ_BASE; - ar71xx_reset_wr(RESET_REG_PCI_INT_ENABLE, - ar71xx_reset_rr(RESET_REG_PCI_INT_ENABLE) | (1 << irq)); + ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_ENABLE, + ar71xx_reset_rr(AR71XX_RESET_REG_PCI_INT_ENABLE) | (1 << irq)); } static void ar71xx_pci_irq_mask(unsigned int irq) { irq -= AR71XX_PCI_IRQ_BASE; - ar71xx_reset_wr(RESET_REG_PCI_INT_ENABLE, - ar71xx_reset_rr(RESET_REG_PCI_INT_ENABLE) & ~(1 << irq)); + ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_ENABLE, + ar71xx_reset_rr(AR71XX_RESET_REG_PCI_INT_ENABLE) & ~(1 << irq)); } static struct irq_chip ar71xx_pci_irq_chip = { @@ -72,8 +72,8 @@ static void __init ar71xx_pci_irq_init(void) { int i; - ar71xx_reset_wr(RESET_REG_PCI_INT_ENABLE, 0); - ar71xx_reset_wr(RESET_REG_PCI_INT_STATUS, 0); + ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_ENABLE, 0); + ar71xx_reset_wr(AR71XX_RESET_REG_PCI_INT_STATUS, 0); for (i = AR71XX_PCI_IRQ_BASE; i < AR71XX_PCI_IRQ_BASE + AR71XX_PCI_IRQ_COUNT; i++) { @@ -167,8 +167,8 @@ static void ar71xx_misc_irq_dispatch(void) { u32 pending; - pending = ar71xx_reset_rr(RESET_REG_MISC_INT_STATUS) - & ar71xx_reset_rr(RESET_REG_MISC_INT_ENABLE); + pending = ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_STATUS) + & ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE); if (pending & MISC_INT_UART) do_IRQ(AR71XX_MISC_IRQ_UART); @@ -201,15 +201,15 @@ static void ar71xx_misc_irq_dispatch(void) static void ar71xx_misc_irq_unmask(unsigned int irq) { irq -= AR71XX_MISC_IRQ_BASE; - ar71xx_reset_wr(RESET_REG_MISC_INT_ENABLE, - ar71xx_reset_rr(RESET_REG_MISC_INT_ENABLE) | (1 << irq)); + ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_ENABLE, + ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE) | (1 << irq)); } static void ar71xx_misc_irq_mask(unsigned int irq) { irq -= AR71XX_MISC_IRQ_BASE; - ar71xx_reset_wr(RESET_REG_MISC_INT_ENABLE, - ar71xx_reset_rr(RESET_REG_MISC_INT_ENABLE) & ~(1 << irq)); + ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_ENABLE, + ar71xx_reset_rr(AR71XX_RESET_REG_MISC_INT_ENABLE) & ~(1 << irq)); } struct irq_chip ar71xx_misc_irq_chip = { @@ -228,8 +228,8 @@ static void __init ar71xx_misc_irq_init(void) { int i; - ar71xx_reset_wr(RESET_REG_MISC_INT_ENABLE, 0); - ar71xx_reset_wr(RESET_REG_MISC_INT_STATUS, 0); + ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_ENABLE, 0); + ar71xx_reset_wr(AR71XX_RESET_REG_MISC_INT_STATUS, 0); for (i = AR71XX_MISC_IRQ_BASE; i < AR71XX_MISC_IRQ_BASE + AR71XX_MISC_IRQ_COUNT; i++) { diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c index 3fc67c33d..5d3f2a8e4 100644 --- a/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c +++ b/target/linux/ar71xx/files/arch/mips/ar71xx/setup.c @@ -108,7 +108,7 @@ static void __init ar71xx_detect_sys_type(void) u32 id; u32 rev; - id = ar71xx_reset_rr(RESET_REG_REV_ID) & REV_ID_MASK; + id = ar71xx_reset_rr(AR71XX_RESET_REG_REV_ID) & REV_ID_MASK; rev = (id >> REV_ID_REVISION_SHIFT) & REV_ID_REVISION_MASK; switch (id & REV_ID_CHIP_MASK) { |