Browse Source

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
Florian Fainelli 17 years ago
parent
commit
1bcf5d0de6

+ 3 - 0
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,

+ 1 - 1
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,

+ 1 - 1
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)