diff options
| author | Russell King | 2009-04-27 19:06:24 +0200 |
|---|---|---|
| committer | Russell King | 2009-04-27 19:06:24 +0200 |
| commit | a133e775d533c0035af627693dec288f1b1d4ffc (patch) | |
| tree | 2beda263b834fe7fec5f09b5cf03b155c6ff2569 /arch/arm/mach-davinci/devices.c | |
| parent | [ARM] lart: fix build error (diff) | |
| parent | davinci: DM644x: NAND: update partitioning (diff) | |
| download | kernel-qcow2-linux-a133e775d533c0035af627693dec288f1b1d4ffc.tar.gz kernel-qcow2-linux-a133e775d533c0035af627693dec288f1b1d4ffc.tar.xz kernel-qcow2-linux-a133e775d533c0035af627693dec288f1b1d4ffc.zip | |
Merge branch 'for-rmk' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-davinci
Diffstat (limited to 'arch/arm/mach-davinci/devices.c')
| -rw-r--r-- | arch/arm/mach-davinci/devices.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/devices.c b/arch/arm/mach-davinci/devices.c index 808633f9f03c..a31370b93dd2 100644 --- a/arch/arm/mach-davinci/devices.c +++ b/arch/arm/mach-davinci/devices.c @@ -21,6 +21,10 @@ #include <mach/hardware.h> #include <mach/i2c.h> #include <mach/irqs.h> +#include <mach/cputype.h> +#include <mach/mux.h> + +#define DAVINCI_I2C_BASE 0x01C21000 static struct resource i2c_resources[] = { { @@ -43,6 +47,9 @@ static struct platform_device davinci_i2c_device = { void __init davinci_init_i2c(struct davinci_i2c_platform_data *pdata) { + if (cpu_is_davinci_dm644x()) + davinci_cfg_reg(DM644X_I2C); + davinci_i2c_device.dev.platform_data = pdata; (void) platform_device_register(&davinci_i2c_device); } |