diff mbox

[U-Boot,v3,4/4] x86: minnowmax: initialize the pin-muxing from device tree

Message ID 1431411505-2598-1-git-send-email-contact@huau-gabriel.fr
State Accepted
Delegated to: Simon Glass
Headers show

Commit Message

Gabriel Huau May 12, 2015, 6:18 a.m. UTC
Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr>
Acked-by: Simon Glass <sjg@chromium.org>

---

Changes in v3:
    - Rebase to the origin/master

Changes in v2:
    - Fix ordering of include header

 board/intel/minnowmax/minnowmax.c | 9 +++++++++
 include/configs/minnowmax.h       | 1 +
 2 files changed, 10 insertions(+)

Comments

Simon Glass June 4, 2015, 3:17 p.m. UTC | #1
On 12 May 2015 at 00:18, Gabriel Huau <contact@huau-gabriel.fr> wrote:
> Signed-off-by: Gabriel Huau <contact@huau-gabriel.fr>
> Acked-by: Simon Glass <sjg@chromium.org>
>
> ---
>
> Changes in v3:
>     - Rebase to the origin/master
>
> Changes in v2:
>     - Fix ordering of include header
>
>  board/intel/minnowmax/minnowmax.c | 9 +++++++++
>  include/configs/minnowmax.h       | 1 +
>  2 files changed, 10 insertions(+)

Applied to u-boot-x86, thanks!
diff mbox

Patch

diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c
index 1f5549a..383cae0 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 eb35a50..547765d 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