From a50b0d05c7a03c223dce2e309c244547d622602f Mon Sep 17 00:00:00 2001 From: rwhitby Date: Wed, 9 Jan 2008 05:22:43 +0000 Subject: 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. git-svn-id: svn://svn.openwrt.org/openwrt/trunk@10153 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../022-nas100d_i2c_gpio_driver_support.patch | 44 ---------------------- 1 file changed, 44 deletions(-) delete mode 100644 target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch (limited to 'target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch') diff --git a/target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch b/target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch deleted file mode 100644 index 1725565ae..000000000 --- a/target/linux/ixp4xx/patches-2.6.23/022-nas100d_i2c_gpio_driver_support.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff --git a/arch/arm/mach-ixp4xx/nas100d-setup.c b/arch/arm/mach-ixp4xx/nas100d-setup.c -index 78a1741..54d884f 100644 ---- a/arch/arm/mach-ixp4xx/nas100d-setup.c -+++ b/arch/arm/mach-ixp4xx/nas100d-setup.c -@@ -16,6 +16,7 @@ - #include - #include - #include -+#include - - #include - #include -@@ -68,16 +69,17 @@ static struct platform_device nas100d_leds = { - }; - #endif - --static struct ixp4xx_i2c_pins nas100d_i2c_gpio_pins = { -+static struct i2c_gpio_platform_data nas100d_i2c_gpio_data = { - .sda_pin = NAS100D_SDA_PIN, - .scl_pin = NAS100D_SCL_PIN, - }; - --static struct platform_device nas100d_i2c_controller = { -- .name = "IXP4XX-I2C", -+static struct platform_device nas100d_i2c_gpio = { -+ .name = "i2c-gpio", - .id = 0, -- .dev.platform_data = &nas100d_i2c_gpio_pins, -- .num_resources = 0, -+ .dev = { -+ .platform_data = &nas100d_i2c_gpio_data, -+ }, - }; - - static struct resource nas100d_uart_resources[] = { -@@ -124,7 +126,7 @@ static struct platform_device nas100d_uart = { - }; - - static struct platform_device *nas100d_devices[] __initdata = { -- &nas100d_i2c_controller, -+ &nas100d_i2c_gpio, - &nas100d_flash, - #ifdef CONFIG_LEDS_IXP4XX - &nas100d_leds, -- cgit v1.2.3