diff options
| author | Alok Chauhan <alokc@nvidia.com> | 2011-08-11 14:58:18 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-08-16 17:40:47 -0700 |
| commit | 14c59d805740d594d012c7a5288c14b4c4bcdb05 (patch) | |
| tree | 6d4ecaa1730c77eb1adde35523b9fb977518c3b0 /arch/arm/mach-tegra/board-cardhu.c | |
| parent | 2388ab264a62c9a97c1f56b8bb41d513e2ceab7d (diff) | |
arm: tegra: Updated i2c platform data
Updated i2c platform data to add scl_gpio and sda_gpio as
a array so it will take care of multiplexing also.
Bug 854305
Change-Id: I671a3b54ea12c53ef873f5766cf393b23c0df34e
Reviewed-on: http://git-master/r/46628
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-cardhu.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-cardhu.c | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/arch/arm/mach-tegra/board-cardhu.c b/arch/arm/mach-tegra/board-cardhu.c index 0e2feb557c23..8bed78b43c32 100644 --- a/arch/arm/mach-tegra/board-cardhu.c +++ b/arch/arm/mach-tegra/board-cardhu.c @@ -339,8 +339,8 @@ static struct tegra_i2c_platform_data cardhu_i2c1_platform_data = { .adapter_nr = 0, .bus_count = 1, .bus_clk_rate = { 100000, 0 }, - .scl_gpio = TEGRA_GPIO_PC4, - .sda_gpio = TEGRA_GPIO_PC5, + .scl_gpio = {TEGRA_GPIO_PC4, 0}, + .sda_gpio = {TEGRA_GPIO_PC5, 0}, .arb_recovery = arb_lost_recovery, }; @@ -349,8 +349,8 @@ static struct tegra_i2c_platform_data cardhu_i2c2_platform_data = { .bus_count = 1, .bus_clk_rate = { 100000, 0 }, .is_clkon_always = true, - .scl_gpio = TEGRA_GPIO_PT5, - .sda_gpio = TEGRA_GPIO_PT6, + .scl_gpio = {TEGRA_GPIO_PT5, 0}, + .sda_gpio = {TEGRA_GPIO_PT6, 0}, .arb_recovery = arb_lost_recovery, }; @@ -358,8 +358,8 @@ static struct tegra_i2c_platform_data cardhu_i2c3_platform_data = { .adapter_nr = 2, .bus_count = 1, .bus_clk_rate = { 100000, 0 }, - .scl_gpio = TEGRA_GPIO_PBB1, - .sda_gpio = TEGRA_GPIO_PBB2, + .scl_gpio = {TEGRA_GPIO_PBB1, 0}, + .sda_gpio = {TEGRA_GPIO_PBB2, 0}, .arb_recovery = arb_lost_recovery, }; @@ -367,8 +367,8 @@ static struct tegra_i2c_platform_data cardhu_i2c4_platform_data = { .adapter_nr = 3, .bus_count = 1, .bus_clk_rate = { 100000, 0 }, - .scl_gpio = TEGRA_GPIO_PV4, - .sda_gpio = TEGRA_GPIO_PV5, + .scl_gpio = {TEGRA_GPIO_PV4, 0}, + .sda_gpio = {TEGRA_GPIO_PV5, 0}, .arb_recovery = arb_lost_recovery, }; @@ -376,8 +376,8 @@ static struct tegra_i2c_platform_data cardhu_i2c5_platform_data = { .adapter_nr = 4, .bus_count = 1, .bus_clk_rate = { 100000, 0 }, - .scl_gpio = TEGRA_GPIO_PZ6, - .sda_gpio = TEGRA_GPIO_PZ7, + .scl_gpio = {TEGRA_GPIO_PZ6, 0}, + .sda_gpio = {TEGRA_GPIO_PZ7, 0}, .arb_recovery = arb_lost_recovery, }; |