From 9b4d9a94d61d3c87d0bb504cd25f8fc3d1fa0e46 Mon Sep 17 00:00:00 2001 From: Lars-Peter Clausen Date: Tue, 15 Sep 2009 11:45:59 +0200 Subject: [PATCH] Oops... those where missing from commit cbecf6e9f1 --- target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c | 2 +- target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c | 4 ++-- target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c | 4 ++-- target/linux/xburst/files-2.6.31/arch/mips/jz4740/time.c | 2 +- .../linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c | 8 ++++---- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c index 5965f2827..a33d7e56d 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/gpio.c @@ -217,7 +217,7 @@ static void jz_gpio_irq_demux_handler(unsigned int irq, struct irq_desc *desc) unsigned int gpio_irq; unsigned int gpio_bank; - gpio_bank = IRQ_GPIO0 - irq; + gpio_bank = JZ_IRQ_GPIO0 - irq; flag = readl(jz_gpio_base + (gpio_bank << 8) + 0x80); diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c index c90709147..1655bd384 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/pm.c @@ -271,7 +271,7 @@ static int jz_pm_do_sleep(void) */ /* enable RTC alarm */ - __intc_unmask_irq(IRQ_RTC); + __intc_unmask_irq(JZ_IRQ_RTC); #if 0 /* make system wake up after n seconds by RTC alarm */ unsigned int v, n; @@ -289,7 +289,7 @@ static int jz_pm_do_sleep(void) /* WAKEUP key */ __gpio_as_irq_rise_edge(GPIO_WAKEUP); __gpio_unmask_irq(GPIO_WAKEUP); - __intc_unmask_irq(IRQ_GPIO3); /* IRQ_GPIOn depends on GPIO_WAKEUP */ + __intc_unmask_irq(JZ_IRQ_GPIO3); /* IRQ_GPIOn depends on GPIO_WAKEUP */ /* Enter SLEEP mode */ REG_CPM_LCR &= ~CPM_LCR_LPM_MASK; diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c index 564ed273e..af7d34eb3 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/setup.c @@ -147,14 +147,14 @@ static void __init jz_serial_setup(void) s.line = 0; s.membase = (u8 *)UART0_BASE; - s.irq = IRQ_UART0; + s.irq = JZ_IRQ_UART0; if (early_serial_setup(&s) != 0) { printk(KERN_ERR "Serial ttyS0 setup failed!\n"); } s.line = 1; s.membase = (u8 *)UART1_BASE; - s.irq = IRQ_UART1; + s.irq = JZ_IRQ_UART1; if (early_serial_setup(&s) != 0) { printk(KERN_ERR "Serial ttyS1 setup failed!\n"); } diff --git a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/time.c b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/time.c index 71f1291be..46bb6d8bf 100644 --- a/target/linux/xburst/files-2.6.31/arch/mips/jz4740/time.c +++ b/target/linux/xburst/files-2.6.31/arch/mips/jz4740/time.c @@ -31,7 +31,7 @@ /* This is for machines which generate the exact clock. */ #define JZ_TIMER_CHAN 0 -#define JZ_TIMER_IRQ IRQ_TCU0 +#define JZ_TIMER_IRQ JZ_IRQ_TCU0 #define JZ_TIMER_CLOCK (JZ_EXTAL>>4) /* Jz timer clock frequency */ diff --git a/target/linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c b/target/linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c index 470c1ad1b..386be34bb 100644 --- a/target/linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c +++ b/target/linux/xburst/files-2.6.31/drivers/mmc/host/jz_mmc.c @@ -827,13 +827,13 @@ static int jz_mmc_probe(struct platform_device *pdev) goto out; } spin_lock_init(&host->lock); - host->irq = IRQ_MSC; + host->irq = JZ_IRQ_MSC; host->imask = 0xff; /* * Ensure that the host controller is shut down, and setup * with our defaults. */ - retval = request_irq(IRQ_MSC, jz_mmc_irq, 0, "MMC/SD", host); + retval = request_irq(JZ_IRQ_MSC, jz_mmc_irq, 0, "MMC/SD", host); if (retval) { printk(KERN_ERR "MMC/SD: can't request MMC/SD IRQ\n"); return retval; @@ -879,7 +879,7 @@ static int jz_mmc_probe(struct platform_device *pdev) #endif return 0; -err1:free_irq(IRQ_MSC, &host); +err1:free_irq(JZ_IRQ_MSC, &host); #ifdef USE_DMA err2:jz_free_dma(rxdmachan); err3:jz_free_dma(txdmachan); @@ -913,7 +913,7 @@ static int jz_mmc_remove(struct platform_device *pdev) __msc_disable_power(); jz_free_dma(rxdmachan); jz_free_dma(txdmachan); - free_irq(IRQ_MSC, host); + free_irq(JZ_IRQ_MSC, host); mmc_free_host(mmc); } return 0;