Skip to content

Commit

Permalink
ixp4xx-i2c-gpio
Browse files Browse the repository at this point in the history 
Migrate all ixp4xx devices to the bitbanging I2C bus driver utilizing
the arch-neutral GPIO API (linux/i2c-gpio.h).

Tested by the nslu2-linux and openwrt projects in public firmware releases.

Signed-off-by: Michael-Luke Jones <mlj28@cam.ac.uk>
Acked-by: Rod Whitby <rod@whitby.id.au>
Signed-off-by: Jean Delvare <khali@linux-fr.org>
  • Loading branch information
Michael-Luke Jones authored and Jean Delvare committed Jan 27, 2008
1 parent eee87d3 commit 5a4a238
Show file tree
Hide file tree
Showing 5 changed files with 38 additions and 31 deletions.
14 changes: 7 additions & 7 deletions arch/arm/mach-ixp4xx/avila-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/tty.h>
#include <linux/serial_8250.h>
#include <linux/slab.h>
#include <linux/i2c-gpio.h>

#include <asm/types.h>
#include <asm/setup.h>
Expand Down Expand Up @@ -47,18 +48,17 @@ static struct platform_device avila_flash = {
.resource = &avila_flash_resource,
};

static struct ixp4xx_i2c_pins avila_i2c_gpio_pins = {
static struct i2c_gpio_platform_data avila_i2c_gpio_data = {
.sda_pin = AVILA_SDA_PIN,
.scl_pin = AVILA_SCL_PIN,
};

static struct platform_device avila_i2c_controller = {
.name = "IXP4XX-I2C",
static struct platform_device avila_i2c_gpio = {
.name = "i2c-gpio",
.id = 0,
.dev = {
.platform_data = &avila_i2c_gpio_pins,
.dev = {
.platform_data = &avila_i2c_gpio_data,
},
.num_resources = 0
};

static struct resource avila_uart_resources[] = {
Expand Down Expand Up @@ -133,7 +133,7 @@ static struct platform_device avila_pata = {
};

static struct platform_device *avila_devices[] __initdata = {
&avila_i2c_controller,
&avila_i2c_gpio,
&avila_flash,
&avila_uart
};
Expand Down
13 changes: 8 additions & 5 deletions arch/arm/mach-ixp4xx/dsmg600-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
#include <linux/kernel.h>
#include <linux/serial.h>
#include <linux/serial_8250.h>
#include <linux/i2c-gpio.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
Expand All @@ -37,15 +38,17 @@ static struct platform_device dsmg600_flash = {
.resource = &dsmg600_flash_resource,
};

static struct ixp4xx_i2c_pins dsmg600_i2c_gpio_pins = {
static struct i2c_gpio_platform_data dsmg600_i2c_gpio_data = {
.sda_pin = DSMG600_SDA_PIN,
.scl_pin = DSMG600_SCL_PIN,
};

static struct platform_device dsmg600_i2c_controller = {
.name = "IXP4XX-I2C",
static struct platform_device dsmg600_i2c_gpio = {
.name = "i2c-gpio",
.id = 0,
.dev.platform_data = &dsmg600_i2c_gpio_pins,
.dev = {
.platform_data = &dsmg600_i2c_gpio_data,
},
};

#ifdef CONFIG_LEDS_CLASS
Expand Down Expand Up @@ -116,7 +119,7 @@ static struct platform_device dsmg600_uart = {
};

static struct platform_device *dsmg600_devices[] __initdata = {
&dsmg600_i2c_controller,
&dsmg600_i2c_gpio,
&dsmg600_flash,
};

Expand Down
14 changes: 7 additions & 7 deletions arch/arm/mach-ixp4xx/ixdp425-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -120,18 +121,17 @@ static struct platform_device ixdp425_flash_nand = {
};
#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[] = {
Expand Down Expand Up @@ -178,7 +178,7 @@ static struct platform_device ixdp425_uart = {
};

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)
Expand Down
14 changes: 8 additions & 6 deletions arch/arm/mach-ixp4xx/nas100d-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
#include <linux/leds.h>
#include <linux/i2c-gpio.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
Expand Down Expand Up @@ -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[] = {
Expand Down Expand Up @@ -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,
Expand Down
14 changes: 8 additions & 6 deletions arch/arm/mach-ixp4xx/nslu2-setup.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#include <linux/serial.h>
#include <linux/serial_8250.h>
#include <linux/leds.h>
#include <linux/i2c-gpio.h>

#include <asm/mach-types.h>
#include <asm/mach/arch.h>
Expand All @@ -41,7 +42,7 @@ static struct platform_device nslu2_flash = {
.resource = &nslu2_flash_resource,
};

static struct ixp4xx_i2c_pins nslu2_i2c_gpio_pins = {
static struct i2c_gpio_platform_data nslu2_i2c_gpio_data = {
.sda_pin = NSLU2_SDA_PIN,
.scl_pin = NSLU2_SCL_PIN,
};
Expand Down Expand Up @@ -82,11 +83,12 @@ static struct platform_device nslu2_leds = {
};
#endif

static struct platform_device nslu2_i2c_controller = {
.name = "IXP4XX-I2C",
static struct platform_device nslu2_i2c_gpio = {
.name = "i2c-gpio",
.id = 0,
.dev.platform_data = &nslu2_i2c_gpio_pins,
.num_resources = 0,
.dev = {
.platform_data = &nslu2_i2c_gpio_data,
},
};

static struct platform_device nslu2_beeper = {
Expand Down Expand Up @@ -139,7 +141,7 @@ static struct platform_device nslu2_uart = {
};

static struct platform_device *nslu2_devices[] __initdata = {
&nslu2_i2c_controller,
&nslu2_i2c_gpio,
&nslu2_flash,
&nslu2_beeper,
#ifdef CONFIG_LEDS_IXP4XX
Expand Down

0 comments on commit 5a4a238

Please sign in to comment.