Changeset 23317


Ignore:
Timestamp:
2010-10-08T14:10:18+02:00 (6 years ago)
Author:
acoul
Message:

linux/ar71xx: add preliminary 2.6.36 kernel support (refresh patches)

Location:
trunk/target/linux/ar71xx
Files:
21 edited
2 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ar71xx/patches-2.6.36/001-ar71xx_core.patch

    r22803 r23317  
    11--- a/arch/mips/Makefile 
    22+++ b/arch/mips/Makefile 
    3 @@ -181,6 +181,13 @@ ifeq (,$(findstring march=octeon, $(cfla 
     3@@ -162,6 +162,13 @@ ifeq (,$(findstring march=octeon, $(cfla 
    44 cflags-$(CONFIG_CPU_CAVIUM_OCTEON) += -Wa,-march=octeon 
    55 endif 
     
    1717--- a/arch/mips/Kconfig 
    1818+++ b/arch/mips/Kconfig 
    19 @@ -48,6 +48,23 @@ config AR7 
     19@@ -60,6 +60,23 @@ config AR7 
    2020          Support for the Texas Instruments AR7 System-on-a-Chip 
    2121          family: TNETD7100, 7200 and 7300. 
     
    4141        bool "Broadcom BCM47XX based boards" 
    4242        select CEVT_R4K 
    43 @@ -684,6 +701,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
     43@@ -709,6 +726,7 @@ config CAVIUM_OCTEON_REFERENCE_BOARD 
    4444 endchoice 
    4545  
     
    4848 source "arch/mips/bcm63xx/Kconfig" 
    4949 source "arch/mips/jazz/Kconfig" 
    50  source "arch/mips/lasat/Kconfig" 
     50 source "arch/mips/jz4740/Kconfig" 
  • trunk/target/linux/ar71xx/patches-2.6.36/003-ar71xx_usb_host.patch

    r22803 r23317  
    11--- a/drivers/usb/host/Kconfig 
    22+++ b/drivers/usb/host/Kconfig 
    3 @@ -109,6 +109,13 @@ config XPS_USB_HCD_XILINX 
     3@@ -112,6 +112,13 @@ config XPS_USB_HCD_XILINX 
    44                support both high speed and full speed devices, or high speed 
    55                devices only. 
     
    1515        bool "Support for Freescale on-chip EHCI USB controller" 
    1616        depends on USB_EHCI_HCD && FSL_SOC 
    17 @@ -222,6 +229,13 @@ config USB_OHCI_HCD_OMAP3 
     17@@ -225,6 +232,13 @@ config USB_OHCI_HCD_OMAP3 
    1818          Enables support for the on-chip OHCI controller on 
    1919          OMAP3 and later chips. 
     
    3131--- a/drivers/usb/host/ehci-hcd.c 
    3232+++ b/drivers/usb/host/ehci-hcd.c 
    33 @@ -1158,6 +1158,11 @@ MODULE_LICENSE ("GPL"); 
     33@@ -1197,6 +1197,11 @@ MODULE_LICENSE ("GPL"); 
    3434 #define        PLATFORM_DRIVER         ehci_atmel_driver 
    3535 #endif 
     
    4545--- a/drivers/usb/host/ohci-hcd.c 
    4646+++ b/drivers/usb/host/ohci-hcd.c 
    47 @@ -1095,6 +1095,11 @@ MODULE_LICENSE ("GPL"); 
    48  #define TMIO_OHCI_DRIVER       ohci_hcd_tmio_driver 
     47@@ -1100,6 +1100,11 @@ MODULE_LICENSE ("GPL"); 
     48 #define PLATFORM_DRIVER        ohci_hcd_jz4740_driver 
    4949 #endif 
    5050  
  • trunk/target/linux/ar71xx/patches-2.6.36/005-ar71xx_mac_driver.patch

    r22803 r23317  
    11--- a/drivers/net/Kconfig 
    22+++ b/drivers/net/Kconfig 
    3 @@ -2032,6 +2032,8 @@ config ACENIC_OMIT_TIGON_I 
     3@@ -2045,6 +2045,8 @@ config ACENIC_OMIT_TIGON_I 
    44  
    55          The safe and default value for this is N. 
  • trunk/target/linux/ar71xx/patches-2.6.36/006-ar71xx_wdt_driver.patch

    r22803 r23317  
    11--- a/drivers/watchdog/Kconfig 
    22+++ b/drivers/watchdog/Kconfig 
    3 @@ -875,6 +875,13 @@ config TXX9_WDT 
    4         help 
    5           Hardware driver for the built-in watchdog timer on TXx9 MIPS SoCs. 
     3@@ -916,6 +916,13 @@ config OCTEON_WDT 
     4          from the first interrupt, it is then only poked when the 
     5          device is written. 
    66  
    77+config AR71XX_WDT 
     
    1717--- a/drivers/watchdog/Makefile 
    1818+++ b/drivers/watchdog/Makefile 
    19 @@ -114,6 +114,7 @@ obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt 
     19@@ -114,6 +114,7 @@ obj-$(CONFIG_INDYDOG) += indydog.o 
     20 obj-$(CONFIG_WDT_MTX1) += mtx-1_wdt.o 
     21 obj-$(CONFIG_PNX833X_WDT) += pnx833x_wdt.o 
    2022 obj-$(CONFIG_SIBYTE_WDOG) += sb_wdog.o 
     23+obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o 
    2124 obj-$(CONFIG_AR7_WDT) += ar7_wdt.o 
    2225 obj-$(CONFIG_TXX9_WDT) += txx9wdt.o 
    23 +obj-$(CONFIG_AR71XX_WDT) += ar71xx_wdt.o 
    24   
    25  # PARISC Architecture 
    26   
     26 obj-$(CONFIG_OCTEON_WDT) += octeon-wdt.o 
  • trunk/target/linux/ar71xx/patches-2.6.36/102-mtd_m25p80_add_myloader_parser.patch

    r22864 r23317  
    11--- a/drivers/mtd/devices/m25p80.c 
    22+++ b/drivers/mtd/devices/m25p80.c 
    3 @@ -928,6 +928,16 @@ static int __devinit m25p_probe(struct s 
     3@@ -933,6 +933,16 @@ static int __devinit m25p_probe(struct s 
    44                                        part_probes, &parts, 0); 
    55                } 
  • trunk/target/linux/ar71xx/patches-2.6.36/104-mtd_m25p80_add_redboot_parser.patch

    r22864 r23317  
    11--- a/drivers/mtd/devices/m25p80.c 
    22+++ b/drivers/mtd/devices/m25p80.c 
    3 @@ -938,6 +938,15 @@ static int __devinit m25p_probe(struct s 
     3@@ -943,6 +943,15 @@ static int __devinit m25p_probe(struct s 
    44                } 
    55 #endif 
  • trunk/target/linux/ar71xx/patches-2.6.36/108-mtd_fix_cfi_cmdset_0002_status_check.patch

    r22803 r23317  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -1217,8 +1217,8 @@ static int __xipram do_write_oneword(str 
     3@@ -1190,8 +1190,8 @@ static int __xipram do_write_oneword(str 
    44                        break; 
    55                } 
     
    1212                /* Latency issues. Drop the lock, wait a while and retry */ 
    1313                UDELAY(map, chip, adr, 1); 
    14 @@ -1234,6 +1234,8 @@ static int __xipram do_write_oneword(str 
     14@@ -1207,6 +1207,8 @@ static int __xipram do_write_oneword(str 
    1515  
    1616                ret = -EIO; 
     
    2121  op_done: 
    2222        chip->state = FL_READY; 
    23 @@ -1580,7 +1582,6 @@ static int cfi_amdstd_write_buffers(stru 
     23@@ -1553,7 +1555,6 @@ static int cfi_amdstd_write_buffers(stru 
    2424        return 0; 
    2525 } 
     
    2929  * Handle devices with one erase region, that only implement 
    3030  * the chip erase command. 
    31 @@ -1644,8 +1645,8 @@ static int __xipram do_erase_chip(struct 
     31@@ -1617,8 +1618,8 @@ static int __xipram do_erase_chip(struct 
    3232                        chip->erase_suspended = 0; 
    3333                } 
     
    4040                if (time_after(jiffies, timeo)) { 
    4141                        printk(KERN_WARNING "MTD %s(): software timeout\n", 
    42 @@ -1665,6 +1666,7 @@ static int __xipram do_erase_chip(struct 
     42@@ -1638,6 +1639,7 @@ static int __xipram do_erase_chip(struct 
    4343                ret = -EIO; 
    4444        } 
     
    4848        xip_enable(map, chip, adr); 
    4949        put_chip(map, chip, adr); 
    50 @@ -1732,9 +1734,9 @@ static int __xipram do_erase_oneblock(st 
     50@@ -1705,9 +1707,9 @@ static int __xipram do_erase_oneblock(st 
    5151                        chip->erase_suspended = 0; 
    5252                } 
     
    6060  
    6161                if (time_after(jiffies, timeo)) { 
    62 @@ -1756,6 +1758,7 @@ static int __xipram do_erase_oneblock(st 
     62@@ -1729,6 +1731,7 @@ static int __xipram do_erase_oneblock(st 
    6363                ret = -EIO; 
    6464        } 
  • trunk/target/linux/ar71xx/patches-2.6.36/109-mtd-wrt160nl-trx-parser.patch

    r22864 r23317  
    11--- a/drivers/mtd/devices/m25p80.c 
    22+++ b/drivers/mtd/devices/m25p80.c 
    3 @@ -947,6 +947,16 @@ static int __devinit m25p_probe(struct s 
     3@@ -952,6 +952,16 @@ static int __devinit m25p_probe(struct s 
    44                                        part_probes, &parts, 0); 
    55                } 
  • trunk/target/linux/ar71xx/patches-2.6.36/110-usb-ehci-add-war-for-synopsys-hc-bug.patch

    r22803 r23317  
    11--- a/drivers/usb/host/ehci-q.c 
    22+++ b/drivers/usb/host/ehci-q.c 
    3 @@ -1194,6 +1194,9 @@ static void end_unlink_async (struct ehc 
     3@@ -1193,6 +1193,9 @@ static void end_unlink_async (struct ehc 
    44                ehci->reclaim = NULL; 
    55                start_unlink_async (ehci, next); 
  • trunk/target/linux/ar71xx/patches-2.6.36/111-mtd-cfi_cmdset_0002-force-word-write.patch

    r22803 r23317  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -40,7 +40,7 @@ 
     3@@ -39,7 +39,7 @@ 
    44 #include <linux/mtd/xip.h> 
    55  
     
    1010 #define MAX_WORD_RETRIES 3 
    1111  
    12 @@ -51,7 +51,9 @@ 
     12@@ -50,7 +50,9 @@ 
    1313  
    1414 static int cfi_amdstd_read (struct mtd_info *, loff_t, size_t, size_t *, u_char *); 
     
    2020 static int cfi_amdstd_erase_varsize(struct mtd_info *, struct erase_info *); 
    2121 static void cfi_amdstd_sync (struct mtd_info *); 
    22 @@ -187,6 +189,7 @@ static void fixup_amd_bootblock(struct m 
     22@@ -186,6 +188,7 @@ static void fixup_amd_bootblock(struct m 
    2323 } 
    2424 #endif 
     
    2828 { 
    2929        struct map_info *map = mtd->priv; 
    30 @@ -196,6 +199,7 @@ static void fixup_use_write_buffers(stru 
     30@@ -195,6 +198,7 @@ static void fixup_use_write_buffers(stru 
    3131                mtd->write = cfi_amdstd_write_buffers; 
    3232        } 
     
    3636 /* Atmel chips don't use the same PRI format as AMD chips */ 
    3737 static void fixup_convert_atmel_pri(struct mtd_info *mtd, void *param) 
    38 @@ -1391,6 +1395,7 @@ static int cfi_amdstd_write_words(struct 
     38@@ -1364,6 +1368,7 @@ static int cfi_amdstd_write_words(struct 
    3939 /* 
    4040  * FIXME: interleaved mode not tested, and probably not supported! 
     
    4444                                    unsigned long adr, const u_char *buf, 
    4545                                    int len) 
    46 @@ -1502,7 +1507,6 @@ static int __xipram do_write_buffer(stru 
     46@@ -1475,7 +1480,6 @@ static int __xipram do_write_buffer(stru 
    4747        return ret; 
    4848 } 
     
    5252                                    size_t *retlen, const u_char *buf) 
    5353 { 
    54 @@ -1581,6 +1585,7 @@ static int cfi_amdstd_write_buffers(stru 
     54@@ -1554,6 +1558,7 @@ static int cfi_amdstd_write_buffers(stru 
    5555  
    5656        return 0; 
  • trunk/target/linux/ar71xx/patches-2.6.36/122-dsa-add-qinq-tagging-format.patch

    r21734 r23317  
    4646--- a/net/dsa/slave.c 
    4747+++ b/net/dsa/slave.c 
    48 @@ -321,6 +321,19 @@ static const struct net_device_ops edsa_ 
     48@@ -320,6 +320,19 @@ static const struct net_device_ops edsa_ 
    4949        .ndo_do_ioctl           = dsa_slave_ioctl, 
    5050 }; 
     
    6666 static const struct net_device_ops trailer_netdev_ops = { 
    6767        .ndo_init               = dsa_slave_init, 
    68 @@ -366,6 +379,11 @@ dsa_slave_create(struct dsa_switch *ds,  
     68@@ -365,6 +378,11 @@ dsa_slave_create(struct dsa_switch *ds, 
    6969                slave_dev->netdev_ops = &edsa_netdev_ops; 
    7070                break; 
  • trunk/target/linux/ar71xx/patches-2.6.36/140-redboot_partition_scan.patch

    r21734 r23317  
    11--- a/drivers/mtd/redboot.c 
    22+++ b/drivers/mtd/redboot.c 
    3 @@ -60,31 +60,32 @@ static int parse_redboot_partitions(stru 
     3@@ -78,31 +78,32 @@ static int parse_redboot_partitions(stru 
    44        static char nullstring[] = "unallocated"; 
    55 #endif 
     
    4141               master->name, offset); 
    4242  
    43 @@ -156,6 +157,11 @@ static int parse_redboot_partitions(stru 
     43@@ -174,6 +175,11 @@ static int parse_redboot_partitions(stru 
    4444        } 
    4545        if (i == numslots) { 
  • trunk/target/linux/ar71xx/patches-2.6.36/151-spi-add-various-flags.patch

    r22863 r23317  
    11--- a/include/linux/spi/spi.h 
    22+++ b/include/linux/spi/spi.h 
    3 @@ -435,6 +435,8 @@ struct spi_transfer { 
     3@@ -438,6 +438,8 @@ struct spi_transfer { 
    44        dma_addr_t      rx_dma; 
    55  
     
    1010        u16             delay_usecs; 
    1111        u32             speed_hz; 
    12 @@ -476,6 +478,7 @@ struct spi_message { 
     12@@ -479,6 +481,7 @@ struct spi_message { 
    1313        struct spi_device       *spi; 
    1414  
  • trunk/target/linux/ar71xx/patches-2.6.36/200-rb4xx_nand_driver.patch

    r22803 r23317  
    11--- a/drivers/mtd/nand/Kconfig 
    22+++ b/drivers/mtd/nand/Kconfig 
    3 @@ -526,4 +526,8 @@ config MTD_NAND_NUC900 
    4           This enables the driver for the NAND Flash on evaluation board based 
    5           on w90p910 / NUC9xx. 
     3@@ -531,4 +531,8 @@ config MTD_NAND_JZ4740 
     4        help 
     5                Enables support for NAND Flash on JZ4740 SoC based boards. 
    66  
    77+config MTD_NAND_RB4XX 
  • trunk/target/linux/ar71xx/patches-2.6.36/201-ap83_spi_controller.patch

    r21734 r23317  
    2626        tristate "Atheros AR71xx SPI Controller" 
    2727        depends on SPI_MASTER && ATHEROS_AR71XX 
     28--- a/drivers/spi/ap83_spi.c 
     29+++ b/drivers/spi/ap83_spi.c 
     30@@ -132,28 +132,28 @@ static u32 ap83_spi_txrx_mode0(struct sp 
     31                               unsigned nsecs, u32 word, u8 bits) 
     32 { 
     33        dev_dbg(&spi->dev, "TXRX0 word=%08x, bits=%u\n", word, bits); 
     34-       return bitbang_txrx_be_cpha0(spi, nsecs, 0, word, bits); 
     35+       return bitbang_txrx_be_cpha0(spi, nsecs, 0, 0, word, bits); 
     36 } 
     37  
     38 static u32 ap83_spi_txrx_mode1(struct spi_device *spi, 
     39                               unsigned nsecs, u32 word, u8 bits) 
     40 { 
     41        dev_dbg(&spi->dev, "TXRX1 word=%08x, bits=%u\n", word, bits); 
     42-       return bitbang_txrx_be_cpha1(spi, nsecs, 0, word, bits); 
     43+       return bitbang_txrx_be_cpha1(spi, nsecs, 0, 0, word, bits); 
     44 } 
     45  
     46 static u32 ap83_spi_txrx_mode2(struct spi_device *spi, 
     47                               unsigned nsecs, u32 word, u8 bits) 
     48 { 
     49        dev_dbg(&spi->dev, "TXRX2 word=%08x, bits=%u\n", word, bits); 
     50-       return bitbang_txrx_be_cpha0(spi, nsecs, 1, word, bits); 
     51+       return bitbang_txrx_be_cpha0(spi, nsecs, 1, 0, word, bits); 
     52 } 
     53  
     54 static u32 ap83_spi_txrx_mode3(struct spi_device *spi, 
     55                               unsigned nsecs, u32 word, u8 bits) 
     56 { 
     57        dev_dbg(&spi->dev, "TXRX3 word=%08x, bits=%u\n", word, bits); 
     58-       return bitbang_txrx_be_cpha1(spi, nsecs, 1, word, bits); 
     59+       return bitbang_txrx_be_cpha1(spi, nsecs, 1, 0, word, bits); 
     60 } 
     61  
     62 static int ap83_spi_probe(struct platform_device *pdev) 
  • trunk/target/linux/ar71xx/patches-2.6.36/205-wndr3700-usb-led-driver.patch

    r22803 r23317  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -311,6 +311,13 @@ config LEDS_TRIGGERS 
     3@@ -320,6 +320,13 @@ config LEDS_TRIGGERS 
    44  
    55 if LEDS_TRIGGERS 
  • trunk/target/linux/ar71xx/patches-2.6.36/206-nxp-74hc153-gpio-chip-driver.patch

    r22803 r23317  
    11--- a/drivers/gpio/Kconfig 
    22+++ b/drivers/gpio/Kconfig 
    3 @@ -343,4 +343,12 @@ config GPIO_JANZ_TTL 
     3@@ -361,4 +361,12 @@ config GPIO_JANZ_TTL 
    44          This driver provides support for driving the pins in output 
    55          mode only. Input mode is not supported. 
  • trunk/target/linux/ar71xx/patches-2.6.36/207-rb750-led-driver.patch

    r22803 r23317  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -318,6 +318,10 @@ config LEDS_WNDR3700_USB 
     3@@ -327,6 +327,10 @@ config LEDS_WNDR3700_USB 
    44          This option enables support for the USB LED found on the 
    55          NETGEAR WNDR3700 board. 
     
    1919 obj-$(CONFIG_LEDS_MC13783)             += leds-mc13783.o 
    2020+obj-$(CONFIG_LEDS_RB750)               += leds-rb750.o 
     21 obj-$(CONFIG_LEDS_NS2)                 += leds-ns2.o 
    2122  
    2223 # LED SPI Drivers 
    23  obj-$(CONFIG_LEDS_DAC124S085)          += leds-dac124s085.o 
  • trunk/target/linux/ar71xx/patches-2.6.36/208-rb750-nand-driver.patch

    r22803 r23317  
    11--- a/drivers/mtd/nand/Kconfig 
    22+++ b/drivers/mtd/nand/Kconfig 
    3 @@ -530,4 +530,8 @@ config MTD_NAND_RB4XX 
     3@@ -535,4 +535,8 @@ config MTD_NAND_RB4XX 
    44        tristate "NAND flash driver for RouterBoard 4xx series" 
    55        depends on MTD_NAND && AR71XX_MACH_RB4XX 
  • trunk/target/linux/ar71xx/patches-2.6.36/300-mips_fw_myloader.patch

    r22803 r23317  
    11--- a/arch/mips/Makefile 
    22+++ b/arch/mips/Makefile 
    3 @@ -203,6 +203,7 @@ endif 
     3@@ -185,6 +185,7 @@ endif 
    44 # 
    55 libs-$(CONFIG_ARC)             += arch/mips/fw/arc/ 
     
    1111--- a/arch/mips/Kconfig 
    1212+++ b/arch/mips/Kconfig 
    13 @@ -879,6 +879,9 @@ config MIPS_NILE4 
     13@@ -901,6 +901,9 @@ config MIPS_NILE4 
    1414 config MIPS_DISABLE_OBSOLETE_IDE 
    1515        bool 
  • trunk/target/linux/ar71xx/patches-2.6.36/901-get_c0_compare_irq_function.patch

    r22803 r23317  
    11--- a/arch/mips/kernel/traps.c 
    22+++ b/arch/mips/kernel/traps.c 
    3 @@ -52,6 +52,7 @@ 
     3@@ -53,6 +53,7 @@ 
    44 #include <asm/stacktrace.h> 
    55 #include <asm/irq.h> 
     
    99 extern void check_wait(void); 
    1010 extern asmlinkage void r4k_wait(void); 
    11 @@ -1519,6 +1520,8 @@ void __cpuinit per_cpu_trap_init(void) 
     11@@ -1539,6 +1540,8 @@ void __cpuinit per_cpu_trap_init(void) 
    1212        if (cpu_has_mips_r2) { 
    1313                cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; 
Note: See TracChangeset for help on using the changeset viewer.