diff options
| author | Steve Lin <stlin@nvidia.com> | 2010-03-31 18:04:07 -0700 |
|---|---|---|
| committer | Gary King <gking@nvidia.com> | 2010-04-01 16:44:42 -0800 |
| commit | 4b115fddc0a3358f6f7ef5c85ad13c45ea5ba27c (patch) | |
| tree | f1611b9894411be81abe4ebe8d7478991a8a1eb2 /arch | |
| parent | b90f10ffdc6693997d8bcd9a5a9a2ba1aa518868 (diff) | |
tegra ODM: Changing pinmux configuration for UART-A when ULPI is used.
This fix corrects the pinmux configuration so UART-A is mapped to SDIO1 pins
when ULPI is used. AP will be able to communicate with the ULPI modem through
both UART and ULPI.
Change-Id: I268a76496bd5371c2b757b0133eb0f276234504f
Reviewed-on: http://git-master/r/1005
Tested-by: Szming Lin <stlin@nvidia.com>
Reviewed-by: Gary King <gking@nvidia.com>
Diffstat (limited to 'arch')
| -rwxr-xr-x[-rw-r--r--] | arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query_pinmux.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query_pinmux.c b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query_pinmux.c index bbe8215f0c8d..1e9aeef4e584 100644..100755 --- a/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query_pinmux.c +++ b/arch/arm/mach-tegra/odm_kit/query/whistler/nvodm_query_pinmux.c @@ -48,9 +48,9 @@ static const NvU32 s_NvOdmPinMuxConfig_Uart_Hsi_Ulpi[] = { - 0, // Instance 0: UART-A //UAA and UAB are needed by Mipi Hsi or ULPI + NvOdmUartPinMap_Config7, // Instance 0: UART-A is mapped to SDIO1 pins when ULPI is used NvOdmUartPinMap_Config1, // Instance 1: UART-B - NvOdmUartPinMap_Config1, // Instance 2: UART-C + NvOdmUartPinMap_Config1, // Instance 2: UART-C 0, // UART-D function disabled: pins used by BB (SPI1) 0, // UART-E function disabled: pins used by WiFi (SDIO1) }; @@ -331,9 +331,7 @@ NvOdmQueryPinMux( break; case NvOdmIoModule_Uart: - if ((Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_71) || - (Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_01) || - (Personality == TEGRA_DEVKIT_BCT_CUSTOPT_0_PERSONALITY_11)) + if (Ril == TEGRA_DEVKIT_BCT_CUSTOPT_0_RIL_EMP_RAINBOW_ULPI) { *pPinMuxConfigTable = s_NvOdmPinMuxConfig_Uart_Hsi_Ulpi; *pCount = NV_ARRAY_SIZE(s_NvOdmPinMuxConfig_Uart_Hsi_Ulpi); |