Changeset 34108


Ignore:
Timestamp:
2012-11-07T21:25:34+01:00 (5 years ago)
Author:
blogic
Message:

ramips: port patches to linux-3.6

Signed-off-by: Daniel Golle <dgolle@…>

create mode 100644 target/linux/ramips/patches-3.6/001-mips-add-cp0-compare-irq-function.patch
create mode 100644 target/linux/ramips/patches-3.6/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch
create mode 100644 target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch
create mode 100644 target/linux/ramips/patches-3.6/100-mips-ralink-core.patch
create mode 100644 target/linux/ramips/patches-3.6/101-rt288x_serial_driver_hack.patch
create mode 100644 target/linux/ramips/patches-3.6/102-rt288x-pci-driver-hook.patch
create mode 100644 target/linux/ramips/patches-3.6/103-ethernet.patch
create mode 100644 target/linux/ramips/patches-3.6/104-ramips-watchdog-driver.patch
create mode 100644 target/linux/ramips/patches-3.6/105-ramips-spi-driver.patch
create mode 100644 target/linux/ramips/patches-3.6/105-usb_dwc_otg.patch
create mode 100644 target/linux/ramips/patches-3.6/106-rt3883-pci-support.patch
create mode 100644 target/linux/ramips/patches-3.6/200-rt3883-ehci-glue.patch
create mode 100644 target/linux/ramips/patches-3.6/201-rt3883-ohci-glue.patch

