diff options
author | Philby John <pjohn@in.mvista.com> | 2010-01-11 05:23:31 -0500 |
---|---|---|
committer | Kevin Hilman <khilman@deeprootsystems.com> | 2010-02-04 16:30:06 -0500 |
commit | 00642f6616a0d1893ab1dcfec4d833210f310e95 (patch) | |
tree | 1ae6009b615b4039d8fb80145c31e0ec8da65a57 /arch/arm/mach-davinci | |
parent | 3f995f2fd7e0814630f55be37c650a5983e4077e (diff) |
Add SDA and SCL pin numbers to i2c platform data
Patch adds SDA and SCL pin numbers to the i2c platform data
structure for Davinci DM355 and DM6446. This at present is
used for i2c bus recovery.
TODO: Add SDA and SCL pin number information to include all
Davinci platforms such as dm355-leopard, dm365, dm646x, da8xx etc.
Signed-off-by: Philby John <pjohn@in.mvista.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Diffstat (limited to 'arch/arm/mach-davinci')
-rw-r--r-- | arch/arm/mach-davinci/board-dm355-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/board-dm644x-evm.c | 2 | ||||
-rw-r--r-- | arch/arm/mach-davinci/include/mach/i2c.h | 2 |
3 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-davinci/board-dm355-evm.c b/arch/arm/mach-davinci/board-dm355-evm.c index 077ecf4fecda..aa48e3f69715 100644 --- a/arch/arm/mach-davinci/board-dm355-evm.c +++ b/arch/arm/mach-davinci/board-dm355-evm.c | |||
@@ -111,6 +111,8 @@ static struct platform_device davinci_nand_device = { | |||
111 | static struct davinci_i2c_platform_data i2c_pdata = { | 111 | static struct davinci_i2c_platform_data i2c_pdata = { |
112 | .bus_freq = 400 /* kHz */, | 112 | .bus_freq = 400 /* kHz */, |
113 | .bus_delay = 0 /* usec */, | 113 | .bus_delay = 0 /* usec */, |
114 | .sda_pin = 15, | ||
115 | .scl_pin = 14, | ||
114 | }; | 116 | }; |
115 | 117 | ||
116 | static struct snd_platform_data dm355_evm_snd_data; | 118 | static struct snd_platform_data dm355_evm_snd_data; |
diff --git a/arch/arm/mach-davinci/board-dm644x-evm.c b/arch/arm/mach-davinci/board-dm644x-evm.c index e9612cf727b7..976e11b7fa4a 100644 --- a/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/arch/arm/mach-davinci/board-dm644x-evm.c | |||
@@ -629,6 +629,8 @@ static struct i2c_board_info __initdata i2c_info[] = { | |||
629 | static struct davinci_i2c_platform_data i2c_pdata = { | 629 | static struct davinci_i2c_platform_data i2c_pdata = { |
630 | .bus_freq = 20 /* kHz */, | 630 | .bus_freq = 20 /* kHz */, |
631 | .bus_delay = 100 /* usec */, | 631 | .bus_delay = 100 /* usec */, |
632 | .sda_pin = 44, | ||
633 | .scl_pin = 43, | ||
632 | }; | 634 | }; |
633 | 635 | ||
634 | static void __init evm_init_i2c(void) | 636 | static void __init evm_init_i2c(void) |
diff --git a/arch/arm/mach-davinci/include/mach/i2c.h b/arch/arm/mach-davinci/include/mach/i2c.h index c248e9b7e825..39fdceac8414 100644 --- a/arch/arm/mach-davinci/include/mach/i2c.h +++ b/arch/arm/mach-davinci/include/mach/i2c.h | |||
@@ -16,6 +16,8 @@ | |||
16 | struct davinci_i2c_platform_data { | 16 | struct davinci_i2c_platform_data { |
17 | unsigned int bus_freq; /* standard bus frequency (kHz) */ | 17 | unsigned int bus_freq; /* standard bus frequency (kHz) */ |
18 | unsigned int bus_delay; /* post-transaction delay (usec) */ | 18 | unsigned int bus_delay; /* post-transaction delay (usec) */ |
19 | unsigned int sda_pin; /* GPIO pin ID to use for SDA */ | ||
20 | unsigned int scl_pin; /* GPIO pin ID to use for SCL */ | ||
19 | }; | 21 | }; |
20 | 22 | ||
21 | /* for board setup code */ | 23 | /* for board setup code */ |