From 8c711d2b61e44f3034deff5fa7ad583364baa5b7 Mon Sep 17 00:00:00 2001 From: Nobuhiro Iwamatsu Date: Thu, 9 Aug 2012 15:32:28 +0900 Subject: [PATCH] rmobile: armadillo-800eva: Change init function of SCIFA1 This initializes GPIO, without using PFC framework in board_early_init_f function. It is because it cannot initialize normally when PFC is used. Signed-off-by: Nobuhiro Iwamatsu Signed-off-by: Nobuhiro Iwamatsu --- board/atmark-techno/armadillo-800eva/armadillo-800eva.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c index a075865502..0e9c22296a 100644 --- a/board/atmark-techno/armadillo-800eva/armadillo-800eva.c +++ b/board/atmark-techno/armadillo-800eva/armadillo-800eva.c @@ -243,6 +243,9 @@ void s_init(void) #define I2C1_MSTP323 (1 << 23) #define GETHER_MSTP309 (1 << 9) +#define GPIO_SCIFA1_TXD (0xE60520C4) +#define GPIO_SCIFA1_RXD (0xE60520C3) + int board_early_init_f(void) { /* TMU */ @@ -256,9 +259,8 @@ int board_early_init_f(void) clrbits_le32(MSTPCR3, I2C1_MSTP323); /* SCIFA1 */ - r8a7740_pinmux_init(); - gpio_request(GPIO_FN_SCIFA1_RXD, NULL); - gpio_request(GPIO_FN_SCIFA1_TXD, NULL); + writeb(1, GPIO_SCIFA1_TXD); /* SCIFA1_TXD */ + writeb(1, GPIO_SCIFA1_RXD); /* SCIFA1_RXD */ /* IICCR */ writew(GPIO_ICCR_DATA, GPIO_ICCR);