Patch set updated for coreboot: f0aa01a exynos5420: re-factor the SDMMC GPIO config routines

[Patrick Georgi]

Patrick Georgi ([e-mail]) just uploaded a new patch set to gerrit, which you can find at http://review.coreboot.org/4446

-gerrit

commit f0aa01a5ca5fb445af736741176aeb1ff291f41e
Author: David Hendricks 
Date:   Thu Aug 8 14:09:46 2013 -0700

exynos5420: re-factor the SDMMC GPIO config routines

The existing GPIO config routines for SDMMC0-2 are over-generalized
    and somewhat confusing as a result. It would work nicely if all SDMMC
    ports were configured in the same fashion, but there are a few
    exceptions.

For example, the inner function runs differently if we're using 8 bits
    of data instead of 4, so a big chunk is skipped for SDMMC2. SDMMC0
    requires SD_0_CDn to be an output rather than alternate function and
    must have a value set.

This patch trades some verbosity for simplicy. Now the SDMMC GPIO
    configuration a straight-forward sequence of GPIO operations
    without any exceptions.

Signed-off-by: David Hendricks

Change-Id: If75075b24c6588c4c1b3be3fb9b1aa95e2fac2d1
    Reviewed-on: https://gerrit.chromium.org/gerrit/65248
    Reviewed-by: Gabe Black 
    Commit-Queue: David Hendricks 
    Tested-by: David Hendricks 
---
 src/cpu/samsung/exynos5420/pinmux.c | 92 +++++++++++++++++++++++++------------
 1 file changed, 63 insertions(+), 29 deletions(-)

diff --git a/src/cpu/samsung/exynos5420/pinmux.c b/src/cpu/samsung/exynos5420/pinmux.c
index 573cdb6..507ee86 100644
--- a/src/cpu/samsung/exynos5420/pinmux.c
+++ b/src/cpu/samsung/exynos5420/pinmux.c
@@ -19,6 +19,7 @@

#include <console/console.h>
 #include <assert.h>
+#include <stdlib.h>
 #include "gpio.h"
 #include "cpu.h"
 #include "pinmux.h"
@@ -53,52 +54,85 @@ void exynos_pinmux_uart3(void)
    exynos_pinmux_uart(GPIO_A14, 2);
 }

-static void exynos_pinmux_sdmmc(int start, int start_ext)
+struct gpio {
+	enum exynos5_gpio_pin pin;
+	unsigned int func;
+	unsigned int pull;
+	unsigned int drv;
+};
+
+static void exynos_pinmux_sdmmc(struct gpio *gpios, int num_gpios)
 {
    int i;

-	if (start_ext) {
-		for (i = start_ext; i <= (start_ext + 3); i++) {
-			gpio_cfg_pin(i, GPIO_FUNC(0x2));
-			gpio_set_pull(i, GPIO_PULL_UP);
-			gpio_set_drv(i, GPIO_DRV_4X);
-		}
-	}
-
-	for (i = 0; i < 3; i++) {
-		gpio_cfg_pin(start + i, GPIO_FUNC(0x2));
-		gpio_set_pull(start + i, GPIO_PULL_NONE);
-		gpio_set_drv(start + i, GPIO_DRV_4X);
-	}
-
-	for (i = 3; i <= 6; i++) {
-		gpio_cfg_pin(start +  i, GPIO_FUNC(0x2));
-		gpio_set_pull(start + i, GPIO_PULL_UP);
-		gpio_set_drv(start + i, GPIO_DRV_4X);
+	for (i = 0; i < num_gpios; i++) {
+		gpio_set_drv(gpios[i].pin, gpios[i].drv);
+		gpio_set_pull(gpios[i].pin, gpios[i].pull);
+		gpio_cfg_pin(gpios[i].pin, GPIO_FUNC(gpios[i].func));
    }
 }

void exynos_pinmux_sdmmc0(void)
 {
-	exynos_pinmux_sdmmc(GPIO_C00, GPIO_C30);
-	/*
-	 * MMC0 is intended to be used for eMMC. The card detect pin is used
-	 * as a VDDEN signal to power on the eMMC. The 5420 iROM makes this
-	 * same assumption.
-	 */
-	gpio_set_pull(GPIO_C02, GPIO_PULL_NONE);
-	gpio_cfg_pin(GPIO_C02, GPIO_OUTPUT);
+	struct gpio gpios[] = {
+		{ GPIO_C00, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CLK */
+		{ GPIO_C01, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CMD */
+		/*
+		 * MMC0 is intended to be used for eMMC. The card detect
+		 * pin is used as a VDDEN signal to power on the eMMC. The
+		 * 5420 iROM makes this same assumption.
+		 */
+		{ GPIO_C02, GPIO_OUTPUT, GPIO_PULL_NONE, GPIO_DRV_4X },
+		{ GPIO_C03, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[0] */
+		{ GPIO_C04, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[1] */
+		{ GPIO_C05, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[2] */
+		{ GPIO_C06, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[3] */
+
+		{ GPIO_C30, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[4] */
+		{ GPIO_C31, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[5] */
+		{ GPIO_C32, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[6] */
+		{ GPIO_C33, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[7] */
+	};
+
+	exynos_pinmux_sdmmc(&gpios[0], ARRAY_SIZE(gpios));
+
+	/* set VDDEN */
    gpio_set_value(GPIO_C02, 1);
 }

void exynos_pinmux_sdmmc1(void)
 {
-	exynos_pinmux_sdmmc(GPIO_C10, GPIO_D14);
+	struct gpio gpios[] = {
+		{ GPIO_C10, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CLK */
+		{ GPIO_C11, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CMD */
+		{ GPIO_C12, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CDn */
+		{ GPIO_C13, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[0] */
+		{ GPIO_C14, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[1] */
+		{ GPIO_C15, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[2] */
+		{ GPIO_C16, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[3] */
+
+		{ GPIO_D14, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[4] */
+		{ GPIO_D15, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[5] */
+		{ GPIO_D16, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[6] */
+		{ GPIO_D17, 0x2, GPIO_PULL_UP, GPIO_DRV_4X },	/* DATA[7] */
+	};
+
+	exynos_pinmux_sdmmc(&gpios[0], ARRAY_SIZE(gpios));
 }

void exynos_pinmux_sdmmc2(void)
 {
-	exynos_pinmux_sdmmc(GPIO_C20, 0);
+	struct gpio gpios[] = {
+		{ GPIO_C20, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CLK */
+		{ GPIO_C21, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CMD */
+		{ GPIO_C22, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* CDn */
+		{ GPIO_C23, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[0] */
+		{ GPIO_C24, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[1] */
+		{ GPIO_C25, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[2] */
+		{ GPIO_C26, 0x2, GPIO_PULL_NONE, GPIO_DRV_4X },	/* DATA[3] */
+	};
+
+	exynos_pinmux_sdmmc(&gpios[0], ARRAY_SIZE(gpios));
 }

static void exynos_pinmux_spi(int start, int cfg)