From 13bb6afcd5b5f747238b34241a747d3c9cc25961 Mon Sep 17 00:00:00 2001 From: Philby John Date: Mon, 11 Jan 2010 15:53:31 +0530 Subject: [PATCH] --- yaml --- r: 183217 b: refs/heads/master c: 00642f6616a0d1893ab1dcfec4d833210f310e95 h: refs/heads/master i: 183215: 0e22828f253dd879b9834d9a76fda22db8348c54 v: v3 --- [refs] | 2 +- trunk/arch/arm/mach-davinci/board-dm355-evm.c | 2 ++ trunk/arch/arm/mach-davinci/board-dm644x-evm.c | 2 ++ trunk/arch/arm/mach-davinci/include/mach/i2c.h | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 04dc85267e67..1d4cf89d979a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3f995f2fd7e0814630f55be37c650a5983e4077e +refs/heads/master: 00642f6616a0d1893ab1dcfec4d833210f310e95 diff --git a/trunk/arch/arm/mach-davinci/board-dm355-evm.c b/trunk/arch/arm/mach-davinci/board-dm355-evm.c index 077ecf4fecda..aa48e3f69715 100644 --- a/trunk/arch/arm/mach-davinci/board-dm355-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm355-evm.c @@ -111,6 +111,8 @@ static struct platform_device davinci_nand_device = { static struct davinci_i2c_platform_data i2c_pdata = { .bus_freq = 400 /* kHz */, .bus_delay = 0 /* usec */, + .sda_pin = 15, + .scl_pin = 14, }; static struct snd_platform_data dm355_evm_snd_data; diff --git a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c index e9612cf727b7..976e11b7fa4a 100644 --- a/trunk/arch/arm/mach-davinci/board-dm644x-evm.c +++ b/trunk/arch/arm/mach-davinci/board-dm644x-evm.c @@ -629,6 +629,8 @@ static struct i2c_board_info __initdata i2c_info[] = { static struct davinci_i2c_platform_data i2c_pdata = { .bus_freq = 20 /* kHz */, .bus_delay = 100 /* usec */, + .sda_pin = 44, + .scl_pin = 43, }; static void __init evm_init_i2c(void) diff --git a/trunk/arch/arm/mach-davinci/include/mach/i2c.h b/trunk/arch/arm/mach-davinci/include/mach/i2c.h index c248e9b7e825..39fdceac8414 100644 --- a/trunk/arch/arm/mach-davinci/include/mach/i2c.h +++ b/trunk/arch/arm/mach-davinci/include/mach/i2c.h @@ -16,6 +16,8 @@ struct davinci_i2c_platform_data { unsigned int bus_freq; /* standard bus frequency (kHz) */ unsigned int bus_delay; /* post-transaction delay (usec) */ + unsigned int sda_pin; /* GPIO pin ID to use for SDA */ + unsigned int scl_pin; /* GPIO pin ID to use for SCL */ }; /* for board setup code */