summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-at91/board-cam60.c
diff options
context:
space:
mode:
authorJean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>2012-04-05 14:14:28 +0800
committerNicolas Ferre <nicolas.ferre@atmel.com>2012-04-17 11:04:42 +0200
commit71b149b3f740501c2d59c80de5b10f5e45051099 (patch)
tree101450eaa5658b89d9d85e67fa1d7f56557457ab /arch/arm/mach-at91/board-cam60.c
parenta27fa58117ae1161adefedde449e5a71b3c593a4 (diff)
downloadop-kernel-dev-71b149b3f740501c2d59c80de5b10f5e45051099.zip
op-kernel-dev-71b149b3f740501c2d59c80de5b10f5e45051099.tar.gz
ARM: at91: do not pin mux the UARTs in init_early
There is no need to pinmux the UART so early in the kernel. Move it to the board init. This will also allow to finally move the gpio driver to platform device/driver. Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com> Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Diffstat (limited to 'arch/arm/mach-at91/board-cam60.c')
-rw-r--r--arch/arm/mach-at91/board-cam60.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/arm/mach-at91/board-cam60.c b/arch/arm/mach-at91/board-cam60.c
index 871717d..29d3ef0 100644
--- a/arch/arm/mach-at91/board-cam60.c
+++ b/arch/arm/mach-at91/board-cam60.c
@@ -49,9 +49,6 @@ static void __init cam60_init_early(void)
{
/* Initialize processor: 10 MHz crystal */
at91_initialize(10000000);
-
- /* DBGU on ttyS0. (Rx & Tx only) */
- at91_register_uart(0, 0, 0);
}
/*
@@ -172,6 +169,8 @@ static void __init cam60_add_device_nand(void)
static void __init cam60_board_init(void)
{
/* Serial */
+ /* DBGU on ttyS0. (Rx & Tx only) */
+ at91_register_uart(0, 0, 0);
at91_add_device_serial();
/* SPI */
at91_add_device_spi(cam60_spi_devices, ARRAY_SIZE(cam60_spi_devices));
OpenPOWER on IntegriCloud