root/trunk/patches/2.6.22/21-nslu2-i2c-gpio-driver-support.patch

Revision 917, 1.3 KB (checked in by gordon, 3 years ago)

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

  • arch/arm/mach-ixp4xx/nslu2-setup.c

    diff --git a/arch/arm/mach-ixp4xx/nslu2-setup.c b/arch/arm/mach-ixp4xx/nslu2-setup.c
    index 9bf8ccb..77277d2 100644
    a b  
    1818#include <linux/serial.h> 
    1919#include <linux/serial_8250.h> 
    2020#include <linux/leds.h> 
     21#include <linux/i2c-gpio.h> 
    2122 
    2223#include <asm/mach-types.h> 
    2324#include <asm/mach/arch.h> 
     
    4142        .resource               = &nslu2_flash_resource, 
    4243}; 
    4344 
    44 static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = { 
     45static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = { 
    4546        .sda_pin                = NSLU2_SDA_PIN, 
    4647        .scl_pin                = NSLU2_SCL_PIN, 
    4748}; 
     
    8283}; 
    8384#endif 
    8485 
    85 static struct platform_device nslu2_i2c_controller = { 
    86         .name                   = "IXP4XX-I2C", 
     86static struct platform_device nslu2_i2c_gpio = { 
     87        .name                   = "i2c-gpio", 
    8788        .id                     = 0, 
    88         .dev.platform_data      = &nslu2_i2c_gpio_pins, 
    89         .num_resources          = 0, 
     89        .dev     = { 
     90                .platform_data  = &nslu2_i2c_gpio_data, 
     91        }, 
    9092}; 
    9193 
    9294static struct platform_device nslu2_beeper = { 
     
    139141}; 
    140142 
    141143static struct platform_device *nslu2_devices[] __initdata = { 
    142         &nslu2_i2c_controller, 
     144        &nslu2_i2c_gpio, 
    143145        &nslu2_flash, 
    144146        &nslu2_beeper, 
    145147#ifdef CONFIG_LEDS_IXP4XX 
Note: See TracBrowser for help on using the browser.