diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:03:08 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-06-25 16:03:08 -0700 |
commit | 4208ff04a2dea2f55111a6cdc7e21f6ec3aef29f (patch) | |
tree | 4a3b64a319ff55081b9c5447587930cbf698780b /arch/arm/mach-ixp2000/enp2611.c | |
parent | 43df5eac00734436e2bc5a5c11488b1a7accecc7 (diff) | |
parent | 8749af68216e1ebf6460992fce548f400ecf63a4 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'arch/arm/mach-ixp2000/enp2611.c')
-rw-r--r-- | arch/arm/mach-ixp2000/enp2611.c | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp2000/enp2611.c b/arch/arm/mach-ixp2000/enp2611.c index 04b38bcf9aa..f3a291b6a9f 100644 --- a/arch/arm/mach-ixp2000/enp2611.c +++ b/arch/arm/mach-ixp2000/enp2611.c @@ -197,8 +197,23 @@ static struct platform_device enp2611_flash = { .resource = &enp2611_flash_resource, }; +static struct ixp2000_i2c_pins enp2611_i2c_gpio_pins = { + .sda_pin = ENP2611_GPIO_SDA, + .scl_pin = ENP2611_GPIO_SCL, +}; + +static struct platform_device enp2611_i2c_controller = { + .name = "IXP2000-I2C", + .id = 0, + .dev = { + .platform_data = &enp2611_i2c_gpio_pins + }, + .num_resources = 0 +}; + static struct platform_device *enp2611_devices[] __initdata = { - &enp2611_flash + &enp2611_flash, + &enp2611_i2c_controller }; static void __init enp2611_init_machine(void) |