diff options
| author | Alok Chauhan <alokc@nvidia.com> | 2011-08-16 14:39:42 +0530 |
|---|---|---|
| committer | Niket Sirsi <nsirsi@nvidia.com> | 2011-08-16 16:21:15 -0700 |
| commit | 58ee0aef0b9abb136c13ecb38fd82d3d49e55ff9 (patch) | |
| tree | d4f85373f41cb59dfea11adf1cced06e1755ccd9 | |
| parent | 8ebb9b63afc52370a52555ea68b177e9d1bdc8a0 (diff) | |
arm: tegra: Updated i2c platform data
Updated i2c platform data to add i2c arb lost recovery funtion
and corresponding gpio numbers to i2c pins
bug 854305
This is cherry pick of change http://git-master/r/#change,43200
in main but hand-merged.
Change-Id: I4098a512625c16598b8596d0e46d285ca9b92d2b
Reviewed-on: http://git-master/r/47290
Reviewed-by: Alok Chauhan <alokc@nvidia.com>
Tested-by: Alok Chauhan <alokc@nvidia.com>
Reviewed-by: Bharat Nihalani <bnihalani@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-ventana.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-whistler.c | 12 |
2 files changed, 24 insertions, 0 deletions
diff --git a/arch/arm/mach-tegra/board-ventana.c b/arch/arm/mach-tegra/board-ventana.c index 146856df0977..c76da93093ce 100644 --- a/arch/arm/mach-tegra/board-ventana.c +++ b/arch/arm/mach-tegra/board-ventana.c @@ -441,6 +441,9 @@ static struct tegra_i2c_platform_data ventana_i2c1_platform_data = { .bus_count = 1, .bus_clk_rate = { 400000, 0 }, .slave_addr = 0x00FC, + .scl_gpio = {TEGRA_GPIO_PC4, 0}, + .sda_gpio = {TEGRA_GPIO_PC5, 0}, + .arb_recovery = arb_lost_recovery, }; static const struct tegra_pingroup_config i2c2_ddc = { @@ -460,6 +463,9 @@ static struct tegra_i2c_platform_data ventana_i2c2_platform_data = { .bus_mux = { &i2c2_ddc, &i2c2_gen2 }, .bus_mux_len = { 1, 1 }, .slave_addr = 0x00FC, + .scl_gpio = {0, TEGRA_GPIO_PT5}, + .sda_gpio = {0, TEGRA_GPIO_PT6}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_i2c_platform_data ventana_i2c3_platform_data = { @@ -467,6 +473,9 @@ static struct tegra_i2c_platform_data ventana_i2c3_platform_data = { .bus_count = 1, .bus_clk_rate = { 400000, 0 }, .slave_addr = 0x00FC, + .scl_gpio = {TEGRA_GPIO_PBB2, 0}, + .sda_gpio = {TEGRA_GPIO_PBB3, 0}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_i2c_platform_data ventana_dvc_platform_data = { @@ -474,6 +483,9 @@ static struct tegra_i2c_platform_data ventana_dvc_platform_data = { .bus_count = 1, .bus_clk_rate = { 400000, 0 }, .is_dvc = true, + .scl_gpio = {TEGRA_GPIO_PZ6, 0}, + .sda_gpio = {TEGRA_GPIO_PZ7, 0}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_audio_platform_data tegra_audio_pdata[] = { diff --git a/arch/arm/mach-tegra/board-whistler.c b/arch/arm/mach-tegra/board-whistler.c index d048d8c54d92..502eaac10417 100644 --- a/arch/arm/mach-tegra/board-whistler.c +++ b/arch/arm/mach-tegra/board-whistler.c @@ -329,6 +329,9 @@ static struct tegra_i2c_platform_data whistler_i2c1_platform_data = { .adapter_nr = 0, .bus_count = 1, .bus_clk_rate = { 400000, 0 }, + .scl_gpio = {TEGRA_GPIO_PC4, 0}, + .sda_gpio = {TEGRA_GPIO_PC5, 0}, + .arb_recovery = arb_lost_recovery, }; static const struct tegra_pingroup_config i2c2_ddc = { @@ -347,12 +350,18 @@ static struct tegra_i2c_platform_data whistler_i2c2_platform_data = { .bus_clk_rate = { 100000, 100000 }, .bus_mux = { &i2c2_ddc, &i2c2_gen2 }, .bus_mux_len = { 1, 1 }, + .scl_gpio = {0, TEGRA_GPIO_PT5}, + .sda_gpio = {0, TEGRA_GPIO_PT6}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_i2c_platform_data whistler_i2c3_platform_data = { .adapter_nr = 3, .bus_count = 1, .bus_clk_rate = { 400000, 0 }, + .scl_gpio = {TEGRA_GPIO_PBB2, 0}, + .sda_gpio = {TEGRA_GPIO_PBB3, 0}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_i2c_platform_data whistler_dvc_platform_data = { @@ -360,6 +369,9 @@ static struct tegra_i2c_platform_data whistler_dvc_platform_data = { .bus_count = 1, .bus_clk_rate = { 400000, 0 }, .is_dvc = true, + .scl_gpio = {TEGRA_GPIO_PZ6, 0}, + .sda_gpio = {TEGRA_GPIO_PZ7, 0}, + .arb_recovery = arb_lost_recovery, }; static struct tegra_das_platform_data tegra_das_pdata = { |