diff options
| author | Venkata(Muni) Anda <muni@nvidia.com> | 2010-01-18 19:20:41 -0800 |
|---|---|---|
| committer | Venkata(Muni) Anda <muni@nvidia.com> | 2010-01-18 19:30:35 -0800 |
| commit | 205adcf549b341ab10a271835ee07ed96c44f751 (patch) | |
| tree | 4ce414b3ff123fce158d5d697645214075ef39cc | |
| parent | d8be32521855690e939f2e0c5bb37252eaff056d (diff) | |
tegra: Fix I2C platform data pinmux initialization.
Platform data was passing "0" as the pinmux config for all
non-multiplexed configurations. It should use the value from the
ODM query intead.
BUG 626459
Change-Id: I4278f353e7adbf5d82a32ff613409f54a2203738
| -rw-r--r-- | arch/arm/mach-tegra/init_common.c | 2 |
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 32746e5e4d50..6e11a4de803e 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) ? 0 : (NvOdmI2cPinMap_Config1 + k); + (ToAdd==1) ? pPinMuxes[j] : (NvOdmI2cPinMap_Config1 + k); // FIXME: Always defaulting to 100KHz for now. I2cData.ClockInKHz = 100; if (platform_device_add_data(pDev, &I2cData, sizeof(I2cData))) |