diff options
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852-pinmux.c | 16 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852.c | 3 |
2 files changed, 10 insertions, 9 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), }; diff --git a/arch/arm/mach-tegra/board-p1852.c b/arch/arm/mach-tegra/board-p1852.c index 6c1f9a7e88a9..ef53d4050938 100644 --- a/arch/arm/mach-tegra/board-p1852.c +++ b/arch/arm/mach-tegra/board-p1852.c @@ -105,6 +105,7 @@ static __initdata struct tegra_clk_init_table p1852_clk_init_table[] = { { "d_audio", "pll_a_out0", 12288000, false}, { "nor", "pll_p", 86500000, true}, { "uarta", "pll_p", 480000000, true}, + { "uartd", "pll_p", 480000000, true}, { "uarte", "pll_p", 480000000, true}, { "sdmmc2", "pll_p", 52000000, true}, { "sbc1", "pll_m", 100000000, true}, @@ -198,6 +199,7 @@ static void p1852_i2c_init(void) static struct platform_device *p1852_uart_devices[] __initdata = { &tegra_uarta_device, &tegra_uartb_device, + &tegra_uartd_device, &tegra_uarte_device, }; static struct clk *debug_uart_clk; @@ -327,7 +329,6 @@ static void p1852_spi_init(void) tegra_spi_device2.name = "spi_slave_tegra"; platform_device_register(&tegra_spi_device1); platform_device_register(&tegra_spi_device2); - platform_device_register(&tegra_spi_device4); p852_register_spidev(); } |