Changeset 26268

Timestamp:

2011-03-22T16:04:17+01:00 (7 years ago)

Author:

kaloz

Message:

[ixp4xx]: add 2.6.38 support

Location:

trunk/target/linux/ixp4xx

Files:

• config-2.6.38 (copied) (copied from trunk/target/linux/ixp4xx/config-2.6.37)
• patches-2.6.38 (copied) (copied from trunk/target/linux/ixp4xx/patches-2.6.37)
• patches-2.6.38/020-gateworks_i2c_pld.patch (modified) (2 diffs)
• patches-2.6.38/191-cambria_optional_uart.patch (modified) (8 diffs)
• patches-2.6.38/193-cambria_pld_gpio.patch (modified) (1 diff)
• patches-2.6.38/203-npe_driver_mask_phy_features.patch (modified) (1 diff)
• patches-2.6.38/205-npe_driver_separate_phy_functions.patch (modified) (4 diffs)
• patches-2.6.38/402-ixp4xx_gpiolib.patch (modified) (3 diffs)

trunk/target/linux/ixp4xx/patches-2.6.38/020-gateworks_i2c_pld.patch

@@ -375 +375 @@
 --- a/drivers/gpio/Kconfig
 +++ b/drivers/gpio/Kconfig
-@@ -348,6 +348,14 @@ config GPIO_RDC321X
+@@ -358,6 +358,14 @@ config GPIO_RDC321X
           Support for the RDC R321x SoC GPIOs over southbridge
           PCI configuration space.
@@ -392 +392 @@
 --- a/drivers/gpio/Makefile
 +++ b/drivers/gpio/Makefile
-@@ -41,3 +41,4 @@ obj-$(CONFIG_GPIO_RDC321X)    += rdc321x-gp
- obj-$(CONFIG_GPIO_JANZ_TTL)    += janz-ttl.o
+@@ -42,3 +42,4 @@ obj-$(CONFIG_GPIO_JANZ_TTL)   += janz-ttl.
  obj-$(CONFIG_GPIO_SX150X)      += sx150x.o
  obj-$(CONFIG_GPIO_VX855)       += vx855_gpio.o
+ obj-$(CONFIG_GPIO_ML_IOH)      += ml_ioh_gpio.o
 +obj-$(CONFIG_GPIO_GW_I2C_PLD)  += gw_i2c_pld.o
 --- /dev/null

trunk/target/linux/ixp4xx/patches-2.6.38/191-cambria_optional_uart.patch

@@ -107 +107 @@
 --- a/include/linux/serial_core.h
 +++ b/include/linux/serial_core.h
