target/linux/ixp4xx/patches-2.6.23/023-avila_i2c_gpio_driver_support.patch

   1 Index: linux-2.6.22-rc3-git2-armeb/arch/arm/mach-ixp4xx/avila-setup.c
   2 ===================================================================
   3 --- linux-2.6.22-rc3-git2-armeb.orig/arch/arm/mach-ixp4xx/avila-setup.c 2007-05-31 04:05:33.000000000 -0700
   4 +++ linux-2.6.22-rc3-git2-armeb/arch/arm/mach-ixp4xx/avila-setup.c      2007-05-31 04:12:50.000000000 -0700
   5 @@ -18,6 +18,7 @@
   6  #include <linux/tty.h>
   7  #include <linux/serial_8250.h>
   8  #include <linux/slab.h>
   9 +#include <linux/i2c-gpio.h>
  10
  11  #include <asm/types.h>
  12  #include <asm/setup.h>
  13 @@ -47,18 +48,17 @@
  14         .resource       = &avila_flash_resource,
  15  };
  16
  17 -static struct ixp4xx_i2c_pins avila_i2c_gpio_pins = {
  18 +static struct i2c_gpio_platform_data avila_i2c_gpio_data = {
  19         .sda_pin        = AVILA_SDA_PIN,
  20         .scl_pin        = AVILA_SCL_PIN,
  21  };
  22
  23 -static struct platform_device avila_i2c_controller = {
  24 -       .name           = "IXP4XX-I2C",
  25 +static struct platform_device avila_i2c_gpio = {
  26 +       .name           = "i2c-gpio",
  27         .id             = 0,
  28 -       .dev            = {
  29 -               .platform_data = &avila_i2c_gpio_pins,
  30 +       .dev     = {
  31 +               .platform_data  = &avila_i2c_gpio_data,
  32         },
  33 -       .num_resources  = 0
  34  };
  35
  36  static struct resource avila_uart_resources[] = {
  37 @@ -133,7 +133,7 @@
  38  };
  39
  40  static struct platform_device *avila_devices[] __initdata = {
  41 -       &avila_i2c_controller,
  42 +       &avila_i2c_gpio,
  43         &avila_flash,
  44         &avila_uart
  45  };