diff options
| author | Pradeep Goudagunta <pgoudagunta@nvidia.com> | 2011-05-12 17:31:40 +0530 |
|---|---|---|
| committer | Varun Colbert <vcolbert@nvidia.com> | 2011-05-13 19:06:01 -0700 |
| commit | 6873e770230c487f04ad1a11c5c419bc97ae32b4 (patch) | |
| tree | 81b41ae3f4394423ed1720746e6f0f30bab800a9 | |
| parent | b17e8de9d5641edf76e3b6046a273d2a4a261e0a (diff) | |
ARM: tegra: enterprise: use UART4 as debug uart
Enable UART4 as debug uart.
Bug 814271
Bug 822432
Change-Id: I73f01191d5f1e0fe979eb804028e0a7956eb93df
Reviewed-on: http://git-master/r/30513
Reviewed-by: Varun Colbert <vcolbert@nvidia.com>
Tested-by: Varun Colbert <vcolbert@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-pinmux.c | 16 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise.c | 9 |
2 files changed, 12 insertions, 13 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-pinmux.c b/arch/arm/mach-tegra/board-enterprise-pinmux.c index 6680d1f6ed16..1bddca72154d 100644 --- a/arch/arm/mach-tegra/board-enterprise-pinmux.c +++ b/arch/arm/mach-tegra/board-enterprise-pinmux.c @@ -178,10 +178,10 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = { DEFAULT_PINMUX(ULPI_DATA5, UARTA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(ULPI_DATA6, UARTA, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(ULPI_DATA7, UARTA, NORMAL, NORMAL, OUTPUT), - DEFAULT_PINMUX(ULPI_CLK, UARTD, NORMAL, NORMAL, OUTPUT), - DEFAULT_PINMUX(ULPI_DIR, UARTD, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(ULPI_NXT, UARTD, NORMAL, NORMAL, INPUT), - DEFAULT_PINMUX(ULPI_STP, UARTD, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(ULPI_CLK, ULPI, NORMAL, NORMAL, OUTPUT), + DEFAULT_PINMUX(ULPI_DIR, ULPI, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(ULPI_NXT, ULPI, NORMAL, NORMAL, INPUT), + DEFAULT_PINMUX(ULPI_STP, ULPI, NORMAL, NORMAL, OUTPUT), DEFAULT_PINMUX(DAP3_FS, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP3_DIN, I2S2, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(DAP3_DOUT, I2S2, NORMAL, NORMAL, INPUT), @@ -268,10 +268,10 @@ static __initdata struct tegra_pingroup_config enterprise_pinmux[] = { DEFAULT_PINMUX(GMI_RST_N, RSVD3, PULL_UP, TRISTATE, INPUT), DEFAULT_PINMUX(GMI_AD8, PWM0, NORMAL, NORMAL, OUTPUT), /* LCD1_BL_PWM */ DEFAULT_PINMUX(GMI_AD10, NAND, NORMAL, NORMAL, OUTPUT), /* LCD1_BL_EN */ - DEFAULT_PINMUX(GMI_A16, SPI4, PULL_UP, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A17, SPI4, PULL_UP, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A18, SPI4, PULL_UP, NORMAL, INPUT), - DEFAULT_PINMUX(GMI_A19, SPI4, PULL_UP, NORMAL, INPUT), + 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), DEFAULT_PINMUX(CAM_MCLK, VI_ALT2, PULL_UP, NORMAL, INPUT), DEFAULT_PINMUX(GPIO_PCC1, RSVD1, NORMAL, NORMAL, INPUT), DEFAULT_PINMUX(GPIO_PBB0, RSVD1, NORMAL, NORMAL, INPUT), diff --git a/arch/arm/mach-tegra/board-enterprise.c b/arch/arm/mach-tegra/board-enterprise.c index f1165bcea621..1793529f0ba9 100644 --- a/arch/arm/mach-tegra/board-enterprise.c +++ b/arch/arm/mach-tegra/board-enterprise.c @@ -71,9 +71,9 @@ static struct platform_device tegra_usb_fsg_device = { static struct plat_serial8250_port debug_uart_platform_data[] = { { - .membase = IO_ADDRESS(TEGRA_UARTA_BASE), - .mapbase = TEGRA_UARTA_BASE, - .irq = INT_UARTA, + .membase = IO_ADDRESS(TEGRA_UARTD_BASE), + .mapbase = TEGRA_UARTD_BASE, + .irq = INT_UARTD, .flags = UPF_BOOT_AUTOCONF | UPF_FIXED_TYPE, .type = PORT_TEGRA, .iotype = UPIO_MEM, @@ -155,7 +155,7 @@ static __initdata struct tegra_clk_init_table enterprise_clk_init_table[] = { { "uarta", "pll_p", 216000000, true}, { "uartb", "pll_p", 216000000, false}, { "uartc", "pll_p", 216000000, false}, - { "uartd", "pll_p", 216000000, false}, + { "uartd", "pll_p", 216000000, true}, { "uarte", "pll_p", 216000000, false}, { "pll_m", NULL, 0, true}, { "hda", "pll_p", 108000000, false}, @@ -359,7 +359,6 @@ static struct platform_device *enterprise_devices[] __initdata = { &debug_uart, &tegra_uartb_device, &tegra_uartc_device, - &tegra_uartd_device, &tegra_uarte_device, &pmu_device, &tegra_rtc_device, |