root/trunk/patches/2.6.22/22-nas100d-i2c-gpio-driver-support.patch

Revision 917, 1.2 kB (checked in by gordon, 3 years ago)

Update IXP4XX network drivers to Krzysztof's latest version from git

  • a/arch/arm/mach-ixp4xx/nas100d-setup.c

    old new  
    1616#include <linux/serial.h> 
    1717#include <linux/serial_8250.h> 
    1818#include <linux/leds.h> 
     19#include <linux/i2c-gpio.h> 
    1920 
    2021#include <asm/mach-types.h> 
    2122#include <asm/mach/arch.h> 
     
    6869}; 
    6970#endif 
    7071 
    71 static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = { 
     72static struct i2c_gpio_platform_data nas100d_i2c_gpio_data = { 
    7273        .sda_pin                = NAS100D_SDA_PIN, 
    7374        .scl_pin                = NAS100D_SCL_PIN, 
    7475}; 
    7576 
    76 static struct platform_device nas100d_i2c_controller = { 
    77         .name                   = "IXP4XX-I2C", 
     77static struct platform_device nas100d_i2c_gpio = { 
     78        .name                   = "i2c-gpio", 
    7879        .id                     = 0, 
    79         .dev.platform_data      = &nas100d_i2c_gpio_pins, 
    80         .num_resources          = 0, 
     80        .dev     = { 
     81                .platform_data  = &nas100d_i2c_gpio_data, 
     82        }, 
    8183}; 
    8284 
    8385static struct resource nas100d_uart_resources[] = { 
     
    124126}; 
    125127 
    126128static struct platform_device *nas100d_devices[] __initdata = { 
    127         &nas100d_i2c_controller
     129        &nas100d_i2c_gpio
    128130        &nas100d_flash, 
    129131#ifdef CONFIG_LEDS_IXP4XX 
    130132        &nas100d_leds, 
Note: See TracBrowser for help on using the browser.