diff options
| author | Manoj Chourasia <mchourasia@nvidia.com> | 2012-03-20 18:44:46 +0530 |
|---|---|---|
| committer | Simone Willett <swillett@nvidia.com> | 2012-03-30 18:42:16 -0700 |
| commit | 0982bd42c9dded3377f0904851d23982e8860def (patch) | |
| tree | b1f84761852765cea14e10a691bf40cec47673d6 /arch/arm/mach-tegra/board-p1852-pinmux.c | |
| parent | 9f37229347b62d04999b0ade874eeae3ac4b731e (diff) | |
p1852: Enable uart4 and remove spi4
+ Enable uart4 and remove spi4
+ use SPI2 instead of SPI1 as initial pinmux for gpio x5/6
bug 933971
Reviewed-on: http://git-master/r/78718
(cherry picked from commit 7135fbe5edf7357384dc92b613ea46dc927d6b06)
Change-Id: I46d3072dd160d7a2d1f11f949cc934fbdff1e0a6
Reviewed-on: http://git-master/r/91234
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>
Diffstat (limited to 'arch/arm/mach-tegra/board-p1852-pinmux.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852-pinmux.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/arch/arm/mach-tegra/board-p1852-pinmux.c b/arch/arm/mach-tegra/board-p1852-pinmux.c index 3ccc9af49b63..611d3ebfa8b1 100644 --- a/arch/arm/mach-tegra/board-p1852-pinmux.c +++ b/arch/arm/mach-tegra/board-p1852-pinmux.c @@ -172,6 +172,12 @@ static __initdata struct tegra_pingroup_config p1852_pinmux_common[] = { DEFAULT_PINMUX(UART2_RXD, IRDA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(UART2_TXD, IRDA, NORMAL, NORMAL, OUTPUT), + /* UART4 pinmux */ + DEFAULT_PINMUX(GMI_A16, UARTD, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(GMI_A17, UARTD, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(GMI_A18, UARTD, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(GMI_A19, UARTD, NORMAL, NORMAL, OUTPUT), + /* UART5 pinmux */ DEFAULT_PINMUX(SDMMC4_DAT0, UARTE, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SDMMC4_DAT1, UARTE, NORMAL, NORMAL, OUTPUT), @@ -206,12 +212,6 @@ static __initdata struct tegra_pingroup_config p1852_pinmux_common[] = { DEFAULT_PINMUX(ULPI_DATA6, SPI2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(ULPI_DATA7, SPI2, NORMAL, NORMAL, INPUT), - /* SPI4 pinmux */ - DEFAULT_PINMUX(GMI_A16, SPI4, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A17, SPI4, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A18, SPI4, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A19, SPI4, NORMAL, NORMAL, INPUT), - /* SPDIF pinmux */ DEFAULT_PINMUX(SPDIF_IN, SPDIF, NORMAL, NORMAL, INPUT), @@ -347,8 +347,8 @@ static __initdata struct tegra_pingroup_config p1852_pinmux_common[] = { DEFAULT_PINMUX(SDMMC3_DAT5, SDMMC3, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SPI2_CS1_N, SPI2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SPDIF_OUT, SAFE, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(SPI1_SCK, SPI1, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(SPI1_CS0_N, SPI1, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(SPI1_SCK, SPI2, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(SPI1_CS0_N, SPI2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(SPI1_MISO, SAFE, NORMAL, NORMAL, INPUT), }; |