Changeset 25727


Ignore:
Timestamp:
2011-02-26T07:23:32+01:00 (7 years ago)
Author:
nbd
Message:

ixp4xx: clean up patches, fold the 2.6.37 update patch into the relevant board support patches

Location:
trunk/target/linux/ixp4xx/patches-2.6.37
Files:
1 deleted
15 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/ixp4xx/patches-2.6.37/105-wg302v1_support.patch

    r23776 r25727  
    113113--- /dev/null 
    114114+++ b/arch/arm/mach-ixp4xx/wg302v1-setup.c 
    115 @@ -0,0 +1,142 @@ 
     115@@ -0,0 +1,140 @@ 
    116116+/* 
    117117+ * arch/arm/mach-ixp4xx/wg302v1-setup.c 
     
    247247+MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1") 
    248248+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    249 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    250 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    251249+       .map_io         = ixp4xx_map_io, 
    252250+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/110-pronghorn_series_support.patch

    r22924 r25727  
    2020+       select PCI 
    2121+       help 
    22 +         Say 'Y' here if you want your kernel to support the ADI  
     22+         Say 'Y' here if you want your kernel to support the ADI 
    2323+         Engineering Pronghorn series. For more 
    2424+         information on this platform, see http://www.adiengineering.com 
     
    128128--- /dev/null 
    129129+++ b/arch/arm/mach-ixp4xx/pronghorn-setup.c 
    130 @@ -0,0 +1,245 @@ 
     130@@ -0,0 +1,241 @@ 
    131131+/* 
    132132+ * arch/arm/mach-ixp4xx/pronghorn-setup.c 
     
    355355+MACHINE_START(PRONGHORN, "ADI Engineering Pronghorn") 
    356356+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    357 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    358 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    359357+       .map_io         = ixp4xx_map_io, 
    360358+       .init_irq       = ixp4xx_init_irq, 
     
    366364+MACHINE_START(PRONGHORNMETRO, "ADI Engineering Pronghorn Metro") 
    367365+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    368 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    369 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    370366+       .map_io         = ixp4xx_map_io, 
    371367+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/115-sidewinder_support.patch

    r23776 r25727  
    131131--- /dev/null 
    132132+++ b/arch/arm/mach-ixp4xx/sidewinder-setup.c 
    133 @@ -0,0 +1,149 @@ 
     133@@ -0,0 +1,147 @@ 
    134134+/* 
    135135+ * arch/arm/mach-ixp4xx/sidewinder-setup.c 
     
    273273+MACHINE_START(SIDEWINDER, "ADI Engineering Sidewinder") 
    274274+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    275 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    276 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    277275+       .map_io         = ixp4xx_map_io, 
    278276+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/120-compex_support.patch

    r23776 r25727  
    5151--- /dev/null 
    5252+++ b/arch/arm/mach-ixp4xx/compex-setup.c 
    53 @@ -0,0 +1,136 @@ 
     53@@ -0,0 +1,134 @@ 
    5454+/* 
    5555+ * arch/arm/mach-ixp4xx/compex-setup.c 
     
    180180+MACHINE_START(COMPEX, "Compex WP18 / NP18A") 
    181181+       /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */ 
    182 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    183 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    184182+       .map_io         = ixp4xx_map_io, 
    185183+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/130-wrt300nv2_support.patch

    r23776 r25727  
    104104--- /dev/null 
    105105+++ b/arch/arm/mach-ixp4xx/wrt300nv2-setup.c 
    106 @@ -0,0 +1,108 @@ 
     106@@ -0,0 +1,106 @@ 
    107107+/* 
    108108+ * arch/arm/mach-ixp4xx/wrt300nv2-setup.c 
     
    204204+MACHINE_START(WRT300NV2, "Linksys WRT300N v2") 
    205205+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    206 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    207 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    208206+       .map_io         = ixp4xx_map_io, 
    209207+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/150-lanready_ap1000_support.patch

    r23776 r25727  
    11--- /dev/null 
    22+++ b/arch/arm/mach-ixp4xx/ap1000-setup.c 
    3 @@ -0,0 +1,151 @@ 
     3@@ -0,0 +1,149 @@ 
    44+/* 
    55+ * arch/arm/mach-ixp4xx/ap1000-setup.c 
     
    143143+MACHINE_START(AP1000, "Lanready AP-1000") 
    144144+       /* Maintainer: Imre Kaloz <Kaloz@openwrt.org> */ 
    145 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    146 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    147145+       .fixup          = ap1000_fixup, 
    148146+       .map_io         = ixp4xx_map_io, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/162-wg302v1_mem_fixup.patch

    r15252 r25727  
    3838 { 
    3939        ixp4xx_sys_init(); 
    40 @@ -133,6 +163,7 @@ MACHINE_START(WG302V1, "Netgear WG302 v1 
     40@@ -131,6 +161,7 @@ static void __init wg302v1_init(void) 
     41 #ifdef CONFIG_MACH_WG302V1 
     42 MACHINE_START(WG302V1, "Netgear WG302 v1 / WAG302 v1") 
    4143        /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    42         .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    43         .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    4444+       .fixup          = wg302v1_fixup, 
    4545        .map_io         = ixp4xx_map_io, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/180-tw5334_support.patch

    r23776 r25727  
    3636--- /dev/null 
    3737+++ b/arch/arm/mach-ixp4xx/tw5334-setup.c 
    38 @@ -0,0 +1,163 @@ 
     38@@ -0,0 +1,161 @@ 
    3939+/* 
    4040+ * arch/arm/mach-ixp4xx/tw5334-setup.c 
     
    191191+MACHINE_START(TW5334, "Titan Wireless TW-533-4") 
    192192+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    193 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    194 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    195193+       .map_io         = ixp4xx_map_io, 
    196194+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/185-mi424wr_support.patch

    r23776 r25727  
    7575--- /dev/null 
    7676+++ b/arch/arm/mach-ixp4xx/mi424wr-setup.c 
    77 @@ -0,0 +1,344 @@ 
     77@@ -0,0 +1,342 @@ 
    7878+/* 
    7979+ * arch/arm/mach-ixp4xx/mi424wr-setup.c 
     
    411411+MACHINE_START(MI424WR, "Actiontec MI424WR") 
    412412+       /* Maintainer: Jose Vasconcellos */ 
    413 +       .phys_io        = IXP4XX_UART2_BASE_PHYS, 
    414 +       .io_pg_offst    = ((IXP4XX_UART2_BASE_VIRT) >> 18) & 0xfffc, 
    415413+       .map_io         = ixp4xx_map_io, 
    416414+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/190-cambria_support.patch

    r23776 r25727  
    7878--- /dev/null 
    7979+++ b/arch/arm/mach-ixp4xx/cambria-setup.c 
    80 @@ -0,0 +1,429 @@ 
     80@@ -0,0 +1,427 @@ 
    8181+/* 
    8282+ * arch/arm/mach-ixp4xx/cambria-setup.c 
     
    500500+MACHINE_START(CAMBRIA, "Gateworks Cambria series") 
    501501+       /* Maintainer: Imre Kaloz <kaloz@openwrt.org> */ 
    502 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    503 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    504502+       .map_io         = ixp4xx_map_io, 
    505503+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/191-cambria_optional_uart.patch

    r23964 r25727  
    125125--- a/drivers/serial/8250.c 
    126126+++ b/drivers/serial/8250.c 
    127 @@ -412,6 +412,20 @@ static void mem_serial_out(struct uart_p 
     127@@ -413,6 +413,20 @@ static void mem_serial_out(struct uart_p 
    128128        writeb(value, p->membase + offset); 
    129129 } 
     
    146146 { 
    147147        offset = map_8250_out_reg(p, offset) << p->regshift; 
    148 @@ -503,6 +517,11 @@ static void set_io_from_upio(struct uart 
     148@@ -504,6 +518,11 @@ static void set_io_from_upio(struct uart 
    149149                p->serial_out = mem32_serial_out; 
    150150                break; 
     
    158158                p->serial_in = au_serial_in; 
    159159                p->serial_out = au_serial_out; 
    160 @@ -534,6 +553,7 @@ serial_out_sync(struct uart_8250_port *u 
     160@@ -535,6 +554,7 @@ serial_out_sync(struct uart_8250_port *u 
    161161        switch (p->iotype) { 
    162162        case UPIO_MEM: 
     
    166166        case UPIO_DWAPB: 
    167167                p->serial_out(p, offset, value); 
    168 @@ -2476,6 +2496,7 @@ static int serial8250_request_std_resour 
     168@@ -2477,6 +2497,7 @@ static int serial8250_request_std_resour 
    169169        case UPIO_MEM32: 
    170170        case UPIO_MEM: 
     
    174174                        break; 
    175175  
    176 @@ -2513,6 +2534,7 @@ static void serial8250_release_std_resou 
     176@@ -2514,6 +2535,7 @@ static void serial8250_release_std_resou 
    177177        case UPIO_MEM32: 
    178178        case UPIO_MEM: 
     
    182182                        break; 
    183183  
    184 @@ -3024,6 +3046,7 @@ static int __devinit serial8250_probe(st 
     184@@ -3025,6 +3047,7 @@ static int __devinit serial8250_probe(st 
    185185                port.set_termios        = p->set_termios; 
    186186                port.pm                 = p->pm; 
     
    190190                ret = serial8250_register_port(&port); 
    191191                if (ret < 0) { 
    192 @@ -3173,6 +3196,7 @@ int serial8250_register_port(struct uart 
     192@@ -3174,6 +3197,7 @@ int serial8250_register_port(struct uart 
    193193                uart->port.iotype       = port->iotype; 
    194194                uart->port.flags        = port->flags | UPF_BOOT_AUTOCONF; 
     
    200200--- a/drivers/serial/serial_core.c 
    201201+++ b/drivers/serial/serial_core.c 
    202 @@ -2130,6 +2130,7 @@ uart_report_port(struct uart_driver *drv 
     202@@ -2129,6 +2129,7 @@ uart_report_port(struct uart_driver *drv 
    203203                snprintf(address, sizeof(address), 
    204204                         "I/O 0x%lx offset 0x%x", port->iobase, port->hub6); 
     
    208208        case UPIO_MEM32: 
    209209        case UPIO_AU: 
    210 @@ -2550,6 +2551,7 @@ int uart_match_port(struct uart_port *po 
     210@@ -2549,6 +2550,7 @@ int uart_match_port(struct uart_port *po 
    211211        case UPIO_HUB6: 
    212212                return (port1->iobase == port2->iobase) && 
  • trunk/target/linux/ixp4xx/patches-2.6.37/193-cambria_pld_gpio.patch

    r23776 r25727  
    9191  
    9292 static struct cambria_board_info cambria_boards[] __initdata = { 
    93 @@ -460,6 +507,14 @@ static struct i2c_board_info __initdata 
     93@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata  
    9494                I2C_BOARD_INFO("24c08", 0x51), 
    9595                .platform_data  = &cambria_eeprom_info 
  • trunk/target/linux/ixp4xx/patches-2.6.37/295-latch_led_driver.patch

    r22649 r25727  
    11--- a/drivers/leds/Kconfig 
    22+++ b/drivers/leds/Kconfig 
    3 @@ -176,6 +176,13 @@ config LEDS_LP3944 
    4           To compile this driver as a module, choose M here: the 
    5           module will be called leds-lp3944. 
     3@@ -210,6 +210,13 @@ config LEDS_LP5523 
     4          Driver provides direct control via LED class and interface for 
     5          programming the engines. 
    66  
    77+config LEDS_LATCH 
     
    1414 config LEDS_CLEVO_MAIL 
    1515        tristate "Mail LED on Clevo notebook" 
    16         depends on X86 && SERIO_I8042 && DMI 
     16        depends on LEDS_CLASS 
    1717--- /dev/null 
    1818+++ b/drivers/leds/leds-latch.c 
     
    176176+obj-$(CONFIG_LEDS_LATCH)               += leds-latch.o 
    177177 obj-$(CONFIG_LEDS_LP3944)              += leds-lp3944.o 
    178  obj-$(CONFIG_LEDS_CLEVO_MAIL)          += leds-clevo-mail.o 
    179  obj-$(CONFIG_LEDS_HP6XX)               += leds-hp6xx.o 
     178 obj-$(CONFIG_LEDS_LP5521)              += leds-lp5521.o 
     179 obj-$(CONFIG_LEDS_LP5523)              += leds-lp5523.o 
    180180--- a/include/linux/leds.h 
    181181+++ b/include/linux/leds.h 
    182 @@ -165,5 +165,19 @@ struct gpio_led_platform_data { 
     182@@ -204,5 +204,19 @@ struct gpio_led_platform_data { 
    183183                                        unsigned long *delay_off); 
    184184 }; 
  • trunk/target/linux/ixp4xx/patches-2.6.37/500-usr8200_support.patch

    r23776 r25727  
    117117--- /dev/null 
    118118+++ b/arch/arm/mach-ixp4xx/usr8200-setup.c 
    119 @@ -0,0 +1,212 @@ 
     119@@ -0,0 +1,210 @@ 
    120120+/* 
    121121+ * arch/arm/mach-ixp4xx/usr8200-setup.c 
     
    322322+MACHINE_START(USR8200, "USRobotics USR8200") 
    323323+       /* Maintainer: Peter Denison <openwrt@marshadder.org> */ 
    324 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    325 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    326324+       .map_io         = ixp4xx_map_io, 
    327325+       .init_irq       = ixp4xx_init_irq, 
  • trunk/target/linux/ixp4xx/patches-2.6.37/520-tw2662_support.patch

    r23776 r25727  
    119119--- /dev/null 
    120120+++ b/arch/arm/mach-ixp4xx/tw2662-setup.c 
    121 @@ -0,0 +1,212 @@ 
     121@@ -0,0 +1,210 @@ 
    122122+/* 
    123123+ * arch/arm/mach-ixp4xx/tw2662-setup.c 
     
    322322+MACHINE_START(TW2662, "Titan Wireless TW-266-2") 
    323323+       /* Maintainer: Alexandros C. Couloumbis <alex@ozo.com> */ 
    324 +       .phys_io        = IXP4XX_PERIPHERAL_BASE_PHYS, 
    325 +       .io_pg_offst    = ((IXP4XX_PERIPHERAL_BASE_VIRT) >> 18) & 0xfffc, 
    326324+       .fixup          = tw2662_fixup, 
    327325+       .map_io         = ixp4xx_map_io, 
Note: See TracChangeset for help on using the changeset viewer.