summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVenkata(Muni) Anda <muni@nvidia.com>2010-01-18 20:29:11 -0800
committerVenkata(Muni) Anda <muni@nvidia.com>2010-01-18 20:29:11 -0800
commita9ff47f2135737cef78d3832e6dcc08df37ddee1 (patch)
treee9b40af117b06977e8eb71ade22946f4cf810bac
parent99558a6f6c01996f11e0c8d4c4dbdcb0880e513e (diff)
Revert "tegra: Fix I2C platform data pinmux initialization."
Reverting commit 205adcf549b341ab10a271835ee07ed96c44f751. platfrom data pinmux is only valid for the multiplexed configurations. For non-multiplexed configuration, the vlaue should be 0.
-rw-r--r--arch/arm/mach-tegra/init_common.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/init_common.c b/arch/arm/mach-tegra/init_common.c
index 6e11a4de803e..32746e5e4d50 100644
--- a/arch/arm/mach-tegra/init_common.c
+++ b/arch/arm/mach-tegra/init_common.c
@@ -360,7 +360,7 @@ static void __init tegra_register_i2c(void)
I2cData.IoModuleID = OdmModules[i];
I2cData.Instance = j;
I2cData.PinMuxConfig =
- (ToAdd==1) ? pPinMuxes[j] : (NvOdmI2cPinMap_Config1 + k);
+ (ToAdd==1) ? 0 : (NvOdmI2cPinMap_Config1 + k);
// FIXME: Always defaulting to 100KHz for now.
I2cData.ClockInKHz = 100;
if (platform_device_add_data(pDev, &I2cData, sizeof(I2cData)))