Location:
trunk/target/linux/ramips/patches-3.6
Files:
1 added
13 copied

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ramips/patches-3.6/001-mips-add-cp0-compare-irq-function.patch

    r34107 r34108  
    99 extern void check_wait(void); 
    1010 extern asmlinkage void r4k_wait(void); 
    11 @@ -1593,6 +1594,8 @@ void __cpuinit per_cpu_trap_init(void) 
     11@@ -1598,6 +1599,8 @@ void __cpuinit per_cpu_trap_init(bool is 
    1212        if (cpu_has_mips_r2) { 
    1313                cp0_compare_irq_shift = CAUSEB_TI - CAUSEB_IP; 
  • trunk/target/linux/ramips/patches-3.6/010-mtd_fix_cfi_cmdset_0002_erase_status_check.patch

    r34107 r34108  
    11--- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    22+++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
    3 @@ -1627,7 +1627,7 @@ static int __xipram do_erase_chip(struct 
     3@@ -1860,7 +1860,7 @@ static int __xipram do_erase_chip(struct 
    44                        chip->erase_suspended = 0; 
    55                } 
     
    1010  
    1111                if (time_after(jiffies, timeo)) { 
    12 @@ -1715,7 +1715,7 @@ static int __xipram do_erase_oneblock(st 
     12@@ -1949,7 +1949,7 @@ static int __xipram do_erase_oneblock(st 
    1313                        chip->erase_suspended = 0; 
    1414                } 
  • trunk/target/linux/ramips/patches-3.6/011-mtd-cfi_cmdset_0002-force-word-write.patch

    r34107 r34108  
    1 --- a/drivers/mtd/chips/cfi_cmdset_0002.c 
    2 +++ b/drivers/mtd/chips/cfi_cmdset_0002.c 
     1Index: linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c 
     2=================================================================== 
     3--- linux-3.6.6.orig/drivers/mtd/chips/cfi_cmdset_0002.c 
     4+++ linux-3.6.6/drivers/mtd/chips/cfi_cmdset_0002.c 
    35@@ -39,7 +39,7 @@ 
    46 #include <linux/mtd/xip.h> 
     
    3638 /* Atmel chips don't use the same PRI format as AMD chips */ 
    3739 static void fixup_convert_atmel_pri(struct mtd_info *mtd) 
    38 @@ -1378,6 +1382,7 @@ static int cfi_amdstd_write_words(struct 
     40@@ -1376,6 +1380,7 @@ static int cfi_amdstd_write_words(struct 
    3941 /* 
    4042  * FIXME: interleaved mode not tested, and probably not supported! 
     
    4446                                    unsigned long adr, const u_char *buf, 
    4547                                    int len) 
    46 @@ -1490,7 +1495,6 @@ static int __xipram do_write_buffer(stru 
     48@@ -1488,7 +1493,6 @@ static int __xipram do_write_buffer(stru 
    4749        return ret; 
    4850 } 
     
    5254                                    size_t *retlen, const u_char *buf) 
    5355 { 
    54 @@ -1565,6 +1569,7 @@ static int cfi_amdstd_write_buffers(stru 
     56@@ -1563,6 +1567,7 @@ static int cfi_amdstd_write_buffers(stru 
    5557  
    5658        return 0; 
  • trunk/target/linux/ramips/patches-3.6/100-mips-ralink-core.patch

    r34107 r34108  
    11--- a/arch/mips/Kconfig 
    22+++ b/arch/mips/Kconfig 
    3 @@ -90,6 +90,9 @@ config ATH79 
     3@@ -99,6 +99,9 @@ config ATH79 
    44        help 
    55          Support for the Atheros AR71XX/AR724X/AR913X SoCs. 
     
    1111        bool "Broadcom BCM47XX based boards" 
    1212        select CEVT_R4K 
    13 @@ -822,6 +825,7 @@ source "arch/mips/jz4740/Kconfig" 
     13@@ -846,6 +849,7 @@ source "arch/mips/jz4740/Kconfig" 
    1414 source "arch/mips/lantiq/Kconfig" 
    1515 source "arch/mips/lasat/Kconfig" 
     
    1919 source "arch/mips/sgi-ip27/Kconfig" 
    2020 source "arch/mips/sibyte/Kconfig" 
    21 @@ -1171,7 +1175,7 @@ config BOOT_ELF32 
     21@@ -1188,7 +1192,7 @@ config BOOT_ELF32 
    2222  
    2323 config MIPS_L1_CACHE_SHIFT 
     
    3030--- a/arch/mips/Kbuild.platforms 
    3131+++ b/arch/mips/Kbuild.platforms 
    32 @@ -21,6 +21,7 @@ platforms += pmc-sierra 
     32@@ -22,6 +22,7 @@ platforms += pmc-sierra 
    3333 platforms += pnx833x 
    3434 platforms += pnx8550 
  • trunk/target/linux/ramips/patches-3.6/101-rt288x_serial_driver_hack.patch

    r34107 r34108  
    11--- a/drivers/tty/serial/8250/Kconfig 
    22+++ b/drivers/tty/serial/8250/Kconfig 
    3 @@ -258,6 +258,14 @@ config SERIAL_8250_ACORN 
     3@@ -249,6 +249,14 @@ config SERIAL_8250_ACORN 
    44          system, say Y to this option.  The driver can handle 1, 2, or 3 port 
    55          cards.  If unsure, say N. 
     
    1818--- a/include/linux/serial_core.h 
    1919+++ b/include/linux/serial_core.h 
    20 @@ -321,7 +321,7 @@ struct uart_port { 
     20@@ -325,7 +325,7 @@ struct uart_port { 
    2121 #define UPIO_HUB6              (1) 
    2222 #define UPIO_MEM               (2) 
     
    2929--- a/drivers/tty/serial/8250/8250.c 
    3030+++ b/drivers/tty/serial/8250/8250.c 
    31 @@ -292,9 +292,9 @@ static const struct serial8250_config ua 
    32         }, 
    33  }; 
     31@@ -305,9 +305,9 @@ static void default_serial_dl_write(stru 
     32        serial_out(up, UART_DLM, value >> 8 & 0xff); 
     33 } 
    3434  
    35 -#if defined(CONFIG_MIPS_ALCHEMY) 
    36 +#if defined(CONFIG_MIPS_ALCHEMY) || defined (CONFIG_SERIAL_8250_RT288X) 
     35-#ifdef CONFIG_MIPS_ALCHEMY 
     36+#if defined CONFIG_MIPS_ALCHEMY || defined (CONFIG_SERIAL_8250_RT288X) 
    3737  
    3838-/* Au1x00 UART hardware has a weird register layout */ 
     
    4141        [UART_RX]  = 0, 
    4242        [UART_IER] = 2, 
    43 @@ -516,8 +516,8 @@ static inline void _serial_dl_write(stru 
    44         serial_outp(up, UART_DLM, value >> 8 & 0xff); 
    45  } 
     43@@ -486,7 +486,7 @@ static void set_io_from_upio(struct uart 
     44                break; 
     45 #endif 
    4646  
    47 -#if defined(CONFIG_MIPS_ALCHEMY) 
    48 -/* Au1x00 haven't got a standard divisor latch */ 
    49 +#if defined(CONFIG_MIPS_ALCHEMY) || defined (CONFIG_SERIAL_8250_RT288X) 
    50 +/* Au1x00 and RT288x haven't got a standard divisor latch */ 
    51  static int serial_dl_read(struct uart_8250_port *up) 
    52  { 
    53         if (up->port.iotype == UPIO_AU) 
    54 @@ -724,22 +724,19 @@ static int size_fifo(struct uart_8250_po 
     47-#ifdef CONFIG_MIPS_ALCHEMY 
     48+#if defined(CONFIG_MIPS_ALCHEMY) || defined(CONFIG_SERIAL_8250_RT288X) 
     49        case UPIO_AU: 
     50                p->serial_in = au_serial_in; 
     51                p->serial_out = au_serial_out; 
     52@@ -698,22 +698,19 @@ static int size_fifo(struct uart_8250_po 
    5553  */ 
    5654 static unsigned int autoconfig_read_divisor_id(struct uart_8250_port *p) 
     
    6159        unsigned int id; 
    6260  
    63         old_lcr = serial_inp(p, UART_LCR); 
    64         serial_outp(p, UART_LCR, UART_LCR_CONF_MODE_A); 
     61        old_lcr = serial_in(p, UART_LCR); 
     62        serial_out(p, UART_LCR, UART_LCR_CONF_MODE_A); 
    6563  
    66 -       old_dll = serial_inp(p, UART_DLL); 
    67 -       old_dlm = serial_inp(p, UART_DLM); 
     64-       old_dll = serial_in(p, UART_DLL); 
     65-       old_dlm = serial_in(p, UART_DLM); 
    6866+       old_dl = serial_dl_read(p); 
    6967  
    70 -       serial_outp(p, UART_DLL, 0); 
    71 -       serial_outp(p, UART_DLM, 0); 
     68-       serial_out(p, UART_DLL, 0); 
     69-       serial_out(p, UART_DLM, 0); 
    7270+       serial_dl_write(p, 0); 
    7371+       id = serial_dl_read(p); 
    7472  
    75 -       id = serial_inp(p, UART_DLL) | serial_inp(p, UART_DLM) << 8; 
     73-       id = serial_in(p, UART_DLL) | serial_in(p, UART_DLM) << 8; 
    7674- 
    77 -       serial_outp(p, UART_DLL, old_dll); 
    78 -       serial_outp(p, UART_DLM, old_dlm); 
     75-       serial_out(p, UART_DLL, old_dll); 
     76-       serial_out(p, UART_DLM, old_dlm); 
    7977+       serial_dl_write(p, old_dl); 
    80         serial_outp(p, UART_LCR, old_lcr); 
     78        serial_out(p, UART_LCR, old_lcr); 
    8179  
    8280        return id; 
    83 @@ -865,7 +862,7 @@ static int broken_efr(struct uart_8250_p 
     81@@ -839,7 +836,7 @@ static int broken_efr(struct uart_8250_p 
    8482        /* 
    8583         * Exar ST16C2550 "A2" devices incorrectly detect as 
  • trunk/target/linux/ramips/patches-3.6/102-rt288x-pci-driver-hook.patch

    r34107 r34108  
    33@@ -21,6 +21,7 @@ obj-$(CONFIG_BCM63XX)         += pci-bcm63xx.o 
    44 obj-$(CONFIG_MIPS_ALCHEMY)     += pci-alchemy.o 
    5  obj-$(CONFIG_SOC_AR724X)       += pci-ath724x.o 
    6  obj-$(CONFIG_SOC_RT288X)       += pci-rt288x.o 
    7 +obj-$(CONFIG_SOC_RT3883)       += pci-rt3883.o 
     5 obj-$(CONFIG_SOC_AR71XX)       += pci-ar71xx.o 
     6 obj-$(CONFIG_PCI_AR724X)       += pci-ar724x.o 
     7+obj-$(CONFIG_SOC_RT288X)       += pci-rt288x.o 
    88  
    99 # 
  • trunk/target/linux/ramips/patches-3.6/103-ethernet.patch

    r34107 r34108  
    11--- a/drivers/net/ethernet/Kconfig 
    22+++ b/drivers/net/ethernet/Kconfig 
    3 @@ -144,6 +144,7 @@ source "drivers/net/ethernet/packetengin 
     3@@ -145,6 +145,7 @@ source "drivers/net/ethernet/packetengin 
    44 source "drivers/net/ethernet/pasemi/Kconfig" 
    55 source "drivers/net/ethernet/qlogic/Kconfig" 
     
    1111--- a/drivers/net/ethernet/Makefile 
    1212+++ b/drivers/net/ethernet/Makefile 
    13 @@ -54,6 +54,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe 
     13@@ -55,6 +55,7 @@ obj-$(CONFIG_NET_PACKET_ENGINE) += packe 
    1414 obj-$(CONFIG_NET_VENDOR_PASEMI) += pasemi/ 
    1515 obj-$(CONFIG_NET_VENDOR_QLOGIC) += qlogic/ 
  • trunk/target/linux/ramips/patches-3.6/104-ramips-watchdog-driver.patch

    r34107 r34108  
    11--- a/drivers/watchdog/Kconfig 
    22+++ b/drivers/watchdog/Kconfig 
    3 @@ -1033,6 +1033,13 @@ config LANTIQ_WDT 
     3@@ -1064,6 +1064,13 @@ config LANTIQ_WDT 
    44        help 
    55          Hardware driver for the Lantiq SoC Watchdog Timer. 
  • trunk/target/linux/ramips/patches-3.6/105-ramips-spi-driver.patch

    r34107 r34108  
    55          SPI driver for Renesas RSPI blocks. 
    66  
    7 +config SPI_RB4XX 
    8 +       tristate "Mikrotik RB4XX SPI master" 
    9 +       depends on SPI_MASTER && ATH79_MACH_RB4XX 
     7+config SPI_RAMIPS 
     8+       tristate "Ralink RT288x/RT305x/RT3662 SPI Controller" 
     9+       depends on (SOC_RT288X || SOC_RT305X || SOC_RT3883) 
    1010+       help 
    11 +         SPI controller driver for the Mikrotik RB4xx series boards. 
     11+         This selects a driver for the Ralink RT288x/RT305x SPI Controller. 
    1212+ 
    1313 config SPI_S3C24XX 
     
    2020 obj-$(CONFIG_SPI_PXA2XX)               += spi-pxa2xx.o 
    2121 obj-$(CONFIG_SPI_PXA2XX_PCI)           += spi-pxa2xx-pci.o 
    22 +obj-$(CONFIG_SPI_RB4XX)                        += spi-rb4xx.o 
     22+obj-$(CONFIG_SPI_RAMIPS)               += spi-ramips.o 
    2323 obj-$(CONFIG_SPI_RSPI)                 += spi-rspi.o 
    2424 obj-$(CONFIG_SPI_S3C24XX)              += spi-s3c24xx-hw.o 
  • trunk/target/linux/ramips/patches-3.6/105-usb_dwc_otg.patch

    r34107 r34108  
    11--- a/drivers/usb/Kconfig 
    22+++ b/drivers/usb/Kconfig 
    3 @@ -182,4 +182,6 @@ source "drivers/usb/gadget/Kconfig" 
     3@@ -187,4 +187,6 @@ source "drivers/usb/gadget/Kconfig" 
    44  
    55 source "drivers/usb/otg/Kconfig" 
     
    1010--- a/drivers/usb/Makefile 
    1111+++ b/drivers/usb/Makefile 
    12 @@ -51,6 +51,8 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP)       += early 
     12@@ -52,6 +52,8 @@ obj-$(CONFIG_EARLY_PRINTK_DBGP)       += early 
    1313 obj-$(CONFIG_USB_ATM)          += atm/ 
    1414 obj-$(CONFIG_USB_SPEEDTOUCH)   += atm/ 
     
    1717+ 
    1818 obj-$(CONFIG_USB_MUSB_HDRC)    += musb/ 
     19 obj-$(CONFIG_USB_CHIPIDEA)     += chipidea/ 
    1920 obj-$(CONFIG_USB_RENESAS_USBHS)        += renesas_usbhs/ 
    20  obj-$(CONFIG_USB_GADGET)       += gadget/ 
  • trunk/target/linux/ramips/patches-3.6/106-rt3883-pci-support.patch

    r34107 r34108  
    11--- a/arch/mips/pci/Makefile 
    22+++ b/arch/mips/pci/Makefile 
    3 @@ -21,6 +21,7 @@ obj-$(CONFIG_BCM63XX)         += pci-bcm63xx.o 
    4  obj-$(CONFIG_MIPS_ALCHEMY)     += pci-alchemy.o 
    5  obj-$(CONFIG_SOC_AR724X)       += pci-ath724x.o 
     3@@ -22,6 +22,7 @@ obj-$(CONFIG_MIPS_ALCHEMY)    += pci-alchem 
     4 obj-$(CONFIG_SOC_AR71XX)       += pci-ar71xx.o 
     5 obj-$(CONFIG_PCI_AR724X)       += pci-ar724x.o 
    66 obj-$(CONFIG_SOC_RT288X)       += pci-rt288x.o 
    77+obj-$(CONFIG_SOC_RT3883)       += pci-rt3883.o 
  • trunk/target/linux/ramips/patches-3.6/200-rt3883-ehci-glue.patch

    r34107 r34108  
    11--- a/drivers/usb/host/Kconfig 
    22+++ b/drivers/usb/host/Kconfig 
    3 @@ -226,6 +226,15 @@ config USB_EHCI_ATH79 
     3@@ -235,6 +235,15 @@ config USB_EHCI_ATH79 
    44          Enables support for the built-in EHCI controller present 
    55          on the Atheros AR7XXX/AR9XXX SoCs. 
     
    1919--- a/drivers/usb/host/ehci-hcd.c 
    2020+++ b/drivers/usb/host/ehci-hcd.c 
    21 @@ -1381,6 +1381,11 @@ MODULE_LICENSE ("GPL"); 
    22  #define        PLATFORM_DRIVER         ehci_mv_driver 
     21@@ -1339,6 +1339,11 @@ MODULE_LICENSE ("GPL"); 
     22 #define PLATFORM_DRIVER                ehci_platform_driver 
    2323 #endif 
    2424  
  • trunk/target/linux/ramips/patches-3.6/201-rt3883-ohci-glue.patch

    r34107 r34108  
    11--- a/drivers/usb/host/Kconfig 
    22+++ b/drivers/usb/host/Kconfig 
    3 @@ -328,6 +328,14 @@ config USB_OHCI_ATH79 
     3@@ -342,6 +342,14 @@ config USB_OHCI_ATH79 
    44          Enables support for the built-in OHCI controller present on the 
    55          Atheros AR71XX/AR7240 SoCs. 
     
    1818--- a/drivers/usb/host/ohci-hcd.c 
    1919+++ b/drivers/usb/host/ohci-hcd.c 
    20 @@ -1121,6 +1121,11 @@ MODULE_LICENSE ("GPL"); 
    21  #define PLATFORM_DRIVER                ohci_xls_driver 
     20@@ -1120,6 +1120,11 @@ MODULE_LICENSE ("GPL"); 
     21 #define PLATFORM_DRIVER                ohci_platform_driver 
    2222 #endif 
    2323  
Note: See TracChangeset for help on using the changeset viewer.