From e13c1d256fe8c40b650645851b48cce3cb108d6c Mon Sep 17 00:00:00 2001 From: florian Date: Sun, 19 Jun 2011 20:46:00 +0000 Subject: [brcm63xx] dev-spi.c checks for running CPU, not board code git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27236 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- target/linux/brcm63xx/patches-2.6.39/240-spi.patch | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'target/linux/brcm63xx/patches-2.6.39/240-spi.patch') diff --git a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch index d882c2183..57149c27d 100644 --- a/target/linux/brcm63xx/patches-2.6.39/240-spi.patch +++ b/target/linux/brcm63xx/patches-2.6.39/240-spi.patch @@ -26,7 +26,7 @@ [IRQ_DSL] = BCM_6358_DSL_IRQ, --- /dev/null +++ b/arch/mips/bcm63xx/dev-spi.c -@@ -0,0 +1,128 @@ +@@ -0,0 +1,131 @@ +/* + * This file is subject to the terms and conditions of the GNU General Public + * License. See the file "COPYING" in the main directory of this archive @@ -144,6 +144,9 @@ + spi_resources[0].end += RSET_SPI_SIZE - 1; + spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI); + ++ if (BCMCPU_IS_6345()) ++ return -ENODEV; ++ + /* Fill in platform data */ + if (BCMCPU_IS_6338() || BCMCPU_IS_6348()) + spi_pdata.fifo_size = SPI_BCM_6338_SPI_MSG_DATA_SIZE; @@ -990,12 +993,11 @@ #include #define PFX "board_bcm963xx: " -@@ -931,6 +932,9 @@ int __init board_register_devices(void) +@@ -931,6 +932,8 @@ int __init board_register_devices(void) if (board.num_spis) spi_register_board_info(board.spis, board.num_spis); -+ if (!BCMCPU_IS_6345()) -+ bcm63xx_spi_register(); ++ bcm63xx_spi_register(); + /* read base address of boot chip select (0) */ if (BCMCPU_IS_6345()) -- cgit v1.2.3