Changeset 27236


Ignore:
Timestamp:
2011-06-19T22:46:00+02:00 (7 years ago)
Author:
florian
Message:

[brcm63xx] dev-spi.c checks for running CPU, not board code

Location:
trunk/target/linux/brcm63xx
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-2.6.39/240-spi.patch

    r27235 r27236  
    2727--- /dev/null 
    2828+++ b/arch/mips/bcm63xx/dev-spi.c 
    29 @@ -0,0 +1,128 @@ 
     29@@ -0,0 +1,131 @@ 
    3030+/* 
    3131+ * This file is subject to the terms and conditions of the GNU General Public 
     
    144144+       spi_resources[0].end += RSET_SPI_SIZE - 1; 
    145145+       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI); 
     146+ 
     147+       if (BCMCPU_IS_6345()) 
     148+               return -ENODEV; 
    146149+ 
    147150+       /* Fill in platform data */ 
     
    991994  
    992995 #define PFX    "board_bcm963xx: " 
    993 @@ -931,6 +932,9 @@ int __init board_register_devices(void) 
     996@@ -931,6 +932,8 @@ int __init board_register_devices(void) 
    994997        if (board.num_spis) 
    995998                spi_register_board_info(board.spis, board.num_spis); 
    996999  
    997 +       if (!BCMCPU_IS_6345()) 
    998 +               bcm63xx_spi_register(); 
     1000+       bcm63xx_spi_register(); 
    9991001+ 
    10001002        /* read base address of boot chip select (0) */ 
  • trunk/target/linux/brcm63xx/patches-2.6.39/452-board_V2500V.patch

    r27235 r27236  
    9696        /* dump cfe version */ 
    9797        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; 
    98 @@ -2264,6 +2338,14 @@ int __init board_register_devices(void) 
     98@@ -2263,6 +2337,14 @@ int __init board_register_devices(void) 
    9999                val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
    100100                val &= MPI_CSBASE_BASE_MASK; 
  • trunk/target/linux/brcm63xx/patches-3.0/240-spi.patch

    r27192 r27236  
    2727--- /dev/null 
    2828+++ b/arch/mips/bcm63xx/dev-spi.c 
    29 @@ -0,0 +1,128 @@ 
     29@@ -0,0 +1,131 @@ 
    3030+/* 
    3131+ * This file is subject to the terms and conditions of the GNU General Public 
     
    144144+       spi_resources[0].end += RSET_SPI_SIZE - 1; 
    145145+       spi_resources[1].start = bcm63xx_get_irq_number(IRQ_SPI); 
     146+ 
     147+       if (BCMCPU_IS_6345()) 
     148+               return -ENODEV; 
    146149+ 
    147150+       /* Fill in platform data */ 
     
    991994  
    992995 #define PFX    "board_bcm963xx: " 
    993 @@ -943,6 +944,9 @@ int __init board_register_devices(void) 
     996@@ -943,6 +944,8 @@ int __init board_register_devices(void) 
    994997        if (board.num_spis) 
    995998                spi_register_board_info(board.spis, board.num_spis); 
    996999  
    997 +       if (!BCMCPU_IS_6345()) 
    998 +               bcm63xx_spi_register(); 
     1000+       bcm63xx_spi_register(); 
    9991001+ 
    10001002        /* read base address of boot chip select (0) */ 
  • trunk/target/linux/brcm63xx/patches-3.0/452-board_V2500V.patch

    r27192 r27236  
    9696        /* dump cfe version */ 
    9797        cfe = boot_addr + BCM963XX_CFE_VERSION_OFFSET; 
    98 @@ -2276,6 +2350,14 @@ int __init board_register_devices(void) 
     98@@ -2275,6 +2349,14 @@ int __init board_register_devices(void) 
    9999                val = bcm_mpi_readl(MPI_CSBASE_REG(0)); 
    100100                val &= MPI_CSBASE_BASE_MASK; 
Note: See TracChangeset for help on using the changeset viewer.