summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Huau <contact@huau-gabriel.fr>2015-05-11 23:18:25 -0700
committerSimon Glass <sjg@chromium.org>2015-06-04 03:32:23 -0600
commit5d3c2c542dd8878fece0ea96edde125635b492ff (patch)
tree25a71c6c46ae201ec0eda885fa7071b24880e41f
parent5318f18d2c002f505054b90bb95ba7c53532eedf (diff)
x86: minnowmax: initialize the pin-muxing from device tree
Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr> Acked-by: Simon Glass <sjg@chromium.org>
-rw-r--r--board/intel/minnowmax/minnowmax.c9
-rw-r--r--include/configs/minnowmax.h1
2 files changed, 10 insertions, 0 deletions
diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
index 1f5549a458..383cae068b 100644
--- a/board/intel/minnowmax/minnowmax.c
+++ b/board/intel/minnowmax/minnowmax.c
@@ -5,6 +5,7 @@
*/
#include <common.h>
+#include <asm/gpio.h>
#include <asm/ibmpc.h>
#include <asm/pnp_def.h>
#include <netdev.h>
@@ -12,6 +13,14 @@
#define SERIAL_DEV PNP_DEV(0x2e, 4)
+int arch_early_init_r(void)
+{
+ /* do the pin-muxing */
+ gpio_ich6_pinctrl_init();
+
+ return 0;
+}
+
int board_early_init_f(void)
{
lpc47m_enable_serial(SERIAL_DEV, UART0_BASE, UART0_IRQ);
diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h
index eb35a50039..547765d137 100644
--- a/include/configs/minnowmax.h
+++ b/include/configs/minnowmax.h
@@ -15,6 +15,7 @@
#define CONFIG_SYS_MONITOR_LEN (1 << 20)
#define CONFIG_BOARD_EARLY_INIT_F
+#define CONFIG_ARCH_EARLY_INIT_R
#define CONFIG_X86_SERIAL
#define CONFIG_SMSC_LPC47M