diff options
| author | Rod Whitby <rod@whitby.id.au> | 2008-01-09 05:22:43 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2008-01-09 05:22:43 +0000 |
| commit | 306cd5af1a3203176fc5f6af256aec3d4072c725 (patch) | |
| tree | fd8b026312e6e8bef696f82447dac8f1d778c3e3 /target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch | |
| parent | 2099ad591a2c736cf688cdb99366d52097ef279a (diff) | |
| download | upstream-306cd5af1a3203176fc5f6af256aec3d4072c725.tar.gz upstream-306cd5af1a3203176fc5f6af256aec3d4072c725.tar.bz2 upstream-306cd5af1a3203176fc5f6af256aec3d4072c725.zip | |
Consolidated all the ixp4xx i2c gpio patches into a copy of the patch from nslu2-linux which has been pushed upstream via the i2c maintainer.
SVN-Revision: 10153
Diffstat (limited to 'target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch')
| -rw-r--r-- | target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch | 44 |
1 files changed, 0 insertions, 44 deletions
diff --git a/target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch b/target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch deleted file mode 100644 index 9e090d953c..0000000000 --- a/target/linux/ixp4xx/patches-2.6.23/026-ixdp425_i2c_gpio_driver_support.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -uprN linux-2.6.23.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-setup.c ---- linux-2.6.23.orig/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-10-09 15:31:38.000000000 -0500 -+++ linux-2.6.23/arch/arm/mach-ixp4xx/ixdp425-setup.c 2007-10-11 01:01:02.000000000 -0500 -@@ -15,6 +15,7 @@ - #include <linux/tty.h> - #include <linux/serial_8250.h> - #include <linux/slab.h> -+#include <linux/i2c-gpio.h> - #include <linux/io.h> - #include <linux/mtd/mtd.h> - #include <linux/mtd/nand.h> -@@ -120,18 +121,17 @@ static struct platform_device ixdp425_fl - }; - #endif /* CONFIG_MTD_NAND_PLATFORM */ - --static struct ixp4xx_i2c_pins ixdp425_i2c_gpio_pins = { -+static struct i2c_gpio_platform_data ixdp425_i2c_gpio_data = { - .sda_pin = IXDP425_SDA_PIN, - .scl_pin = IXDP425_SCL_PIN, - }; - --static struct platform_device ixdp425_i2c_controller = { -- .name = "IXP4XX-I2C", -+static struct platform_device ixdp425_i2c_gpio = { -+ .name = "i2c-gpio", - .id = 0, -- .dev = { -- .platform_data = &ixdp425_i2c_gpio_pins, -+ .dev = { -+ .platform_data = &ixdp425_i2c_gpio_data, - }, -- .num_resources = 0 - }; - - static struct resource ixdp425_uart_resources[] = { -@@ -178,7 +178,7 @@ static struct platform_device ixdp425_ua - }; - - static struct platform_device *ixdp425_devices[] __initdata = { -- &ixdp425_i2c_controller, -+ &ixdp425_i2c_gpio, - &ixdp425_flash, - #if defined(CONFIG_MTD_NAND_PLATFORM) || \ - defined(CONFIG_MTD_NAND_PLATFORM_MODULE) |