diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-03-08 12:43:13 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-03-08 12:43:13 +0000 |
| commit | 1bcf5d0de611bb8cbacdc6c6c474f3a336406cb1 (patch) | |
| tree | 50f3da1e1005758bae5802bcfb4d3290636a4bf8 /target | |
| parent | bf7f2939c26e7a495d077eb9aa26ebaedf892f7a (diff) | |
| download | master-31e0f0ae-1bcf5d0de611bb8cbacdc6c6c474f3a336406cb1.tar.gz master-31e0f0ae-1bcf5d0de611bb8cbacdc6c6c474f3a336406cb1.tar.bz2 master-31e0f0ae-1bcf5d0de611bb8cbacdc6c6c474f3a336406cb1.zip | |
fix typo for the bcm6338 spi IRQ, change platform driver name and make the SPI irq be fetchable by platform driver initialization code
SVN-Revision: 14790
Diffstat (limited to 'target')
3 files changed, 5 insertions, 2 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c index 362d109c73..108ed5f712 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/cpu.c @@ -45,6 +45,7 @@ static const unsigned long bcm96338_regs_base[] = { static const int bcm96338_irqs[] = { [IRQ_TIMER] = BCM_6338_TIMER_IRQ, + [IRQ_SPI] = BCM_6338_SPI_IRQ, [IRQ_UART0] = BCM_6338_UART0_IRQ, [IRQ_DSL] = BCM_6338_DSL_IRQ, [IRQ_ENET0] = BCM_6338_ENET0_IRQ, @@ -95,6 +96,7 @@ static const unsigned long bcm96348_regs_base[] = { static const int bcm96348_irqs[] = { [IRQ_TIMER] = BCM_6348_TIMER_IRQ, + [IRQ_SPI] = BCM_6348_SPI_IRQ, [IRQ_UART0] = BCM_6348_UART0_IRQ, [IRQ_DSL] = BCM_6348_DSL_IRQ, [IRQ_ENET0] = BCM_6348_ENET0_IRQ, @@ -152,6 +154,7 @@ static const unsigned long bcm96358_regs_base[] = { static const int bcm96358_irqs[] = { [IRQ_TIMER] = BCM_6358_TIMER_IRQ, + [IRQ_SPI] = BCM_6358_SPI_IRQ, [IRQ_UART0] = BCM_6358_UART0_IRQ, [IRQ_DSL] = BCM_6358_DSL_IRQ, [IRQ_ENET0] = BCM_6358_ENET0_IRQ, diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c index 5d7d4c3a43..bfbda2b17f 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/dev-spi.c @@ -33,7 +33,7 @@ static struct bcm63xx_spi_pdata spi_pdata = { }; static struct platform_device bcm63xx_spi_device = { - .name = "bcm63xx_spi", + .name = "bcm63xx-spi", .id = 0, .num_resources = ARRAY_SIZE(spi_resources), .resource = spi_resources, diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h index 1e1b124d7b..87e1aaf8cf 100644 --- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h +++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_cpu.h @@ -429,7 +429,7 @@ enum bcm63xx_irq { * 6338 irqs */ #define BCM_6338_TIMER_IRQ (IRQ_INTERNAL_BASE + 0) -#define BCM_6338_SPI_IR (IRQ_INTERNAL_BASE + 1) +#define BCM_6338_SPI_IRQ (IRQ_INTERNAL_BASE + 1) #define BCM_6338_UART0_IRQ (IRQ_INTERNAL_BASE + 2) #define BCM_6338_DG_IRQ (IRQ_INTERNAL_BASE + 4) #define BCM_6338_DSL_IRQ (IRQ_INTERNAL_BASE + 5) |