Changeset 20204


Ignore:
Timestamp:
2010-03-14T17:21:28+01:00 (7 years ago)
Author:
florian
Message:

[brcm63xx] refresh 2.6.32 patches, fix livebox support (#6821)

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

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/patches-2.6.32/007-usb-ohci-support.patch

    r19919 r20204  
    1414 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h 
    1515 
    16 diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig 
    17 index fb177d6..76fbbf7 100644 
    1816--- a/arch/mips/bcm63xx/Kconfig 
    1917+++ b/arch/mips/bcm63xx/Kconfig 
     
    3533  
    3634 source "arch/mips/bcm63xx/boards/Kconfig" 
    37 diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile 
    38 index 00064b6..be5d7ad 100644 
    3935--- a/arch/mips/bcm63xx/Makefile 
    4036+++ b/arch/mips/bcm63xx/Makefile 
     
    4743  
    4844 obj-y          += boards/ 
    49 diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    50 index ea17941..e2c0c36 100644 
    5145--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    5246+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     
    5953  
    6054 #define PFX    "board_bcm963xx: " 
    61 @@ -803,6 +804,9 @@ int __init board_register_devices(void) 
     55@@ -804,6 +805,9 @@ int __init board_register_devices(void) 
    6256            !board_get_mac_address(board.enet1.mac_addr)) 
    6357                bcm63xx_enet_register(1, &board.enet1); 
     
    6963                bcm63xx_dsp_register(&board.dsp); 
    7064  
    71 diff --git a/arch/mips/bcm63xx/dev-usb-ohci.c b/arch/mips/bcm63xx/dev-usb-ohci.c 
    72 new file mode 100644 
    73 index 0000000..f1fb442 
    7465--- /dev/null 
    7566+++ b/arch/mips/bcm63xx/dev-usb-ohci.c 
     
    124115+       return platform_device_register(&bcm63xx_ohci_device); 
    125116+} 
    126 diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h 
    127 new file mode 100644 
    128 index 0000000..518a04d 
    129117--- /dev/null 
    130118+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ohci.h 
     
    136124+ 
    137125+#endif /* BCM63XX_DEV_USB_OHCI_H_ */ 
    138 --  
    139 1.6.3.3 
    140  
    141  
  • trunk/target/linux/brcm63xx/patches-2.6.32/008-usb-ehci-support.patch

    r19919 r20204  
    1414 create mode 100644 arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h 
    1515 
    16 diff --git a/arch/mips/bcm63xx/Kconfig b/arch/mips/bcm63xx/Kconfig 
    17 index 76fbbf7..4aa21e8 100644 
    1816--- a/arch/mips/bcm63xx/Kconfig 
    1917+++ b/arch/mips/bcm63xx/Kconfig 
     
    2725  
    2826 source "arch/mips/bcm63xx/boards/Kconfig" 
    29 diff --git a/arch/mips/bcm63xx/Makefile b/arch/mips/bcm63xx/Makefile 
    30 index be5d7ad..6e229c2 100644 
    3127--- a/arch/mips/bcm63xx/Makefile 
    3228+++ b/arch/mips/bcm63xx/Makefile 
     
    3935  
    4036 obj-y          += boards/ 
    41 diff --git a/arch/mips/bcm63xx/boards/board_bcm963xx.c b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    42 index e2c0c36..b0d3db3 100644 
    4337--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    4438+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     
    5145  
    5246 #define PFX    "board_bcm963xx: " 
    53 @@ -804,6 +805,9 @@ int __init board_register_devices(void) 
     47@@ -805,6 +806,9 @@ int __init board_register_devices(void) 
    5448            !board_get_mac_address(board.enet1.mac_addr)) 
    5549                bcm63xx_enet_register(1, &board.enet1); 
     
    6155                bcm63xx_ohci_register(); 
    6256  
    63 diff --git a/arch/mips/bcm63xx/dev-usb-ehci.c b/arch/mips/bcm63xx/dev-usb-ehci.c 
    64 new file mode 100644 
    65 index 0000000..4bdd675 
    6657--- /dev/null 
    6758+++ b/arch/mips/bcm63xx/dev-usb-ehci.c 
     
    116107+       return platform_device_register(&bcm63xx_ehci_device); 
    117108+} 
    118 diff --git a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h 
    119 new file mode 100644 
    120 index 0000000..17fb519 
    121109--- /dev/null 
    122110+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_ehci.h 
     
    128116+ 
    129117+#endif /* BCM63XX_DEV_USB_EHCI_H_ */ 
    130 --  
    131 1.6.3.3 
    132  
    133  
  • trunk/target/linux/brcm63xx/patches-2.6.32/009-fix-double-gpio-registration.patch

    r19935 r20204  
    77 1 files changed, 0 insertions(+), 2 deletions(-) 
    88 
    9 diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c 
    10 index 87ca390..3725345 100644 
    119--- a/arch/mips/bcm63xx/gpio.c 
    1210+++ b/arch/mips/bcm63xx/gpio.c 
     
    1715- 
    1816-arch_initcall(bcm63xx_gpio_init); 
    19 --  
    20 1.6.3.3 
    21  
    22  
  • trunk/target/linux/brcm63xx/patches-2.6.32/010-add_bcm63xx_ohci_controller.patch

    r19919 r20204  
    77 create mode 100644 drivers/usb/host/ohci-bcm63xx.c 
    88 
    9 diff --git a/drivers/usb/host/ohci-bcm63xx.c b/drivers/usb/host/ohci-bcm63xx.c 
    10 new file mode 100644 
    11 index 0000000..c9bccec 
    129--- /dev/null 
    1310+++ b/drivers/usb/host/ohci-bcm63xx.c 
     
    179176+ 
    180177+MODULE_ALIAS("platform:bcm63xx_ohci"); 
    181 diff --git a/drivers/usb/host/ohci-hcd.c b/drivers/usb/host/ohci-hcd.c 
    182 index 24eb747..1c82a60 100644 
    183178--- a/drivers/usb/host/ohci-hcd.c 
    184179+++ b/drivers/usb/host/ohci-hcd.c 
     
    195190     defined(CONFIG_CPU_SUBTYPE_SH7721) || \ 
    196191     defined(CONFIG_CPU_SUBTYPE_SH7763) || \ 
    197 diff --git a/drivers/usb/host/ohci.h b/drivers/usb/host/ohci.h 
    198 index 5bf15fe..3c54d3e 100644 
    199192--- a/drivers/usb/host/ohci.h 
    200193+++ b/drivers/usb/host/ohci.h 
    201 @@ -655,7 +655,7 @@ static inline u32 hc32_to_cpup (const struct ohci_hcd *ohci, const __hc32 *x) 
     194@@ -655,7 +655,7 @@ static inline u32 hc32_to_cpup (const st 
    202195  * some big-endian SOC implementations.  Same thing happens with PSW access. 
    203196  */ 
     
    208201 #else 
    209202 #define big_endian_frame_no_quirk(ohci)        0 
    210 --  
    211 1.6.3.3 
    212  
    213  
  • trunk/target/linux/brcm63xx/patches-2.6.32/011-add_bcm63xx_ehci_controller.patch

    r19919 r20204  
    66 create mode 100644 drivers/usb/host/ehci-bcm63xx.c 
    77 
    8 diff --git a/drivers/usb/host/ehci-bcm63xx.c b/drivers/usb/host/ehci-bcm63xx.c 
    9 new file mode 100644 
    10 index 0000000..50638f7 
    118--- /dev/null 
    129+++ b/drivers/usb/host/ehci-bcm63xx.c 
     
    166163+ 
    167164+MODULE_ALIAS("platform:bcm63xx_ehci"); 
    168 diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c 
    169 index 1ec3857..8e7c61e 100644 
    170165--- a/drivers/usb/host/ehci-hcd.c 
    171166+++ b/drivers/usb/host/ehci-hcd.c 
    172 @@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL"); 
     167@@ -1141,6 +1141,11 @@ MODULE_LICENSE ("GPL"); 
    173168 #define        PLATFORM_DRIVER         ehci_atmel_driver 
    174169 #endif 
     
    182177     !defined(PS3_SYSTEM_BUS_DRIVER) && !defined(OF_PLATFORM_DRIVER) 
    183178 #error "missing bus glue for ehci-hcd" 
    184 --  
    185 1.6.3.3 
    186  
    187  
  • trunk/target/linux/brcm63xx/patches-2.6.32/012-mips_add_readl_writel_be_accessors.patch

    r19919 r20204  
    66Signed-off-by: Florian Fainelli <ffainelli@freebox.fr> 
    77--- 
    8 diff --git a/arch/mips/include/asm/io.h b/arch/mips/include/asm/io.h 
    9 index 436878e..65d7843 100644 
    108--- a/arch/mips/include/asm/io.h 
    119+++ b/arch/mips/include/asm/io.h 
     
    2018  * Some code tests for these symbols 
    2119  */ 
    22 --  
    23  
    24  
  • trunk/target/linux/brcm63xx/patches-2.6.32/020-watchdog.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/drivers/watchdog/Makefile 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/drivers/watchdog/Makefile       2010-02-23 16:38:51.000000000 +0100 
    4 +++ linux-2.6.32.9/drivers/watchdog/Makefile    2010-02-28 18:13:51.000000000 +0100 
    5 @@ -113,6 +113,7 @@ 
     1--- a/drivers/watchdog/Makefile 
     2+++ b/drivers/watchdog/Makefile 
     3@@ -113,6 +113,7 @@ obj-$(CONFIG_WDT_RM9K_GPI) += rm9k_wdt.o 
    64 obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 
    75 obj-$(CONFIG_AR7_WDT) += ar7_wdt.o 
     
    119 # PARISC Architecture 
    1210  
    13 Index: linux-2.6.32.9/drivers/watchdog/Kconfig 
    14 =================================================================== 
    15 --- linux-2.6.32.9.orig/drivers/watchdog/Kconfig        2010-02-23 16:38:51.000000000 +0100 
    16 +++ linux-2.6.32.9/drivers/watchdog/Kconfig     2010-02-28 18:13:51.000000000 +0100 
    17 @@ -850,6 +850,16 @@ 
     11--- a/drivers/watchdog/Kconfig 
     12+++ b/drivers/watchdog/Kconfig 
     13@@ -850,6 +850,16 @@ config TXX9_WDT 
    1814        help 
    1915          Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. 
     
    3228  
    3329 # POWERPC Architecture 
    34 Index: linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c 
    35 =================================================================== 
    36 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    37 +++ linux-2.6.32.9/drivers/watchdog/bcm63xx_wdt.c       2010-02-28 18:17:15.000000000 +0100 
     30--- /dev/null 
     31+++ b/drivers/watchdog/bcm63xx_wdt.c 
    3832@@ -0,0 +1,334 @@ 
    3933+/* 
  • trunk/target/linux/brcm63xx/patches-2.6.32/040-bcm963xx_flashmap.patch

    r19919 r20204  
    1212 3 files changed, 18 insertions(+), 3 deletions(-) 
    1313 
    14 Index: linux-2.6.32.9/drivers/mtd/maps/Kconfig 
    15 =================================================================== 
    16 --- linux-2.6.32.9.orig/drivers/mtd/maps/Kconfig        2010-02-28 18:16:50.000000000 +0100 
    17 +++ linux-2.6.32.9/drivers/mtd/maps/Kconfig     2010-02-28 18:18:20.000000000 +0100 
    18 @@ -259,6 +259,13 @@ 
     14--- a/drivers/mtd/maps/Kconfig 
     15+++ b/drivers/mtd/maps/Kconfig 
     16@@ -259,6 +259,13 @@ config MTD_ALCHEMY 
    1917        help 
    2018          Flash memory access on AMD Alchemy Pb/Db/RDK Reference Boards 
     
    3028        tristate "CFI Flash device mapped on DIL/Net PC" 
    3129        depends on X86 && MTD_CONCAT && MTD_PARTITIONS && MTD_CFI_INTELEXT && BROKEN 
    32 Index: linux-2.6.32.9/drivers/mtd/redboot.c 
    33 =================================================================== 
    34 --- linux-2.6.32.9.orig/drivers/mtd/redboot.c   2010-02-28 18:16:50.000000000 +0100 
    35 +++ linux-2.6.32.9/drivers/mtd/redboot.c        2010-02-28 18:18:20.000000000 +0100 
    36 @@ -39,7 +39,7 @@ 
     30--- a/drivers/mtd/redboot.c 
     31+++ b/drivers/mtd/redboot.c 
     32@@ -39,7 +39,7 @@ static inline int redboot_checksum(struc 
    3733        return 1; 
    3834 } 
     
    4339                              unsigned long fis_origin) 
    4440 { 
    45 @@ -162,6 +162,14 @@ 
     41@@ -162,6 +162,14 @@ static int parse_redboot_partitions(stru 
    4642                goto out; 
    4743        } 
     
    5854                struct fis_list *new_fl, **prev; 
    5955  
    60 @@ -184,9 +192,8 @@ 
     56@@ -184,9 +192,8 @@ static int parse_redboot_partitions(stru 
    6157                new_fl->img = &buf[i]; 
    6258                 if (fis_origin) { 
     
    6965                /* I'm sure the JFFS2 code has done me permanent damage. 
    7066                 * I now think the following is _normal_ 
    71 Index: linux-2.6.32.9/drivers/mtd/maps/Makefile 
    72 =================================================================== 
    73 --- linux-2.6.32.9.orig/drivers/mtd/maps/Makefile       2010-02-28 18:16:50.000000000 +0100 
    74 +++ linux-2.6.32.9/drivers/mtd/maps/Makefile    2010-02-28 18:18:20.000000000 +0100 
    75 @@ -61,3 +61,4 @@ 
     67--- a/drivers/mtd/maps/Makefile 
     68+++ b/drivers/mtd/maps/Makefile 
     69@@ -61,3 +61,4 @@ obj-$(CONFIG_MTD_BFIN_ASYNC)  += bfin-asy 
    7670 obj-$(CONFIG_MTD_RBTX4939)     += rbtx4939-flash.o 
    7771 obj-$(CONFIG_MTD_VMU)          += vmu-flash.o 
    7872 obj-$(CONFIG_MTD_GPIO_ADDR)    += gpio-addr-flash.o 
    7973+obj-$(CONFIG_MTD_BCM963XX)     += bcm963xx-flash.o 
    80 Index: linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c 
    81 =================================================================== 
    82 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    83 +++ linux-2.6.32.9/drivers/mtd/maps/bcm963xx-flash.c    2010-02-28 18:18:20.000000000 +0100 
     74--- /dev/null 
     75+++ b/drivers/mtd/maps/bcm963xx-flash.c 
    8476@@ -0,0 +1,399 @@ 
    8577+/* 
     
    482474+MODULE_AUTHOR("Florian Fainelli <florian@openwrt.org>"); 
    483475+MODULE_AUTHOR("Mike Albon <malbon@openwrt.org>"); 
    484 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h 
    485 =================================================================== 
    486 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    487 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h 2010-02-28 18:18:20.000000000 +0100 
     476--- /dev/null 
     477+++ b/arch/mips/include/asm/mach-bcm63xx/bcm_tag.h 
    488478@@ -0,0 +1,178 @@ 
    489479+#ifndef __BCM63XX_TAG_H 
     
    665655+ 
    666656+#endif /* __BCM63XX_TAG_H */ 
    667 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    668 =================================================================== 
    669 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:23:48.000000000 +0100 
    670 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:24:06.000000000 +0100 
    671 @@ -722,20 +722,6 @@ 
     657--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     658+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     659@@ -722,20 +722,6 @@ static int board_get_mac_address(u8 *mac 
    672660        return 0; 
    673661 } 
     
    690678        { 
    691679                .start          = 0,    /* filled at runtime */ 
    692 @@ -745,12 +731,9 @@ 
     680@@ -745,12 +731,9 @@ static struct resource mtd_resources[] = 
    693681 }; 
    694682  
  • trunk/target/linux/brcm63xx/patches-2.6.32/070_bcm63xx_enet_vlan_incoming_fixed.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/drivers/net/bcm63xx_enet.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/drivers/net/bcm63xx_enet.c      2010-02-28 18:18:37.000000000 +0100 
    4 +++ linux-2.6.32.9/drivers/net/bcm63xx_enet.c   2010-02-28 18:20:03.000000000 +0100 
    5 @@ -1526,7 +1526,7 @@ 
     1--- a/drivers/net/bcm63xx_enet.c 
     2+++ b/drivers/net/bcm63xx_enet.c 
     3@@ -1526,7 +1526,7 @@ static int compute_hw_mtu(struct bcm_ene 
    64        actual_mtu = mtu; 
    75  
  • trunk/target/linux/brcm63xx/patches-2.6.32/100-reset_buttons.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:37:27.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:41:36.000000000 +0100 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    53@@ -15,6 +15,8 @@ 
    64 #include <linux/mtd/partitions.h> 
     
    1210 #include <bcm63xx_board.h> 
    1311 #include <bcm63xx_cpu.h> 
    14 @@ -288,6 +290,16 @@ 
     12@@ -288,6 +290,16 @@ static struct board_info __initdata boar 
    1513                        .active_low     = 1, 
    1614                }, 
     
    2927  
    3028 static struct board_info __initdata board_96348gw = { 
    31 @@ -345,6 +357,16 @@ 
     29@@ -345,6 +357,16 @@ static struct board_info __initdata boar 
    3230                        .active_low     = 1, 
    3331                }, 
     
    4644  
    4745 static struct board_info __initdata board_FAST2404 = { 
    48 @@ -771,6 +793,16 @@ 
     46@@ -771,6 +793,16 @@ static struct platform_device bcm63xx_gp 
    4947        .dev.platform_data      = &bcm63xx_led_data, 
    5048 }; 
     
    6361  * third stage init callback, register all board devices. 
    6462  */ 
    65 @@ -826,6 +858,13 @@ 
     63@@ -826,6 +858,13 @@ int __init board_register_devices(void) 
    6664  
    6765        platform_device_register(&bcm63xx_gpio_leds); 
     
    7775 } 
    7876  
    79 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
    80 =================================================================== 
    81 --- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h     2010-02-28 18:36:33.000000000 +0100 
    82 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h  2010-02-28 18:36:58.000000000 +0100 
    83 @@ -55,6 +55,9 @@ 
     77--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     78+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     79@@ -55,6 +55,9 @@ struct board_info { 
    8480  
    8581        /* GPIO LEDs */ 
  • trunk/target/linux/brcm63xx/patches-2.6.32/110-gpiodev.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:42:13.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:43:29.000000000 +0100 
    5 @@ -785,6 +785,10 @@ 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     3@@ -785,6 +785,10 @@ static struct ssb_sprom bcm63xx_sprom =  
    64 }; 
    75 #endif 
     
    1412  
    1513 static struct platform_device bcm63xx_gpio_leds = { 
    16 @@ -853,6 +857,8 @@ 
     14@@ -853,6 +857,8 @@ int __init board_register_devices(void) 
    1715  
    1816        platform_device_register(&mtd_dev); 
  • trunk/target/linux/brcm63xx/patches-2.6.32/120-board_rta1025w_16.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:45:23.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:47:09.000000000 +0100 
    5 @@ -393,6 +393,25 @@ 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     3@@ -393,6 +393,25 @@ static struct board_info __initdata boar 
    64         .has_ehci0 = 1, 
    75 }; 
     
    2927        .name                           = "DV201AMR", 
    3028        .expected_cpu_id                = 0x6348, 
    31 @@ -577,6 +596,7 @@ 
     29@@ -577,6 +596,7 @@ static const struct board_info __initdat 
    3230        &board_FAST2404, 
    3331        &board_DV201AMR, 
  • trunk/target/linux/brcm63xx/patches-2.6.32/130-board_DWVS0.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:47:31.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:49:16.000000000 +0100 
    5 @@ -575,6 +575,27 @@ 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     3@@ -575,6 +575,27 @@ static struct board_info __initdata boar 
    64        .has_ohci0 = 1, 
    75        .has_ehci0 = 1, 
     
    3129  
    3230 /* 
    33 @@ -603,6 +624,7 @@ 
     31@@ -603,6 +624,7 @@ static const struct board_info __initdat 
    3432        &board_96358vw, 
    3533        &board_96358vw2, 
  • trunk/target/linux/brcm63xx/patches-2.6.32/140-new_bcm96348gw_leds.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:50:37.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 18:54:31.000000000 +0100 
    5 @@ -336,24 +336,39 @@ 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     3@@ -336,24 +336,39 @@ static struct board_info __initdata boar 
    64                        .active_low     = 1, 
    75                }, 
     
    5149                }, 
    5250        }, 
    53 @@ -855,6 +870,7 @@ 
     51@@ -855,6 +870,7 @@ static struct platform_device bcm63xx_gp 
    5452 int __init board_register_devices(void) 
    5553 { 
     
    5957        if (board.has_pccard) 
    6058                bcm63xx_pcmcia_register(); 
    61 @@ -901,7 +917,11 @@ 
     59@@ -901,7 +917,11 @@ int __init board_register_devices(void) 
    6260  
    6361        platform_device_register_simple("GPIODEV", 0, &gpiodev_resource, 1); 
     
    7270  
    7371        platform_device_register(&bcm63xx_gpio_leds); 
    74 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
    75 =================================================================== 
    76 --- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h     2010-02-28 18:54:39.000000000 +0100 
    77 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h  2010-02-28 18:54:49.000000000 +0100 
    78 @@ -54,7 +54,7 @@ 
     72--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     73+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     74@@ -54,7 +54,7 @@ struct board_info { 
    7975        struct bcm63xx_dsp_platform_data dsp; 
    8076  
  • trunk/target/linux/brcm63xx/patches-2.6.32/150-alice_gate2_leds.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 18:55:54.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 19:01:23.000000000 +0100 
    5 @@ -589,6 +589,63 @@ 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     3@@ -589,6 +589,63 @@ static struct board_info __initdata boar 
    64  
    75        .has_ohci0 = 1, 
  • trunk/target/linux/brcm63xx/patches-2.6.32/160-fix_gpio_count.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h       2010-02-28 19:02:10.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h    2010-02-28 19:02:40.000000000 +0100 
    5 @@ -10,6 +10,10 @@ 
     1--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h 
     2+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_gpio.h 
     3@@ -10,6 +10,10 @@ static inline unsigned long bcm63xx_gpio 
    64        switch (bcm63xx_get_cpu_id()) { 
    75        case BCM6358_CPU_ID: 
  • trunk/target/linux/brcm63xx/patches-2.6.32/170-board_livebox.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/Kconfig 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/Kconfig        2010-02-28 19:03:38.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/Kconfig     2010-02-28 19:04:38.000000000 +0100 
    5 @@ -8,4 +8,10 @@ 
     1--- a/arch/mips/bcm63xx/boards/Kconfig 
     2+++ b/arch/mips/bcm63xx/boards/Kconfig 
     3@@ -8,4 +8,10 @@ config BOARD_BCM963XX 
    64        select SSB 
    75        help 
     
    1412+ 
    1513 endchoice 
    16 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/Makefile 
    17 =================================================================== 
    18 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/Makefile       2010-02-28 19:03:45.000000000 +0100 
    19 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/Makefile    2010-02-28 19:04:54.000000000 +0100 
     14--- a/arch/mips/bcm63xx/boards/Makefile 
     15+++ b/arch/mips/bcm63xx/boards/Makefile 
    2016@@ -1,3 +1,4 @@ 
    2117 obj-$(CONFIG_BOARD_BCM963XX)           += board_bcm963xx.o 
     
    2319  
    2420 EXTRA_CFLAGS += -Werror 
    25 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c 
    26 =================================================================== 
    27 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    28 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_livebox.c     2010-02-28 19:05:16.000000000 +0100 
    29 @@ -0,0 +1,227 @@ 
     21--- /dev/null 
     22+++ b/arch/mips/bcm63xx/boards/board_livebox.c 
     23@@ -0,0 +1,223 @@ 
    3024+/* 
    3125+ * This file is subject to the terms and conditions of the GNU General Public 
     
    4337+#include <linux/mtd/partitions.h> 
    4438+#include <linux/mtd/physmap.h> 
     39+#include <linux/input.h> 
     40+#include <linux/gpio_buttons.h> 
    4541+#include <asm/addrspace.h> 
    4642+#include <bcm63xx_board.h> 
     
    4844+#include <bcm63xx_regs.h> 
    4945+#include <bcm63xx_io.h> 
    50 +#include <bcm63xx_board.h> 
    5146+#include <bcm63xx_dev_pci.h> 
    52 +#include <bcm63xx_dev_uart.h> 
    53 +#include <bcm63xx_dev_wdt.h> 
    5447+#include <bcm63xx_dev_enet.h> 
    5548+#include <bcm63xx_dev_pcmcia.h> 
     
    223216+       u32 val; 
    224217+ 
    225 +       bcm63xx_uart_register(); 
    226 +       bcm63xx_wdt_register(); 
    227 + 
    228218+       if (board.has_pccard) 
    229219+               bcm63xx_pcmcia_register(); 
     
    249239+       mtd_resources[0].start = val; 
    250240+       mtd_resources[0].end = 0x1FFFFFFF; 
    251 +        
     241+ 
    252242+       platform_device_register(&mtd_dev); 
    253243+ 
  • trunk/target/linux/brcm63xx/patches-2.6.32/180-udc_preliminary_support.patch

    r19919 r20204  
    1 Index: linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    2 =================================================================== 
    3 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/boards/board_bcm963xx.c       2010-02-28 19:16:53.000000000 +0100 
    4 +++ linux-2.6.32.9/arch/mips/bcm63xx/boards/board_bcm963xx.c    2010-02-28 19:16:55.000000000 +0100 
     1--- a/arch/mips/bcm63xx/boards/board_bcm963xx.c 
     2+++ b/arch/mips/bcm63xx/boards/board_bcm963xx.c 
    53@@ -28,6 +28,7 @@ 
    64 #include <bcm63xx_dev_pcmcia.h> 
     
    119  
    1210 #define PFX    "board_bcm963xx: " 
    13 @@ -406,6 +407,7 @@ 
     11@@ -406,6 +407,7 @@ static struct board_info __initdata boar 
    1412         .has_ohci0 = 1, 
    1513         .has_pccard = 1, 
     
    1917  
    2018 static struct board_info __initdata board_rta1025w_16 = { 
    21 @@ -949,6 +951,9 @@ 
     19@@ -949,6 +951,9 @@ int __init board_register_devices(void) 
    2220        if (board.has_dsp) 
    2321                bcm63xx_dsp_register(&board.dsp); 
     
    2927         * register our SPROM */ 
    3028 #ifdef CONFIG_SSB_PCIHOST 
    31 Index: linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c 
    32 =================================================================== 
    33 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    34 +++ linux-2.6.32.9/arch/mips/bcm63xx/dev-usb-udc.c      2010-02-28 19:16:55.000000000 +0100 
     29--- /dev/null 
     30+++ b/arch/mips/bcm63xx/dev-usb-udc.c 
    3531@@ -0,0 +1,58 @@ 
    3632+/* 
     
    9288+       return platform_device_register(&bcm63xx_udc_device); 
    9389+} 
    94 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 
    95 =================================================================== 
    96 --- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h        2010-02-28 19:16:53.000000000 +0100 
    97 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h     2010-02-28 19:16:55.000000000 +0100 
    98 @@ -125,7 +125,7 @@ 
     90--- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 
     91+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h 
     92@@ -125,7 +125,7 @@ enum bcm63xx_regs_set { 
    9993 #define BCM_6338_UART0_BASE            (0xfffe0300) 
    10094 #define BCM_6338_GPIO_BASE             (0xfffe0400) 
     
    10599 #define BCM_6338_OHCI0_BASE            (0xdeadbeef) 
    106100 #define BCM_6338_OHCI_PRIV_BASE                (0xfffe3000) 
    107 @@ -155,7 +155,7 @@ 
     101@@ -155,7 +155,7 @@ enum bcm63xx_regs_set { 
    108102 #define BCM_6345_UART0_BASE            (0xfffe0300) 
    109103 #define BCM_6345_GPIO_BASE             (0xfffe0400) 
     
    114108 #define BCM_6345_ENET0_BASE            (0xfffe1800) 
    115109 #define BCM_6345_ENETDMA_BASE          (0xfffe2800) 
    116 @@ -210,7 +210,7 @@ 
     110@@ -210,7 +210,7 @@ enum bcm63xx_regs_set { 
    117111 #define BCM_6358_UART0_BASE            (0xfffe0100) 
    118112 #define BCM_6358_GPIO_BASE             (0xfffe0080) 
     
    123117 #define BCM_6358_OHCI_PRIV_BASE                (0xdeadbeef) 
    124118 #define BCM_6358_USBH_PRIV_BASE                (0xfffe1500) 
    125 @@ -430,6 +430,7 @@ 
     119@@ -430,6 +430,7 @@ enum bcm63xx_irq { 
    126120        IRQ_TIMER = 0, 
    127121        IRQ_UART0, 
     
    131125        IRQ_ENET1, 
    132126        IRQ_ENET_PHY, 
    133 @@ -472,7 +473,7 @@ 
     127@@ -472,7 +473,7 @@ enum bcm63xx_irq { 
    134128 #define BCM_6345_UART0_IRQ             (IRQ_INTERNAL_BASE + 2) 
    135129 #define BCM_6345_DSL_IRQ               (IRQ_INTERNAL_BASE + 3) 
     
    140134 #define BCM_6345_ENET_PHY_IRQ          (IRQ_INTERNAL_BASE + 12) 
    141135 #define BCM_6345_ENET0_RXDMA_IRQ       (IRQ_INTERNAL_BASE + 13 + 1) 
    142 @@ -494,10 +495,17 @@ 
     136@@ -494,10 +495,17 @@ enum bcm63xx_irq { 
    143137 #define BCM_6348_TIMER_IRQ             (IRQ_INTERNAL_BASE + 0) 
    144138 #define BCM_6348_UART0_IRQ             (IRQ_INTERNAL_BASE + 2) 
     
    158152 #define BCM_6348_ENET0_TXDMA_IRQ       (IRQ_INTERNAL_BASE + 21) 
    159153 #define BCM_6348_ENET1_RXDMA_IRQ       (IRQ_INTERNAL_BASE + 22) 
    160 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h 
    161 =================================================================== 
    162 --- /dev/null   1970-01-01 00:00:00.000000000 +0000 
    163 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h     2010-02-28 19:16:55.000000000 +0100 
     154--- /dev/null 
     155+++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_dev_usb_udc.h 
    164156@@ -0,0 +1,6 @@ 
    165157+#ifndef BCM63XX_DEV_USB_UDC_H_ 
     
    169161+ 
    170162+#endif /* BCM63XX_DEV_USB_UDC_H_ */ 
    171 Index: linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
    172 =================================================================== 
    173 --- linux-2.6.32.9.orig/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h     2010-02-28 19:16:53.000000000 +0100 
    174 +++ linux-2.6.32.9/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h  2010-02-28 19:17:21.000000000 +0100 
    175 @@ -45,6 +45,7 @@ 
     163--- a/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     164+++ b/arch/mips/include/asm/mach-bcm63xx/board_bcm963xx.h 
     165@@ -45,6 +45,7 @@ struct board_info { 
    176166        unsigned int    has_ohci0:1; 
    177167        unsigned int    has_ehci0:1; 
     
    181171        /* ethernet config */ 
    182172        struct bcm63xx_enet_platform_data enet0; 
    183 Index: linux-2.6.32.9/arch/mips/bcm63xx/Makefile 
    184 =================================================================== 
    185 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/Makefile      2010-02-28 19:17:32.000000000 +0100 
    186 +++ linux-2.6.32.9/arch/mips/bcm63xx/Makefile   2010-02-28 19:17:39.000000000 +0100 
     173--- a/arch/mips/bcm63xx/Makefile 
     174+++ b/arch/mips/bcm63xx/Makefile 
    187175@@ -1,6 +1,6 @@ 
    188176 obj-y          += clk.o cpu.o cs.o gpio.o irq.o prom.o setup.o timer.o \ 
     
    193181  
    194182 obj-y          += boards/ 
    195 Index: linux-2.6.32.9/arch/mips/bcm63xx/clk.c 
    196 =================================================================== 
    197 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/clk.c 2010-02-28 19:19:22.000000000 +0100 
    198 +++ linux-2.6.32.9/arch/mips/bcm63xx/clk.c      2010-02-28 19:25:39.000000000 +0100 
    199 @@ -141,6 +141,30 @@ 
     183--- a/arch/mips/bcm63xx/clk.c 
     184+++ b/arch/mips/bcm63xx/clk.c 
     185@@ -141,6 +141,30 @@ static struct clk clk_usbh = { 
    200186 }; 
    201187  
     
    228214  */ 
    229215 static void spi_set(struct clk *clk, int enable) 
    230 @@ -208,6 +232,8 @@ 
     216@@ -208,6 +232,8 @@ struct clk *clk_get(struct device *dev,  
    231217                return &clk_ephy; 
    232218        if (!strcmp(id, "usbh")) 
     
    237223                return &clk_spi; 
    238224        if (!strcmp(id, "periph")) 
    239 Index: linux-2.6.32.9/arch/mips/bcm63xx/Kconfig 
    240 =================================================================== 
    241 --- linux-2.6.32.9.orig/arch/mips/bcm63xx/Kconfig       2010-02-28 19:29:37.000000000 +0100 
    242 +++ linux-2.6.32.9/arch/mips/bcm63xx/Kconfig    2010-02-28 19:29:51.000000000 +0100 
    243 @@ -7,6 +7,7 @@ 
     225--- a/arch/mips/bcm63xx/Kconfig 
     226+++ b/arch/mips/bcm63xx/Kconfig 
     227@@ -7,6 +7,7 @@ config BCM63XX_CPU_6338 
    244228        select USB_ARCH_HAS_OHCI 
    245229        select USB_OHCI_BIG_ENDIAN_DESC 
     
    249233 config BCM63XX_CPU_6345 
    250234        bool "support 6345 CPU" 
    251 @@ -19,6 +20,7 @@ 
     235@@ -19,6 +20,7 @@ config BCM63XX_CPU_6348 
    252236        select USB_ARCH_HAS_OHCI 
    253237        select USB_OHCI_BIG_ENDIAN_DESC 
  • trunk/target/linux/brcm63xx/patches-2.6.32/190-typo_cpu_features_override.patch

    r19919 r20204  
    77 1 files changed, 1 insertions(+), 1 deletions(-) 
    88 
    9 diff --git a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h 
    10 index 71742ba..f453c01 100644 
    119--- a/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h 
    1210+++ b/arch/mips/include/asm/mach-bcm63xx/cpu-feature-overrides.h 
     
    2018 #endif 
    2119  
    22 --  
    23 1.6.3.3 
    24  
    25  
  • trunk/target/linux/brcm63xx/patches-2.6.32/210-init_gpio_out_low_high_current_value_at_boot.patch

    r19919 r20204  
    77 1 files changed, 2 insertions(+), 0 deletions(-) 
    88 
    9 diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c 
    10 index 3725345..315bc7f 100644 
    119--- a/arch/mips/bcm63xx/gpio.c 
    1210+++ b/arch/mips/bcm63xx/gpio.c 
    13 @@ -125,6 +125,8 @@ static struct gpio_chip bcm63xx_gpio_chip = { 
     11@@ -125,6 +125,8 @@ static struct gpio_chip bcm63xx_gpio_chi 
    1412  
    1513 int __init bcm63xx_gpio_init(void) 
     
    2018        pr_info("registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio); 
    2119  
    22 --  
    23 1.6.3.3 
    24  
    25  
  • trunk/target/linux/brcm63xx/patches-2.6.33/170-board_livebox.patch

    r19921 r20204  
    2121--- /dev/null 
    2222+++ b/arch/mips/bcm63xx/boards/board_livebox.c 
    23 @@ -0,0 +1,227 @@ 
     23@@ -0,0 +1,223 @@ 
    2424+/* 
    2525+ * This file is subject to the terms and conditions of the GNU General Public 
     
    3737+#include <linux/mtd/partitions.h> 
    3838+#include <linux/mtd/physmap.h> 
     39+#include <linux/input.h> 
     40+#include <linux/gpio_buttons.h> 
    3941+#include <asm/addrspace.h> 
    4042+#include <bcm63xx_board.h> 
     
    4244+#include <bcm63xx_regs.h> 
    4345+#include <bcm63xx_io.h> 
    44 +#include <bcm63xx_board.h> 
    4546+#include <bcm63xx_dev_pci.h> 
    46 +#include <bcm63xx_dev_uart.h> 
    47 +#include <bcm63xx_dev_wdt.h> 
    4847+#include <bcm63xx_dev_enet.h> 
    4948+#include <bcm63xx_dev_pcmcia.h> 
     
    217216+       u32 val; 
    218217+ 
    219 +       bcm63xx_uart_register(); 
    220 +       bcm63xx_wdt_register(); 
    221 + 
    222218+       if (board.has_pccard) 
    223219+               bcm63xx_pcmcia_register(); 
     
    243239+       mtd_resources[0].start = val; 
    244240+       mtd_resources[0].end = 0x1FFFFFFF; 
    245 +        
     241+ 
    246242+       platform_device_register(&mtd_dev); 
    247243+ 
Note: See TracChangeset for help on using the changeset viewer.