Patch set updated for coreboot: pcengines/api2: reenable Kconfig variables for pinmux

[Piotr Król]

Piotr Król ([e-mail]) just uploaded a new patch set to gerrit, which you can find at https://review.coreboot.org/14138

-gerrit

commit 800c14090393011dc70a7d4170e8190a80cca470
Author: Piotr Król 
Date:   Mon Jun 6 15:36:36 2016 +0200

pcengines/api2: reenable Kconfig variables for pinmux

Change-Id: Id23e448e27f4bba47b7e9e7fa7679e2690c6e4bc
    Signed-off-by: Piotr Król 
---
 src/mainboard/pcengines/apu2/Kconfig     | 30 ++++++++++++++++++++++++++++++
 src/mainboard/pcengines/apu2/mainboard.c |  8 ++++----
 2 files changed, 34 insertions(+), 4 deletions(-)

diff --git a/src/mainboard/pcengines/apu2/Kconfig b/src/mainboard/pcengines/apu2/Kconfig
index 5faffad..2ca27d8 100644
--- a/src/mainboard/pcengines/apu2/Kconfig
+++ b/src/mainboard/pcengines/apu2/Kconfig
@@ -53,4 +53,34 @@ config HUDSON_LEGACY_FREE
    bool
    default y

+choice
+	prompt "J19 pins 1-10"
+	default APU2_PINMUX_OFF_C
+
+config APU2_PINMUX_OFF_C
+	bool "disable"
+
+config APU2_PINMUX_GPIO0
+	bool "GPIO"
+
+config APU2_PINMUX_UART_C
+	bool "UART 0x3e8"
+
+endchoice
+
+choice
+	prompt "J19 pins 11-20"
+	default APU2_PINMUX_OFF_D
+
+config APU2_PINMUX_OFF_D
+	bool "disable"
+
+config APU2_PINMUX_GPIO1
+	bool "GPIO"
+
+config APU2_PINMUX_UART_D
+	bool "UART 0x2e8"
+
+endchoice
+
 endif # BOARD_PCENGINES_APU2
diff --git a/src/mainboard/pcengines/apu2/mainboard.c b/src/mainboard/pcengines/apu2/mainboard.c
index 72b0843..98fe8dd 100644
--- a/src/mainboard/pcengines/apu2/mainboard.c
+++ b/src/mainboard/pcengines/apu2/mainboard.c
@@ -149,16 +149,16 @@ static void config_gpio_mux(void)
    uart = dev_find_slot_pnp(SIO_PORT, NCT5104D_SP3);
    gpio = dev_find_slot_pnp(SIO_PORT, NCT5104D_GPIO0);
    if (uart)
-		uart->enabled = CONFIG_PINMUX_UART_C;
+		uart->enabled = CONFIG_APU2_PINMUX_UART_C;
    if (gpio)
-		gpio->enabled = CONFIG_PINMUX_GPIO0;
+		gpio->enabled = CONFIG_APU2_PINMUX_GPIO0;

uart = dev_find_slot_pnp(SIO_PORT, NCT5104D_SP4);
    gpio = dev_find_slot_pnp(SIO_PORT, NCT5104D_GPIO1);
    if (uart)
-		uart->enabled = CONFIG_PINMUX_UART_D;
+		uart->enabled = CONFIG_APU2_PINMUX_UART_D;
    if (gpio)
-		gpio->enabled = CONFIG_PINMUX_GPIO1;
+		gpio->enabled = CONFIG_APU2_PINMUX_GPIO1;
 }

/**********************************************