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.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.c')
| -rw-r--r-- | arch/arm/mach-tegra/board-p1852.c | 3 |
1 files changed, 2 insertions, 1 deletions
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(); } |