Changeset 31130 for trunk


Ignore:
Timestamp:
2012-03-28T22:42:25+02:00 (4 years ago)
Author:
jogo
Message:

bcm63xx: replace SPI driver with latest upstream version

Location:
trunk/target/linux/brcm63xx
Files:
11 added
1 deleted
9 edited
4 moved

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/modules.mk

    r27253 r31130  
    1111  DEPENDS:=@TARGET_brcm63xx +kmod-spi-bitbang 
    1212  KCONFIG:=CONFIG_SPI_BCM63XX 
    13   FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.ko 
    14   AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) 
     13  ifeq ($(strip $(call CompareKernelPatchVer,$(KERNEL_PATCHVER),ge,3.3)),1) 
     14    FILES:=$(LINUX_DIR)/drivers/spi/spi-bcm63xx.ko 
     15    AUTOLOAD:=$(call AutoLoad,92,spi-bcm63xx) 
     16  else 
     17    FILES:=$(LINUX_DIR)/drivers/spi/bcm63xx_spi.ko 
     18    AUTOLOAD:=$(call AutoLoad,92,bcm63xx_spi) 
     19  endif 
    1520endef 
    1621 
  • trunk/target/linux/brcm63xx/patches-3.3/300-reset_buttons.patch

    r31127 r31130  
    1010 #include <bcm63xx_board.h> 
    1111 #include <bcm63xx_cpu.h> 
    12 @@ -294,6 +296,16 @@ static struct board_info __initdata boar 
     12@@ -295,6 +297,16 @@ static struct board_info __initdata boar 
    1313                        .active_low     = 1, 
    1414                }, 
     
    2727  
    2828 static struct board_info __initdata board_96348gw = { 
    29 @@ -352,6 +364,16 @@ static struct board_info __initdata boar 
     29@@ -353,6 +365,16 @@ static struct board_info __initdata boar 
    3030                        .active_low     = 1, 
    3131                }, 
     
    4444  
    4545 static struct board_info __initdata board_FAST2404 = { 
    46 @@ -850,12 +872,23 @@ static struct platform_device bcm63xx_gp 
     46@@ -851,12 +873,23 @@ static struct platform_device bcm63xx_gp 
    4747        .dev.platform_data      = &bcm63xx_led_data, 
    4848 }; 
     
    6868        if (board.has_uart0) 
    6969                bcm63xx_uart_register(0); 
    70 @@ -904,5 +937,16 @@ int __init board_register_devices(void) 
     70@@ -907,5 +940,16 @@ int __init board_register_devices(void) 
    7171  
    7272        platform_device_register(&bcm63xx_gpio_leds); 
  • trunk/target/linux/brcm63xx/patches-3.3/301-led_count.patch

    r31127 r31130  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -889,6 +889,7 @@ int __init board_register_devices(void) 
     3@@ -890,6 +890,7 @@ int __init board_register_devices(void) 
    44 { 
    55        u32 val; 
     
    99        if (board.has_uart0) 
    1010                bcm63xx_uart_register(0); 
    11 @@ -932,7 +933,11 @@ int __init board_register_devices(void) 
     11@@ -935,7 +936,11 @@ int __init board_register_devices(void) 
    1212  
    1313        platform_device_register(&mtd_dev); 
  • trunk/target/linux/brcm63xx/patches-3.3/302-extended-platform-devices.patch

    r31127 r31130  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -924,6 +924,9 @@ int __init board_register_devices(void) 
    4         } 
    5  #endif 
     3@@ -927,6 +927,9 @@ int __init board_register_devices(void) 
     4  
     5        bcm63xx_spi_register(); 
    66  
    77+       if (board.num_devs) 
  • trunk/target/linux/brcm63xx/patches-3.3/303-spi-board-info.patch

    r31127 r31130  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -927,6 +927,9 @@ int __init board_register_devices(void) 
     3@@ -930,6 +930,9 @@ int __init board_register_devices(void) 
    44        if (board.num_devs) 
    55                platform_add_devices(board.devs, board.num_devs); 
  • trunk/target/linux/brcm63xx/patches-3.3/304-boardid_fixup.patch

    r31127 r31130  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -28,9 +28,13 @@ 
    4  #include <bcm63xx_dev_dsp.h> 
     3@@ -29,9 +29,13 @@ 
    54 #include <bcm63xx_dev_pcmcia.h> 
     5 #include <bcm63xx_dev_spi.h> 
    66 #include <board_bcm963xx.h> 
    77+#include <bcm_tag.h> 
     
    1515 static unsigned int mac_addr_used; 
    1616 static struct board_info board; 
    17 @@ -721,6 +725,29 @@ static int board_get_mac_address(u8 *mac 
     17@@ -722,6 +726,29 @@ static int board_get_mac_address(u8 *mac 
    1818        return 0; 
    1919 } 
     
    4545  * early init callback, read nvram data from flash and checksum it 
    4646  */ 
    47 @@ -762,6 +789,11 @@ void __init board_prom_init(void) 
     47@@ -763,6 +790,11 @@ void __init board_prom_init(void) 
    4848                return; 
    4949        } 
  • trunk/target/linux/brcm63xx/patches-3.3/400-ohci-add-driver-for-bcm63xx-integrated-controller.patch

    r31129 r31130  
    1 From f4aa3db2fb59983d45a9038daabad76102d32fc4 Mon Sep 17 00:00:00 2001 
     1From 7b510c5754d3c46e1287803f51e8ecb177414438 Mon Sep 17 00:00:00 2001 
    22From: Maxime Bizon <mbizon@freebox.fr> 
    33Date: Fri, 10 Jun 2011 19:14:30 +0200 
    4 Subject: [PATCH 20/57] ohci: add driver for bcm63xx integrated controller. 
     4Subject: [PATCH 23/63] ohci: add driver for bcm63xx integrated controller. 
    55 
    66--- 
  • trunk/target/linux/brcm63xx/patches-3.3/401-MIPS-BCM63XX-register-ohci-device.patch

    r31129 r31130  
    1 From 4ce192d5860760140439a3f305bc32f5e2316aa8 Mon Sep 17 00:00:00 2001 
     1From ab96f20ca1c3c8e7e5acd82d1e50823a5d572675 Mon Sep 17 00:00:00 2001 
    22From: Maxime Bizon <mbizon@freebox.fr> 
    33Date: Tue, 24 May 2011 21:47:41 +0200 
    4 Subject: [PATCH 21/57] MIPS: BCM63XX: register ohci device. 
     4Subject: [PATCH 24/63] MIPS: BCM63XX: register ohci device. 
    55 
    66--- 
     
    4949--- a/arch/mips/bcm63xx/Makefile 
    5050+++ b/arch/mips/bcm63xx/Makefile 
    51 @@ -1,5 +1,6 @@ 
     51@@ -1,6 +1,6 @@ 
    5252 obj-y          += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \ 
    53 -                  dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o dev-wdt.o 
    54 +                  dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o \ 
     53                   dev-dsp.o dev-enet.o dev-pcmcia.o dev-spi.o dev-uart.o \ 
     54-                  dev-wdt.o 
    5555+                  dev-usb-ohci.o dev-wdt.o 
    5656 obj-$(CONFIG_EARLY_PRINTK)     += early_printk.o 
     
    5959--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    6060+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    61 @@ -27,6 +27,7 @@ 
    62  #include <bcm63xx_dev_enet.h> 
     61@@ -28,6 +28,7 @@ 
    6362 #include <bcm63xx_dev_dsp.h> 
    6463 #include <bcm63xx_dev_pcmcia.h> 
     64 #include <bcm63xx_dev_spi.h> 
    6565+#include <bcm63xx_dev_usb_ohci.h> 
    6666 #include <board_bcm963xx.h> 
    6767 #include <bcm_tag.h> 
    6868  
    69 @@ -940,6 +941,9 @@ int __init board_register_devices(void) 
     69@@ -941,6 +942,9 @@ int __init board_register_devices(void) 
    7070            !board_get_mac_address(board.enet1.mac_addr)) 
    7171                bcm63xx_enet_register(1, &board.enet1); 
  • trunk/target/linux/brcm63xx/patches-3.3/402-ehci-add-driver-for-bcm63xx-integrated-controller.patch

    r31129 r31130  
    1 From 0f7d8ff44dc9e7048c141e6589bb590438cfc656 Mon Sep 17 00:00:00 2001 
     1From db58271d5152aa1d3894fdef13ca04379139d5d9 Mon Sep 17 00:00:00 2001 
    22From: Maxime Bizon <mbizon@freebox.fr> 
    33Date: Fri, 10 Jun 2011 19:15:47 +0200 
    4 Subject: [PATCH 22/57] ehci: add driver for bcm63xx integrated controller. 
     4Subject: [PATCH 25/63] ehci: add driver for bcm63xx integrated controller. 
    55 
    66--- 
  • trunk/target/linux/brcm63xx/patches-3.3/403-MIPS-BCM63XX-register-ehci-device.patch

    r31129 r31130  
    1 From 00fefa81d4919c72470ad68f05bc9e239108ca1b Mon Sep 17 00:00:00 2001 
     1From a2d78246e4cb45b5978fc682aad19c0fff0cd20d Mon Sep 17 00:00:00 2001 
    22From: Maxime Bizon <mbizon@freebox.fr> 
    33Date: Tue, 24 May 2011 21:50:33 +0200 
    4 Subject: [PATCH 23/57] MIPS: BCM63XX: register ehci device. 
     4Subject: [PATCH 26/63] MIPS: BCM63XX: register ehci device. 
    55 
    66--- 
     
    3434@@ -1,6 +1,6 @@ 
    3535 obj-y          += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \ 
    36                    dev-dsp.o dev-enet.o dev-pcmcia.o dev-uart.o \ 
     36                   dev-dsp.o dev-enet.o dev-pcmcia.o dev-spi.o dev-uart.o \ 
    3737-                  dev-usb-ohci.o dev-wdt.o 
    3838+                  dev-usb-ehci.o dev-usb-ohci.o dev-wdt.o 
     
    4242--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    4343+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    44 @@ -28,6 +28,7 @@ 
    45  #include <bcm63xx_dev_dsp.h> 
     44@@ -29,6 +29,7 @@ 
    4645 #include <bcm63xx_dev_pcmcia.h> 
     46 #include <bcm63xx_dev_spi.h> 
    4747 #include <bcm63xx_dev_usb_ohci.h> 
    4848+#include <bcm63xx_dev_usb_ehci.h> 
     
    5050 #include <bcm_tag.h> 
    5151  
    52 @@ -941,6 +942,9 @@ int __init board_register_devices(void) 
     52@@ -942,6 +943,9 @@ int __init board_register_devices(void) 
    5353            !board_get_mac_address(board.enet1.mac_addr)) 
    5454                bcm63xx_enet_register(1, &board.enet1); 
  • trunk/target/linux/brcm63xx/patches-3.3/404-bcm963xx_flashmap.patch

    r31127 r31130  
    1313--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    1414+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    15 @@ -872,7 +872,7 @@ static struct mtd_partition mtd_partitio 
     15@@ -873,7 +873,7 @@ static struct mtd_partition mtd_partitio 
    1616        } 
    1717 }; 
  • trunk/target/linux/brcm63xx/patches-3.3/408-6358-enet1-external-mii-clk.patch

    r31129 r31130  
    11--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    22+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    3 @@ -844,6 +844,8 @@ void __init board_prom_init(void) 
     3@@ -845,6 +845,8 @@ void __init board_prom_init(void) 
    44                if (BCMCPU_IS_6348()) 
    55                        val |= GPIO_MODE_6348_G3_EXT_MII | 
  • trunk/target/linux/brcm63xx/patches-3.3/414-bcm63xx_enet-split-dma-registers-access.patch

    r31129 r31130  
    5151--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 
    5252+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 
    53 @@ -136,7 +136,9 @@ enum bcm63xx_regs_set { 
    54  #define RSET_DSL_SIZE                  4096 
    55  #define RSET_WDT_SIZE                  12 
     53@@ -139,7 +139,9 @@ enum bcm63xx_regs_set { 
     54 #define BCM_6358_RSET_SPI_SIZE         1804 
     55 #define BCM_6368_RSET_SPI_SIZE         1804 
    5656 #define RSET_ENET_SIZE                 2048 
    5757-#define RSET_ENETDMA_SIZE              2048 
     
    6060+#define RSET_ENETDMAS_SIZE(chans)      (16 * (chans)) 
    6161 #define RSET_ENETSW_SIZE               65536 
    62  #define RSET_SPI_SIZE                  256 
    6362 #define RSET_UART_SIZE                 24 
     63 #define RSET_UDC_SIZE                  256 
    6464--- a/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
    6565+++ b/drivers/net/ethernet/broadcom/bcm63xx_enet.c 
Note: See TracChangeset for help on using the changeset viewer.