-@@ -311,6 +311,7 @@ struct uart_port {
- #define UPIO_TSI               (5)                     /* Tsi108/109 type IO */
+@@ -316,6 +316,7 @@ struct uart_port {
  #define UPIO_DWAPB             (6)                     /* DesignWare APB UART */
  #define UPIO_RM9000            (7)                     /* RM9000 type IO */
-+#define UPIO_MEM_DELAY (8)
+ #define UPIO_DWAPB32           (8)                     /* DesignWare APB UART (32 bit accesses) */
++#define UPIO_MEM_DELAY         (9)
  
         unsigned int            read_status_mask;       /* driver specific */
         unsigned int            ignore_status_mask;     /* driver specific */
-@@ -353,6 +354,7 @@ struct uart_port {
+@@ -358,6 +359,7 @@ struct uart_port {
  
         unsigned int            mctrl;                  /* current modem ctrl settings */
@@ -123 +123 @@
         const struct uart_ops   *ops;
         unsigned int            custom_divisor;
---- a/drivers/serial/8250.c
-+++ b/drivers/serial/8250.c
+--- a/drivers/tty/serial/8250.c
++++ b/drivers/tty/serial/8250.c
 @@ -413,6 +413,20 @@ static void mem_serial_out(struct uart_p
         writeb(value, p->membase + offset);
@@ -146 +146 @@
  {
         offset = map_8250_out_reg(p, offset) << p->regshift;
-@@ -504,6 +518,11 @@ static void set_io_from_upio(struct uart
+@@ -524,6 +538,11 @@ static void set_io_from_upio(struct uart
                 p->serial_out = mem32_serial_out;
                 break;
@@ -158 +158 @@
                 p->serial_in = au_serial_in;
                 p->serial_out = au_serial_out;
-@@ -535,6 +554,7 @@ serial_out_sync(struct uart_8250_port *u
+@@ -560,6 +579,7 @@ serial_out_sync(struct uart_8250_port *u
         switch (p->iotype) {
         case UPIO_MEM:
@@ -165 +165 @@
         case UPIO_AU:
         case UPIO_DWAPB:
-                p->serial_out(p, offset, value);
-@@ -2477,6 +2497,7 @@ static int serial8250_request_std_resour
-        case UPIO_MEM32:
+        case UPIO_DWAPB32:
+@@ -2521,6 +2541,7 @@ static int serial8250_request_std_resour
         case UPIO_MEM:
         case UPIO_DWAPB:
+        case UPIO_DWAPB32:
 +       case UPIO_MEM_DELAY:
                 if (!up->port.mapbase)
                         break;
  
-@@ -2514,6 +2535,7 @@ static void serial8250_release_std_resou
-        case UPIO_MEM32:
+@@ -2559,6 +2580,7 @@ static void serial8250_release_std_resou
         case UPIO_MEM:
         case UPIO_DWAPB:
+        case UPIO_DWAPB32:
 +       case UPIO_MEM_DELAY:
                 if (!up->port.mapbase)
                         break;
  
-@@ -3025,6 +3047,7 @@ static int __devinit serial8250_probe(st
+@@ -3074,6 +3096,7 @@ static int __devinit serial8250_probe(st
                 port.set_termios        = p->set_termios;
                 port.pm                 = p->pm;
@@ -190 +190 @@
                 ret = serial8250_register_port(&port);
                 if (ret < 0) {
-@@ -3174,6 +3197,7 @@ int serial8250_register_port(struct uart
+@@ -3223,6 +3246,7 @@ int serial8250_register_port(struct uart
                 uart->port.iotype       = port->iotype;
                 uart->port.flags        = port->flags | UPF_BOOT_AUTOCONF;
@@ -198 +198 @@
                 if (port->dev)
                         uart->port.dev = port->dev;
---- a/drivers/serial/serial_core.c
-+++ b/drivers/serial/serial_core.c
-@@ -2129,6 +2129,7 @@ uart_report_port(struct uart_driver *drv
+--- a/drivers/tty/serial/serial_core.c
++++ b/drivers/tty/serial/serial_core.c
+@@ -2133,6 +2133,7 @@ uart_report_port(struct uart_driver *drv
                 snprintf(address, sizeof(address),
                          "I/O 0x%lx offset 0x%x", port->iobase, port->hub6);
@@ -208 +208 @@
         case UPIO_MEM32:
         case UPIO_AU:
-@@ -2549,6 +2550,7 @@ int uart_match_port(struct uart_port *po
+@@ -2554,6 +2555,7 @@ int uart_match_port(struct uart_port *po
         case UPIO_HUB6:
                 return (port1->iobase == port2->iobase) &&

trunk/target/linux/ixp4xx/patches-2.6.38/193-cambria_pld_gpio.patch

@@ -91 +91 @@
  
  static struct cambria_board_info cambria_boards[] __initdata = {
-@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata 
+@@ -460,6 +507,14 @@ static struct i2c_board_info __initdata
                 I2C_BOARD_INFO("24c08", 0x51),
                 .platform_data  = &cambria_eeprom_info

trunk/target/linux/ixp4xx/patches-2.6.38/203-npe_driver_mask_phy_features.patch

@@ -1 +1 @@
 --- a/drivers/net/arm/ixp4xx_eth.c
 +++ b/drivers/net/arm/ixp4xx_eth.c
-@@ -1232,6 +1232,10 @@ static int __devinit eth_init_one(struct
-        if ((err = IS_ERR(port->phydev)))
+@@ -1234,6 +1234,10 @@ static int __devinit eth_init_one(struct
                 goto err_free_mem;
+        }
  
 +       /* mask with MAC supported features */

trunk/target/linux/ixp4xx/patches-2.6.38/205-npe_driver_separate_phy_functions.patch

@@ -79 +79 @@
  
         if (!(dev = alloc_etherdev(sizeof(struct port))))
-@@ -1226,18 +1268,10 @@ static int __devinit eth_init_one(struct
+@@ -1226,19 +1268,9 @@ static int __devinit eth_init_one(struct
         __raw_writel(DEFAULT_CORE_CNTRL, &port->regs->core_control);
         udelay(50);
@@ -86 +86 @@
 -       port->phydev = phy_connect(dev, phy_id, &ixp4xx_adjust_link, 0,
 -                                  PHY_INTERFACE_MODE_MII);
--       if ((err = IS_ERR(port->phydev)))
+-       if (IS_ERR(port->phydev)) {
+-               err = PTR_ERR(port->phydev);
 +       err = ixp4xx_phy_connect(dev);
 +       if (err)
                 goto err_free_mem;
- 
+-       }
+-
 -       /* mask with MAC supported features */
 -       port->phydev->supported &= PHY_BASIC_FEATURES;
@@ -96 +98 @@
 -
 -       port->phydev->irq = PHY_POLL;
--
+ 
         if ((err = register_netdev(dev)))
                 goto err_phy_dis;
- 
-@@ -1247,7 +1281,7 @@ static int __devinit eth_init_one(struct
+@@ -1249,7 +1281,7 @@ static int __devinit eth_init_one(struct
         return 0;
  
@@ -109 +110 @@
         npe_port_tab[NPE_ID(port->id)] = NULL;
         platform_set_drvdata(pdev, NULL);
-@@ -1265,7 +1299,7 @@ static int __devexit eth_remove_one(stru
+@@ -1267,7 +1299,7 @@ static int __devexit eth_remove_one(stru
         struct port *port = netdev_priv(dev);
  

trunk/target/linux/ixp4xx/patches-2.6.38/402-ixp4xx_gpiolib.patch

@@ -1 +1 @@
 --- a/arch/arm/mach-ixp4xx/common.c
 +++ b/arch/arm/mach-ixp4xx/common.c
-@@ -35,6 +35,7 @@
- #include <asm/pgtable.h>
+@@ -36,6 +36,7 @@
  #include <asm/page.h>
  #include <asm/irq.h>
+ #include <asm/sched_clock.h>
 +#include <asm/gpio.h>
  
  #include <asm/mach/map.h>
  #include <asm/mach/irq.h>
-@@ -374,12 +375,50 @@ static struct platform_device *ixp46x_de
+@@ -375,12 +376,50 @@ static struct platform_device *ixp46x_de
  unsigned long ixp4xx_exp_bus_size;
  EXPORT_SYMBOL(ixp4xx_exp_bus_size);
@@ -62 +62 @@
 --- a/arch/arm/Kconfig
 +++ b/arch/arm/Kconfig
-@@ -431,7 +431,7 @@ config ARCH_IXP4XX
+@@ -448,7 +448,7 @@ config ARCH_IXP4XX
         bool "IXP4xx-based"
         depends on MMU
@@ -69 +69 @@
 +       select ARCH_REQUIRE_GPIOLIB
         select GENERIC_CLOCKEVENTS
-        select DMABOUNCE if PCI
-        help
+        select HAVE_SCHED_CLOCK
+        select MIGHT_HAVE_PCI
 --- a/arch/arm/mach-ixp4xx/include/mach/gpio.h
 +++ b/arch/arm/mach-ixp4xx/include/mach/gpio.h