target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch

   1 diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c
   2 index 78a1741..54d884f 100644
   3 --- a/arch/arm/mach-ixp4xx/nas100d-setup.c
   4 +++ b/arch/arm/mach-ixp4xx/nas100d-setup.c
   5 @@ -16,6 +16,7 @@
   6  #include <linux/serial.h>
   7  #include <linux/serial_8250.h>
   8  #include <linux/leds.h>
   9 +#include <linux/i2c-gpio.h>
  10
  11  #include <asm/mach-types.h>
  12  #include <asm/mach/arch.h>
  13 @@ -68,16 +69,17 @@ static struct platform_device nas100d_leds = {
  14  };
  15  #endif
  16
  17 -static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = {
  18 +static struct i2c_gpio_platform_data nas100d_i2c_gpio_data = {
  19         .sda_pin                = NAS100D_SDA_PIN,
  20         .scl_pin                = NAS100D_SCL_PIN,
  21  };
  22
  23 -static struct platform_device nas100d_i2c_controller = {
  24 -       .name                   = "IXP4XX-I2C",
  25 +static struct platform_device nas100d_i2c_gpio = {
  26 +       .name                   = "i2c-gpio",
  27         .id                     = 0,
  28 -       .dev.platform_data      = &nas100d_i2c_gpio_pins,
  29 -       .num_resources          = 0,
  30 +       .dev     = {
  31 +               .platform_data  = &nas100d_i2c_gpio_data,
  32 +       },
  33  };
  34
  35  static struct resource nas100d_uart_resources[] = {
  36 @@ -124,7 +126,7 @@ static struct platform_device nas100d_uart = {
  37  };
  38
  39  static struct platform_device *nas100d_devices[] __initdata = {
  40 -       &nas100d_i2c_controller,
  41 +       &nas100d_i2c_gpio,
  42         &nas100d_flash,
  43  #ifdef CONFIG_LEDS_IXP4XX
  44         &nas100d_leds,