[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Stephen Warren]

v5: New patch

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 board/nvidia/harmony/Makefile  |    2 +-
 board/nvidia/seaboard/Makefile |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/board/nvidia/harmony/Makefile b/board/nvidia/harmony/Makefile
index ebd8e02..aab185e 100644
--- a/board/nvidia/harmony/Makefile
+++ b/board/nvidia/harmony/Makefile
@@ -37,7 +37,7 @@ SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
 $(LIB):	$(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 clean:
 	rm -f $(OBJS)
diff --git a/board/nvidia/seaboard/Makefile b/board/nvidia/seaboard/Makefile
index ebd8e02..aab185e 100644
--- a/board/nvidia/seaboard/Makefile
+++ b/board/nvidia/seaboard/Makefile
@@ -37,7 +37,7 @@ SRCS	:= $(COBJS:.o=.c)
 OBJS	:= $(addprefix $(obj),$(COBJS))
 
 $(LIB):	$(obj).depend $(OBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
 
 clean:
 	rm -f $(OBJS)
-- 
1.7.0.4

[U-Boot] [PATCH v6 2/5] tegra2: Move MMC clock initialization into MMC driver

[Stephen Warren]

This centralizes knowledge of MMC clocking into the MMC driver. This also
removes clock setup from the board files, which will simplify later changes
that modify the Harmony board to support the correct set of MMC controllers.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Acked-by: Simon Glass <sjg@chromium.org>
Tested-by: Simon Glass <sjg@chromium.org>
---
 board/nvidia/common/board.c |   13 +------------
 drivers/mmc/tegra2_mmc.c    |   12 +++++++++---
 2 files changed, 10 insertions(+), 15 deletions(-)

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index d13537d..370a259 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -102,16 +102,6 @@ static void pin_mux_uart(void)
 
 #ifdef CONFIG_TEGRA2_MMC
 /*
- * Routine: clock_init_mmc
- * Description: init the PLL and clocks for the SDMMC controllers
- */
-static void clock_init_mmc(void)
-{
-	clock_start_periph_pll(PERIPH_ID_SDMMC4, CLOCK_ID_PERIPH, 20000000);
-	clock_start_periph_pll(PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH, 20000000);
-}
-
-/*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
  */
@@ -157,8 +147,7 @@ int board_init(void)
 int board_mmc_init(bd_t *bd)
 {
 	debug("board_mmc_init called\n");
-	/* Enable clocks, muxes, etc. for SDMMC controllers */
-	clock_init_mmc();
+	/* Enable muxes, etc. for SDMMC controllers */
 	pin_mux_mmc();
 	gpio_config_mmc();
 
diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
index 9e741f2..78b1190 100644
--- a/drivers/mmc/tegra2_mmc.c
+++ b/drivers/mmc/tegra2_mmc.c
@@ -435,14 +435,22 @@ static int mmc_core_init(struct mmc *mmc)
 
 static int tegra2_mmc_initialize(int dev_index, int bus_width)
 {
+	struct mmc_host *host;
 	struct mmc *mmc;
 
 	debug(" mmc_initialize called\n");
 
+	host = &mmc_host[dev_index];
+
+	host->clock = 0;
+	tegra2_get_setup(host, dev_index);
+
+	clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
+
 	mmc = &mmc_dev[dev_index];
 
 	sprintf(mmc->name, "Tegra2 SD/MMC");
-	mmc->priv = &mmc_host[dev_index];
+	mmc->priv = host;
 	mmc->send_cmd = mmc_send_cmd;
 	mmc->set_ios = mmc_set_ios;
 	mmc->init = mmc_core_init;
@@ -465,8 +473,6 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
 	mmc->f_min = 375000;
 	mmc->f_max = 48000000;
 
-	mmc_host[dev_index].clock = 0;
-	tegra2_get_setup(&mmc_host[dev_index], dev_index);
 	mmc_register(mmc);
 
 	return 0;
-- 
1.7.0.4

[U-Boot] [PATCH v6 3/5] tegra2: Move board_mmc_init into board files

[Stephen Warren]

For Seaboard, this is mostly a cut/paste of board_mmc_init() and
pin_mux_mmc() into seaboard.c; pin_mux_mmc() was modified to add some
missing pinmux_tristate_disable calls for the GPIOs.

For Harmony, those functions were modified to configure SDMMC2 (index 2)
instead of SDMMC3 (index 1), since that's what is present on the board.

However, harmony.c is still missing the required GPIO setup, so neither
port is likely to function correctly yet.  This will be fixed in the next
change.

v4: Include board.h to prototype tegra2_mmc_init().

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
---
 board/nvidia/common/board.c      |   52 -----------------------------------
 board/nvidia/harmony/harmony.c   |   56 ++++++++++++++++++++++++++++++++++++++
 board/nvidia/seaboard/seaboard.c |   53 +++++++++++++++++++++++++++++++++++
 3 files changed, 109 insertions(+), 52 deletions(-)

diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
index 370a259..0f12de2 100644
--- a/board/nvidia/common/board.c
+++ b/board/nvidia/common/board.c
@@ -33,10 +33,6 @@
 #include <asm/arch/uart.h>
 #include "board.h"
 
-#ifdef CONFIG_TEGRA2_MMC
-#include <mmc.h>
-#endif
-
 DECLARE_GLOBAL_DATA_PTR;
 
 const struct tegra2_sysinfo sysinfo = {
@@ -100,33 +96,6 @@ static void pin_mux_uart(void)
 #endif	/* CONFIG_TEGRA2_ENABLE_UARTD */
 }
 
-#ifdef CONFIG_TEGRA2_MMC
-/*
- * Routine: pin_mux_mmc
- * Description: setup the pin muxes/tristate values for the SDMMC(s)
- */
-static void pin_mux_mmc(void)
-{
-	/* SDMMC4: config 3, x8 on 2nd set of pins */
-	pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
-	pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
-	pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
-
-	pinmux_tristate_disable(PINGRP_ATB);
-	pinmux_tristate_disable(PINGRP_GMA);
-	pinmux_tristate_disable(PINGRP_GME);
-
-	/* SDMMC3: SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
-	pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3);
-	pinmux_set_func(PINGRP_SDC, PMUX_FUNC_SDIO3);
-	pinmux_set_func(PINGRP_SDD, PMUX_FUNC_SDIO3);
-
-	pinmux_tristate_disable(PINGRP_SDC);
-	pinmux_tristate_disable(PINGRP_SDD);
-	pinmux_tristate_disable(PINGRP_SDB);
-}
-#endif
-
 /*
  * Routine: board_init
  * Description: Early hardware init.
@@ -142,27 +111,6 @@ int board_init(void)
 	return 0;
 }
 
-#ifdef CONFIG_TEGRA2_MMC
-/* this is a weak define that we are overriding */
-int board_mmc_init(bd_t *bd)
-{
-	debug("board_mmc_init called\n");
-	/* Enable muxes, etc. for SDMMC controllers */
-	pin_mux_mmc();
-	gpio_config_mmc();
-
-	debug("board_mmc_init: init eMMC\n");
-	/* init dev 0, eMMC chip, with 4-bit bus */
-	tegra2_mmc_init(0, 4);
-
-	debug("board_mmc_init: init SD slot\n");
-	/* init dev 1, SD slot, with 4-bit bus */
-	tegra2_mmc_init(1, 4);
-
-	return 0;
-}
-#endif
-
 #ifdef CONFIG_BOARD_EARLY_INIT_F
 int board_early_init_f(void)
 {
diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
index cbb30d6..f2c3867 100644
--- a/board/nvidia/harmony/harmony.c
+++ b/board/nvidia/harmony/harmony.c
@@ -24,9 +24,11 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/tegra2.h>
+#include <asm/arch/pinmux.h>
 #ifdef CONFIG_TEGRA2_MMC
 #include <mmc.h>
 #endif
+#include "../common/board.h"
 
 /*
  * Routine: gpio_config_uart
@@ -38,6 +40,39 @@ void gpio_config_uart(void)
 
 #ifdef CONFIG_TEGRA2_MMC
 /*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+static void pin_mux_mmc(void)
+{
+	/* SDMMC4: config 3, x8 on 2nd set of pins */
+	pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
+
+	pinmux_tristate_disable(PINGRP_ATB);
+	pinmux_tristate_disable(PINGRP_GMA);
+	pinmux_tristate_disable(PINGRP_GME);
+
+	/* For power GPIO PI6 */
+	pinmux_tristate_disable(PINGRP_ATA);
+	/* For CD GPIO PH2 */
+	pinmux_tristate_disable(PINGRP_ATD);
+
+	/* SDMMC2: SDIO2_CLK, SDIO2_CMD, SDIO2_DAT[7:0] */
+	pinmux_set_func(PINGRP_DTA, PMUX_FUNC_SDIO2);
+	pinmux_set_func(PINGRP_DTD, PMUX_FUNC_SDIO2);
+
+	pinmux_tristate_disable(PINGRP_DTA);
+	pinmux_tristate_disable(PINGRP_DTD);
+
+	/* For power GPIO PT3 */
+	pinmux_tristate_disable(PINGRP_DTB);
+	/* For CD GPIO PI5 */
+	pinmux_tristate_disable(PINGRP_ATC);
+}
+
+/*
  * Routine: gpio_config_mmc
  * Description: Set GPIOs for SD card
  */
@@ -47,6 +82,27 @@ void gpio_config_mmc(void)
 }
 
 /* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+	debug("board_mmc_init called\n");
+
+	/* Enable muxes, etc. for SDMMC controllers */
+	pin_mux_mmc();
+	gpio_config_mmc();
+
+	debug("board_mmc_init: init SD slot J26\n");
+	/* init dev 0, SD slot J26, with 4-bit bus */
+	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
+	tegra2_mmc_init(0, 4);
+
+	debug("board_mmc_init: init SD slot J5\n");
+	/* init dev 2, SD slot J5, with 4-bit bus */
+	tegra2_mmc_init(2, 4);
+
+	return 0;
+}
+
+/* this is a weak define that we are overriding */
 int board_mmc_getcd(u8 *cd, struct mmc *mmc)
 {
 	debug("board_mmc_getcd called\n");
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index bc67d0f..22a0e69 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -24,10 +24,12 @@
 #include <common.h>
 #include <asm/io.h>
 #include <asm/arch/tegra2.h>
+#include <asm/arch/pinmux.h>
 #include <asm/gpio.h>
 #ifdef CONFIG_TEGRA2_MMC
 #include <mmc.h>
 #endif
+#include "../common/board.h"
 
 /*
  * Routine: gpio_config_uart
@@ -56,6 +58,36 @@ void gpio_config_uart(void)
 
 #ifdef CONFIG_TEGRA2_MMC
 /*
+ * Routine: pin_mux_mmc
+ * Description: setup the pin muxes/tristate values for the SDMMC(s)
+ */
+static void pin_mux_mmc(void)
+{
+	/* SDMMC4: config 3, x8 on 2nd set of pins */
+	pinmux_set_func(PINGRP_ATB, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GMA, PMUX_FUNC_SDIO4);
+	pinmux_set_func(PINGRP_GME, PMUX_FUNC_SDIO4);
+
+	pinmux_tristate_disable(PINGRP_ATB);
+	pinmux_tristate_disable(PINGRP_GMA);
+	pinmux_tristate_disable(PINGRP_GME);
+
+	/* SDMMC3: SDIO3_CLK, SDIO3_CMD, SDIO3_DAT[3:0] */
+	pinmux_set_func(PINGRP_SDB, PMUX_FUNC_SDIO3);
+	pinmux_set_func(PINGRP_SDC, PMUX_FUNC_SDIO3);
+	pinmux_set_func(PINGRP_SDD, PMUX_FUNC_SDIO3);
+
+	pinmux_tristate_disable(PINGRP_SDC);
+	pinmux_tristate_disable(PINGRP_SDD);
+	pinmux_tristate_disable(PINGRP_SDB);
+
+	/* For power GPIO PI6 */
+	pinmux_tristate_disable(PINGRP_ATA);
+	/* For CD GPIO PI5 */
+	pinmux_tristate_disable(PINGRP_ATC);
+}
+
+/*
  * Routine: gpio_config_mmc
  * Description: Set GPIOs for SDMMC3 SDIO slot.
  */
@@ -69,6 +101,27 @@ void gpio_config_mmc(void)
 }
 
 /* this is a weak define that we are overriding */
+int board_mmc_init(bd_t *bd)
+{
+	debug("board_mmc_init called\n");
+
+	/* Enable muxes, etc. for SDMMC controllers */
+	pin_mux_mmc();
+	gpio_config_mmc();
+
+	debug("board_mmc_init: init eMMC\n");
+	/* init dev 0, eMMC chip, with 4-bit bus */
+	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
+	tegra2_mmc_init(0, 4);
+
+	debug("board_mmc_init: init SD slot\n");
+	/* init dev 1, SD slot, with 4-bit bus */
+	tegra2_mmc_init(1, 4);
+
+	return 0;
+}
+
+/* this is a weak define that we are overriding */
 int board_mmc_getcd(u8 *cd, struct mmc *mmc)
 {
 	debug("board_mmc_getcd called\n");
-- 
1.7.0.4

[U-Boot] [PATCH v6 4/5] tegra2: Modify MMC driver to handle power and cd GPIOs

[Stephen Warren]

Pass the GPIO numbers for power and card detect to tegra2_mmc_init(), and
modify that function to perform all required GPIO initialization. This
removes the need for board files to perform these operations.

Move board_mmc_getcd() into tegra2_mmc.c now that the driver knows which
GPIOs to use.

Update affected call-sites in seaboard.c and harmony.c. Note that this
change should make all SD ports work on Harmony, since the required GPIO
setup is now being performed.

v4: Fix prototype of tegra2_mmc_init() in board.h to match driver change.
    Remove prototype of gpio_config_mmc() from board.h

Signed-off-by: Stephen Warren <swarren@nvidia.com>
Tested-by: Simon Glass <sjg@chromium.org>
Acked-by: Simon Glass <sjg@chromium.org>
---
 board/nvidia/common/board.h      |    3 +-
 board/nvidia/harmony/harmony.c   |   27 ++---------------------
 board/nvidia/seaboard/seaboard.c |   33 +----------------------------
 drivers/mmc/tegra2_mmc.c         |   42 ++++++++++++++++++++++++++++++++-----
 drivers/mmc/tegra2_mmc.h         |    4 ++-
 5 files changed, 45 insertions(+), 64 deletions(-)

diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h
index 344e702..35acbca 100644
--- a/board/nvidia/common/board.h
+++ b/board/nvidia/common/board.h
@@ -26,7 +26,6 @@
 
 void tegra2_start(void);
 void gpio_config_uart(void);
-void gpio_config_mmc(void);
-int tegra2_mmc_init(int dev_index, int bus_width);
+int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
 
 #endif	/* BOARD_H */
diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
index f2c3867..3cbe820 100644
--- a/board/nvidia/harmony/harmony.c
+++ b/board/nvidia/harmony/harmony.c
@@ -25,6 +25,7 @@
 #include <asm/io.h>
 #include <asm/arch/tegra2.h>
 #include <asm/arch/pinmux.h>
+#include <asm/gpio.h>
 #ifdef CONFIG_TEGRA2_MMC
 #include <mmc.h>
 #endif
@@ -72,15 +73,6 @@ static void pin_mux_mmc(void)
 	pinmux_tristate_disable(PINGRP_ATC);
 }
 
-/*
- * Routine: gpio_config_mmc
- * Description: Set GPIOs for SD card
- */
-void gpio_config_mmc(void)
-{
-	/* Not implemented for now */
-}
-
 /* this is a weak define that we are overriding */
 int board_mmc_init(bd_t *bd)
 {
@@ -88,29 +80,16 @@ int board_mmc_init(bd_t *bd)
 
 	/* Enable muxes, etc. for SDMMC controllers */
 	pin_mux_mmc();
-	gpio_config_mmc();
 
 	debug("board_mmc_init: init SD slot J26\n");
 	/* init dev 0, SD slot J26, with 4-bit bus */
 	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
-	tegra2_mmc_init(0, 4);
+	tegra2_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
 
 	debug("board_mmc_init: init SD slot J5\n");
 	/* init dev 2, SD slot J5, with 4-bit bus */
-	tegra2_mmc_init(2, 4);
+	tegra2_mmc_init(2, 4, GPIO_PT3, GPIO_PI5);
 
 	return 0;
 }
-
-/* this is a weak define that we are overriding */
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
-{
-	debug("board_mmc_getcd called\n");
-	/*
-	 * Hard-code CD presence for now. Need to add GPIO inputs
-	 * for Harmony
-	 */
-	*cd = 1;
-	return 0;
-}
 #endif
diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 22a0e69..356d616 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -87,19 +87,6 @@ static void pin_mux_mmc(void)
 	pinmux_tristate_disable(PINGRP_ATC);
 }
 
-/*
- * Routine: gpio_config_mmc
- * Description: Set GPIOs for SDMMC3 SDIO slot.
- */
-void gpio_config_mmc(void)
-{
-	/* Set EN_VDDIO_SD (GPIO I6) */
-	gpio_direction_output(GPIO_PI6, 1);
-
-	/* Config pin as GPI for Card Detect (GPIO I5) */
-	gpio_direction_input(GPIO_PI5);
-}
-
 /* this is a weak define that we are overriding */
 int board_mmc_init(bd_t *bd)
 {
@@ -107,31 +94,15 @@ int board_mmc_init(bd_t *bd)
 
 	/* Enable muxes, etc. for SDMMC controllers */
 	pin_mux_mmc();
-	gpio_config_mmc();
 
 	debug("board_mmc_init: init eMMC\n");
 	/* init dev 0, eMMC chip, with 4-bit bus */
 	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
-	tegra2_mmc_init(0, 4);
+	tegra2_mmc_init(0, 4, -1, -1);
 
 	debug("board_mmc_init: init SD slot\n");
 	/* init dev 1, SD slot, with 4-bit bus */
-	tegra2_mmc_init(1, 4);
-
-	return 0;
-}
-
-/* this is a weak define that we are overriding */
-int board_mmc_getcd(u8 *cd, struct mmc *mmc)
-{
-	debug("board_mmc_getcd called\n");
-	*cd = 1;			/* Assume card is inserted, or eMMC */
-
-	if (IS_SD(mmc)) {
-		/* Seaboard SDMMC3 = SDIO3_CD = GPIO_PI5 */
-		if (gpio_get_value(GPIO_PI5))
-			*cd = 0;
-	}
+	tegra2_mmc_init(1, 4, GPIO_PI6, GPIO_PI5);
 
 	return 0;
 }
diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
index 78b1190..3de9c5d 100644
--- a/drivers/mmc/tegra2_mmc.c
+++ b/drivers/mmc/tegra2_mmc.c
@@ -21,6 +21,7 @@
 
 #include <common.h>
 #include <mmc.h>
+#include <asm/gpio.h>
 #include <asm/io.h>
 #include <asm/arch/clk_rst.h>
 #include <asm/arch/clock.h>
@@ -433,20 +434,37 @@ static int mmc_core_init(struct mmc *mmc)
 	return 0;
 }
 
-static int tegra2_mmc_initialize(int dev_index, int bus_width)
+int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio)
 {
 	struct mmc_host *host;
+	char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
 	struct mmc *mmc;
 
-	debug(" mmc_initialize called\n");
+	debug(" tegra2_mmc_init: index %d, bus width %d "
+		"pwr_gpio %d cd_gpio %d\n",
+		dev_index, bus_width, pwr_gpio, cd_gpio);
 
 	host = &mmc_host[dev_index];
 
 	host->clock = 0;
+	host->pwr_gpio = pwr_gpio;
+	host->cd_gpio = cd_gpio;
 	tegra2_get_setup(host, dev_index);
 
 	clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
 
+	if (host->pwr_gpio >= 0) {
+		sprintf(gpusage, "SD/MMC%d PWR", dev_index);
+		gpio_request(host->pwr_gpio, gpusage);
+		gpio_direction_output(host->pwr_gpio, 1);
+	}
+
+	if (host->cd_gpio >= 0) {
+		sprintf(gpusage, "SD/MMC%d CD", dev_index);
+		gpio_request(host->cd_gpio, gpusage);
+		gpio_direction_input(host->cd_gpio);
+	}
+
 	mmc = &mmc_dev[dev_index];
 
 	sprintf(mmc->name, "Tegra2 SD/MMC");
@@ -478,9 +496,21 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
 	return 0;
 }
 
-int tegra2_mmc_init(int dev_index, int bus_width)
+/* this is a weak define that we are overriding */
+int board_mmc_getcd(u8 *cd, struct mmc *mmc)
 {
-	debug(" tegra2_mmc_init: index %d, bus width %d\n",
-		dev_index, bus_width);
-	return tegra2_mmc_initialize(dev_index, bus_width);
+	struct mmc_host *host = (struct mmc_host *)mmc->priv;
+
+	debug("board_mmc_getcd called\n");
+
+	*cd = 1; /* Assume card is inserted, or eMMC */
+
+	if (IS_SD(mmc)) {
+		if (host->cd_gpio >= 0) {
+			if (gpio_get_value(host->cd_gpio))
+				*cd = 0;
+		}
+	}
+
+	return 0;
 }
diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra2_mmc.h
index 28698e0..72f587b 100644
--- a/drivers/mmc/tegra2_mmc.h
+++ b/drivers/mmc/tegra2_mmc.h
@@ -74,9 +74,11 @@ struct mmc_host {
 	unsigned int clock;	/* Current clock (MHz) */
 	unsigned int base;	/* Base address, SDMMC1/2/3/4 */
 	enum periph_id mmc_id;	/* Peripheral ID: PERIPH_ID_... */
+	int pwr_gpio;		/* Power GPIO */
+	int cd_gpio;		/* Change Detect GPIO */
 };
 
-int tegra2_mmc_init(int dev_index, int bus_width);
+int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
 
 #endif	/* __ASSEMBLY__ */
 #endif	/* __TEGRA2_MMC_H_ */
-- 
1.7.0.4

[U-Boot] [PATCH v6 5/5] tegra2: Add support for Ventana

[Stephen Warren]

Ventana is a board which is very similar to Seaboard. Support it by
re-using board/nvidia/seaboard/seaboard.c with minor run-time conditionals.

v5: Makefile: Use cmd_link_o_target, remove unused clean/distclean targets.
v6: Make gpio_config_uart_seaboard() static.

Signed-off-by: Stephen Warren <swarren@nvidia.com>
---
 board/nvidia/seaboard/seaboard.c |   11 ++++++-
 board/nvidia/ventana/Makefile    |   49 +++++++++++++++++++++++++++++++++
 boards.cfg                       |    1 +
 include/configs/ventana.h        |   55 ++++++++++++++++++++++++++++++++++++++
 4 files changed, 114 insertions(+), 2 deletions(-)
 create mode 100644 board/nvidia/ventana/Makefile
 create mode 100644 include/configs/ventana.h

diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
index 356d616..aa77f12 100644
--- a/board/nvidia/seaboard/seaboard.c
+++ b/board/nvidia/seaboard/seaboard.c
@@ -32,10 +32,10 @@
 #include "../common/board.h"
 
 /*
- * Routine: gpio_config_uart
+ * Routine: gpio_config_uart_seaboard
  * Description: Force GPIO_PI3 low on Seaboard so UART4 works.
  */
-void gpio_config_uart(void)
+static void gpio_config_uart_seaboard(void)
 {
 	int gp = GPIO_PI3;
 	struct gpio_ctlr *gpio = (struct gpio_ctlr *)NV_PA_GPIO_BASE;
@@ -56,6 +56,13 @@ void gpio_config_uart(void)
 	writel(val, &bank->gpio_dir_out[GPIO_PORT(gp)]);
 }
 
+void gpio_config_uart(void)
+{
+	if (machine_is_ventana())
+		return;
+	gpio_config_uart_seaboard();
+}
+
 #ifdef CONFIG_TEGRA2_MMC
 /*
  * Routine: pin_mux_mmc
diff --git a/board/nvidia/ventana/Makefile b/board/nvidia/ventana/Makefile
new file mode 100644
index 0000000..9e5a87f
--- /dev/null
+++ b/board/nvidia/ventana/Makefile
@@ -0,0 +1,49 @@
+#
+#  (C) Copyright 2010,2011
+#  NVIDIA Corporation <www.nvidia.com>
+#
+#
+#  See file CREDITS for list of people who contributed to this
+#  project.
+#
+#  This program is free software; you can redistribute it and/or
+#  modify it under the terms of the GNU General Public License as
+#  published by the Free Software Foundation; either version 2 of
+#  the License, or (at your option) any later version.
+#
+#  This program is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with this program; if not, write to the Free Software
+#  Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+#  MA 02111-1307 USA
+#
+
+include $(TOPDIR)/config.mk
+
+ifneq ($(OBJTREE),$(SRCTREE))
+$(shell mkdir -p $(obj)../common)
+endif
+
+LIB	= $(obj)lib$(BOARD).o
+
+COBJS	+= ../seaboard/seaboard.o
+COBJS	+= ../common/board.o
+
+SRCS	:= $(COBJS:.o=.c)
+OBJS	:= $(addprefix $(obj),$(COBJS))
+
+$(LIB):	$(obj).depend $(OBJS)
+	$(call cmd_link_o_target, $(OBJS))
+
+#########################################################################
+
+# defines $(obj).depend target
+include $(SRCTREE)/rules.mk
+
+sinclude $(obj).depend
+
+#########################################################################
diff --git a/boards.cfg b/boards.cfg
index 65482ac..9211c0a 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -192,6 +192,7 @@ s5pc210_universal            arm         armv7       universal_c210      samsung
 smdkv310		     arm	 armv7	     smdkv310		 samsung	s5pc2xx
 harmony                      arm         armv7       harmony             nvidia         tegra2
 seaboard                     arm         armv7       seaboard            nvidia         tegra2
+ventana                      arm         armv7       ventana             nvidia         tegra2
 u8500_href                   arm         armv7       u8500               st-ericsson    u8500
 actux1_4_16                  arm         ixp         actux1              -              -           actux1:FLASH2X2
 actux1_8_16                  arm         ixp         actux1              -              -           actux1:FLASH1X8
diff --git a/include/configs/ventana.h b/include/configs/ventana.h
new file mode 100644
index 0000000..afd6ff6
--- /dev/null
+++ b/include/configs/ventana.h
@@ -0,0 +1,55 @@
+/*
+ *  (C) Copyright 2010,2011
+ *  NVIDIA Corporation <www.nvidia.com>
+ *
+ * See file CREDITS for list of people who contributed to this
+ * project.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of
+ * the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
+ * MA 02111-1307 USA
+ */
+
+#ifndef __CONFIG_H
+#define __CONFIG_H
+
+#include <asm/sizes.h>
+#include "tegra2-common.h"
+
+/* High-level configuration options */
+#define TEGRA2_SYSMEM		"mem=384M at 0M nvmem=128M at 384M mem=512M at 512M"
+#define V_PROMPT		"Tegra2 (Ventana) # "
+#define CONFIG_TEGRA2_BOARD_STRING	"NVIDIA Ventana"
+
+/* Board-specific serial config */
+#define CONFIG_SERIAL_MULTI
+#define CONFIG_TEGRA2_ENABLE_UARTD
+#define CONFIG_SYS_NS16550_COM1		NV_PA_APB_UARTD_BASE
+
+#define CONFIG_MACH_TYPE		MACH_TYPE_VENTANA
+#define CONFIG_SYS_BOARD_ODMDATA	0x300d8011 /* lp1, 1GB */
+
+#define CONFIG_BOARD_EARLY_INIT_F
+
+/* SD/MMC */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_TEGRA2_MMC
+#define CONFIG_CMD_MMC
+
+#define CONFIG_DOS_PARTITION
+#define CONFIG_EFI_PARTITION
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
+#endif /* __CONFIG_H */
-- 
1.7.0.4

[U-Boot] [PATCH v6 5/5] tegra2: Add support for Ventana

[Simon Glass]

On Wed, Oct 12, 2011 at 3:53 PM, Stephen Warren <swarren@nvidia.com> wrote:
> Ventana is a board which is very similar to Seaboard. Support it by
> re-using board/nvidia/seaboard/seaboard.c with minor run-time conditionals.
>
> v5: Makefile: Use cmd_link_o_target, remove unused clean/distclean targets.
> v6: Make gpio_config_uart_seaboard() static.
>
> Signed-off-by: Stephen Warren <swarren@nvidia.com>

Acked-by: Simon Glass <sjg@chromium.org>

> ---
> ?board/nvidia/seaboard/seaboard.c | ? 11 ++++++-
> ?board/nvidia/ventana/Makefile ? ?| ? 49 +++++++++++++++++++++++++++++++++
> ?boards.cfg ? ? ? ? ? ? ? ? ? ? ? | ? ?1 +
> ?include/configs/ventana.h ? ? ? ?| ? 55 ++++++++++++++++++++++++++++++++++++++
> ?4 files changed, 114 insertions(+), 2 deletions(-)
> ?create mode 100644 board/nvidia/ventana/Makefile
> ?create mode 100644 include/configs/ventana.h
>

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Stephen Warren]

Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
> [Patch series relating to SD/MMC support on Tegra boards.]

Does this patch series look good?

Since these are my first U-Boot patches, I'm not sure exactly who would
pick these up and apply them (I assume the "ARM custodians", who are CC'd)
nor what I should expect in terms of when they'd be applied.

Thanks.

-- 
nvpublic

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Simon Glass]

Hi Tom,

On Tue, Oct 18, 2011 at 11:14 AM, Stephen Warren <swarren@nvidia.com> wrote:
> Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
>> [Patch series relating to SD/MMC support on Tegra boards.]
>
> Does this patch series look good?
>
> Since these are my first U-Boot patches, I'm not sure exactly who would
> pick these up and apply them (I assume the "ARM custodians", who are CC'd)
> nor what I should expect in terms of when they'd be applied.

This patch set looks good to me, and is the next series that needs to
be applied to move Tegra along. I have based my latest series 'tegra2:
Tidy up boot path'  on your series.

Albert are you happy to apply Stephen's patch series?

Regards,
Simon

>
> Thanks.
>
> --
> nvpublic
>
>

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Tom Warren]

s/Hi Tom/Hi Stephen/

> -----Original Message-----
> From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
> Sent: Tuesday, October 18, 2011 11:31 AM
> To: Stephen Warren
> Cc: albert.u.boot at aribaud.net; afleming at gmail.com; Tom Warren; U-Boot
> Mailing List; Mike Frysinger
> Subject: Re: [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles
> 
> Hi Tom,
> 
> On Tue, Oct 18, 2011 at 11:14 AM, Stephen Warren <swarren@nvidia.com> wrote:
> > Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
> >> [Patch series relating to SD/MMC support on Tegra boards.]
> >
> > Does this patch series look good?
> >
> > Since these are my first U-Boot patches, I'm not sure exactly who would
> > pick these up and apply them (I assume the "ARM custodians", who are CC'd)
> > nor what I should expect in terms of when they'd be applied.
> 
> This patch set looks good to me, and is the next series that needs to
> be applied to move Tegra along. I have based my latest series 'tegra2:
> Tidy up boot path'  on your series.
> 
> Albert are you happy to apply Stephen's patch series?
> 
> Regards,
> Simon
> 
> >
> > Thanks.
> >
> > --
> > nvpublic
> >
> >

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Simon Glass]

On Tue, Oct 18, 2011 at 1:07 PM, Tom Warren <TWarren@nvidia.com> wrote:
> s/Hi Tom/Hi Stephen/

Sorry! And my question was really directed to Albert.

Regards,
Simon

>
>> -----Original Message-----
>> From: sjg at google.com [mailto:sjg at google.com] On Behalf Of Simon Glass
>> Sent: Tuesday, October 18, 2011 11:31 AM
>> To: Stephen Warren
>> Cc: albert.u.boot at aribaud.net; afleming at gmail.com; Tom Warren; U-Boot
>> Mailing List; Mike Frysinger
>> Subject: Re: [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles
>>
>> Hi Tom,
>>
>> On Tue, Oct 18, 2011 at 11:14 AM, Stephen Warren <swarren@nvidia.com> wrote:
>> > Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
>> >> [Patch series relating to SD/MMC support on Tegra boards.]
>> >
>> > Does this patch series look good?
>> >
>> > Since these are my first U-Boot patches, I'm not sure exactly who would
>> > pick these up and apply them (I assume the "ARM custodians", who are CC'd)
>> > nor what I should expect in terms of when they'd be applied.
>>
>> This patch set looks good to me, and is the next series that needs to
>> be applied to move Tegra along. I have based my latest series 'tegra2:
>> Tidy up boot path' ?on your series.
>>
>> Albert are you happy to apply Stephen's patch series?
>>
>> Regards,
>> Simon
>>
>> >
>> > Thanks.
>> >
>> > --
>> > nvpublic
>> >
>> >
>

[U-Boot] [PATCH v6 5/5] tegra2: Add support for Ventana

[Albert ARIBAUD]

Hi Stephen,

Le 13/10/2011 01:05, Simon Glass a ?crit :
> On Wed, Oct 12, 2011 at 3:53 PM, Stephen Warren<swarren@nvidia.com>  wrote:
>> Ventana is a board which is very similar to Seaboard. Support it by
>> re-using board/nvidia/seaboard/seaboard.c with minor run-time conditionals.
>>
>> v5: Makefile: Use cmd_link_o_target, remove unused clean/distclean targets.
>> v6: Make gpio_config_uart_seaboard() static.
>>
>> Signed-off-by: Stephen Warren<swarren@nvidia.com>
>
> Acked-by: Simon Glass<sjg@chromium.org>
>
>> ---
>>   board/nvidia/seaboard/seaboard.c |   11 ++++++-
>>   board/nvidia/ventana/Makefile    |   49 +++++++++++++++++++++++++++++++++
>>   boards.cfg                       |    1 +
>>   include/configs/ventana.h        |   55 ++++++++++++++++++++++++++++++++++++++
>>   4 files changed, 114 insertions(+), 2 deletions(-)
>>   create mode 100644 board/nvidia/ventana/Makefile
>>   create mode 100644 include/configs/ventana.h

Please add an entry for this board in MAINTAINERS.

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Albert ARIBAUD]

Hi Simon,

Le 18/10/2011 22:51, Simon Glass a ?crit :
> On Tue, Oct 18, 2011 at 1:07 PM, Tom Warren<TWarren@nvidia.com>  wrote:
>> s/Hi Tom/Hi Stephen/
>
> Sorry! And my question was really directed to Albert.

Going up my backlog... for 2/4 and 4/5, as their are touching MMC driver 
code, I'd like Andy to ack them as the the MMC custodian, then I can 
apply the whole set (pending the MAINTAINER addition).

> Regards,
> Simon

Amicalement,
-- 
Albert.

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Mike Frysinger]

On Fri, Oct 28, 2011 at 07:35, Albert ARIBAUD wrote:
> Going up my backlog... for 2/4 and 4/5, as their are touching MMC driver
> code, I'd like Andy to ack them as the the MMC custodian, then I can apply
> the whole set (pending the MAINTAINER addition).

i don't think this particular patch needs that much acknowledgement.
but at any rate, this patch is obsolete now as a newer one has already
been merged by Wolfgang.
-mike

[U-Boot] [PATCH v6 2/5] tegra2: Move MMC clock initialization into MMC driver

[Stephen Warren]

Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
> This centralizes knowledge of MMC clocking into the MMC driver. This also
> removes clock setup from the board files, which will simplify later changes
> that modify the Harmony board to support the correct set of MMC controllers.

Andy,

This patch touches an MMC driver. If you consider it OK, could you please
Ack it so that Albert can apply the series to the ARM branch.

Thanks very much.

> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Acked-by: Simon Glass <sjg@chromium.org>
> Tested-by: Simon Glass <sjg@chromium.org>
> ---
>  board/nvidia/common/board.c |   13 +------------
>  drivers/mmc/tegra2_mmc.c    |   12 +++++++++---
>  2 files changed, 10 insertions(+), 15 deletions(-)
> 
> diff --git a/board/nvidia/common/board.c b/board/nvidia/common/board.c
> index d13537d..370a259 100644
> --- a/board/nvidia/common/board.c
> +++ b/board/nvidia/common/board.c
> @@ -102,16 +102,6 @@ static void pin_mux_uart(void)
> 
>  #ifdef CONFIG_TEGRA2_MMC
>  /*
> - * Routine: clock_init_mmc
> - * Description: init the PLL and clocks for the SDMMC controllers
> - */
> -static void clock_init_mmc(void)
> -{
> -	clock_start_periph_pll(PERIPH_ID_SDMMC4, CLOCK_ID_PERIPH, 20000000);
> -	clock_start_periph_pll(PERIPH_ID_SDMMC3, CLOCK_ID_PERIPH, 20000000);
> -}
> -
> -/*
>   * Routine: pin_mux_mmc
>   * Description: setup the pin muxes/tristate values for the SDMMC(s)
>   */
> @@ -157,8 +147,7 @@ int board_init(void)
>  int board_mmc_init(bd_t *bd)
>  {
>  	debug("board_mmc_init called\n");
> -	/* Enable clocks, muxes, etc. for SDMMC controllers */
> -	clock_init_mmc();
> +	/* Enable muxes, etc. for SDMMC controllers */
>  	pin_mux_mmc();
>  	gpio_config_mmc();
> 
> diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
> index 9e741f2..78b1190 100644
> --- a/drivers/mmc/tegra2_mmc.c
> +++ b/drivers/mmc/tegra2_mmc.c
> @@ -435,14 +435,22 @@ static int mmc_core_init(struct mmc *mmc)
> 
>  static int tegra2_mmc_initialize(int dev_index, int bus_width)
>  {
> +	struct mmc_host *host;
>  	struct mmc *mmc;
> 
>  	debug(" mmc_initialize called\n");
> 
> +	host = &mmc_host[dev_index];
> +
> +	host->clock = 0;
> +	tegra2_get_setup(host, dev_index);
> +
> +	clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
> +
>  	mmc = &mmc_dev[dev_index];
> 
>  	sprintf(mmc->name, "Tegra2 SD/MMC");
> -	mmc->priv = &mmc_host[dev_index];
> +	mmc->priv = host;
>  	mmc->send_cmd = mmc_send_cmd;
>  	mmc->set_ios = mmc_set_ios;
>  	mmc->init = mmc_core_init;
> @@ -465,8 +473,6 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
>  	mmc->f_min = 375000;
>  	mmc->f_max = 48000000;
> 
> -	mmc_host[dev_index].clock = 0;
> -	tegra2_get_setup(&mmc_host[dev_index], dev_index);
>  	mmc_register(mmc);
> 
>  	return 0;
> --
> 1.7.0.4

-- 
nvpublic

[U-Boot] [PATCH v6 4/5] tegra2: Modify MMC driver to handle power and cd GPIOs

[Stephen Warren]

Stephen Warren wrote at Wednesday, October 12, 2011 4:53 PM:
> Pass the GPIO numbers for power and card detect to tegra2_mmc_init(), and
> modify that function to perform all required GPIO initialization. This
> removes the need for board files to perform these operations.
>
> Move board_mmc_getcd() into tegra2_mmc.c now that the driver knows which
> GPIOs to use.

Andy,

This patch touches an MMC driver. If you consider it OK, could you please
Ack it so that Albert can apply the series to the ARM branch.

Thanks very much.

> Update affected call-sites in seaboard.c and harmony.c. Note that this
> change should make all SD ports work on Harmony, since the required GPIO
> setup is now being performed.
> 
> v4: Fix prototype of tegra2_mmc_init() in board.h to match driver change.
>     Remove prototype of gpio_config_mmc() from board.h
> Signed-off-by: Stephen Warren <swarren@nvidia.com>
> Tested-by: Simon Glass <sjg@chromium.org>
> Acked-by: Simon Glass <sjg@chromium.org>
> ---
>  board/nvidia/common/board.h      |    3 +-
>  board/nvidia/harmony/harmony.c   |   27 ++---------------------
>  board/nvidia/seaboard/seaboard.c |   33 +----------------------------
>  drivers/mmc/tegra2_mmc.c         |   42 ++++++++++++++++++++++++++++++++-----
>  drivers/mmc/tegra2_mmc.h         |    4 ++-
>  5 files changed, 45 insertions(+), 64 deletions(-)
> 
> diff --git a/board/nvidia/common/board.h b/board/nvidia/common/board.h
> index 344e702..35acbca 100644
> --- a/board/nvidia/common/board.h
> +++ b/board/nvidia/common/board.h
> @@ -26,7 +26,6 @@
> 
>  void tegra2_start(void);
>  void gpio_config_uart(void);
> -void gpio_config_mmc(void);
> -int tegra2_mmc_init(int dev_index, int bus_width);
> +int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
> 
>  #endif	/* BOARD_H */
> diff --git a/board/nvidia/harmony/harmony.c b/board/nvidia/harmony/harmony.c
> index f2c3867..3cbe820 100644
> --- a/board/nvidia/harmony/harmony.c
> +++ b/board/nvidia/harmony/harmony.c
> @@ -25,6 +25,7 @@
>  #include <asm/io.h>
>  #include <asm/arch/tegra2.h>
>  #include <asm/arch/pinmux.h>
> +#include <asm/gpio.h>
>  #ifdef CONFIG_TEGRA2_MMC
>  #include <mmc.h>
>  #endif
> @@ -72,15 +73,6 @@ static void pin_mux_mmc(void)
>  	pinmux_tristate_disable(PINGRP_ATC);
>  }
> 
> -/*
> - * Routine: gpio_config_mmc
> - * Description: Set GPIOs for SD card
> - */
> -void gpio_config_mmc(void)
> -{
> -	/* Not implemented for now */
> -}
> -
>  /* this is a weak define that we are overriding */
>  int board_mmc_init(bd_t *bd)
>  {
> @@ -88,29 +80,16 @@ int board_mmc_init(bd_t *bd)
> 
>  	/* Enable muxes, etc. for SDMMC controllers */
>  	pin_mux_mmc();
> -	gpio_config_mmc();
> 
>  	debug("board_mmc_init: init SD slot J26\n");
>  	/* init dev 0, SD slot J26, with 4-bit bus */
>  	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
> -	tegra2_mmc_init(0, 4);
> +	tegra2_mmc_init(0, 4, GPIO_PI6, GPIO_PH2);
> 
>  	debug("board_mmc_init: init SD slot J5\n");
>  	/* init dev 2, SD slot J5, with 4-bit bus */
> -	tegra2_mmc_init(2, 4);
> +	tegra2_mmc_init(2, 4, GPIO_PT3, GPIO_PI5);
> 
>  	return 0;
>  }
> -
> -/* this is a weak define that we are overriding */
> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> -{
> -	debug("board_mmc_getcd called\n");
> -	/*
> -	 * Hard-code CD presence for now. Need to add GPIO inputs
> -	 * for Harmony
> -	 */
> -	*cd = 1;
> -	return 0;
> -}
>  #endif
> diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c
> index 22a0e69..356d616 100644
> --- a/board/nvidia/seaboard/seaboard.c
> +++ b/board/nvidia/seaboard/seaboard.c
> @@ -87,19 +87,6 @@ static void pin_mux_mmc(void)
>  	pinmux_tristate_disable(PINGRP_ATC);
>  }
> 
> -/*
> - * Routine: gpio_config_mmc
> - * Description: Set GPIOs for SDMMC3 SDIO slot.
> - */
> -void gpio_config_mmc(void)
> -{
> -	/* Set EN_VDDIO_SD (GPIO I6) */
> -	gpio_direction_output(GPIO_PI6, 1);
> -
> -	/* Config pin as GPI for Card Detect (GPIO I5) */
> -	gpio_direction_input(GPIO_PI5);
> -}
> -
>  /* this is a weak define that we are overriding */
>  int board_mmc_init(bd_t *bd)
>  {
> @@ -107,31 +94,15 @@ int board_mmc_init(bd_t *bd)
> 
>  	/* Enable muxes, etc. for SDMMC controllers */
>  	pin_mux_mmc();
> -	gpio_config_mmc();
> 
>  	debug("board_mmc_init: init eMMC\n");
>  	/* init dev 0, eMMC chip, with 4-bit bus */
>  	/* The board has an 8-bit bus, but 8-bit doesn't work yet */
> -	tegra2_mmc_init(0, 4);
> +	tegra2_mmc_init(0, 4, -1, -1);
> 
>  	debug("board_mmc_init: init SD slot\n");
>  	/* init dev 1, SD slot, with 4-bit bus */
> -	tegra2_mmc_init(1, 4);
> -
> -	return 0;
> -}
> -
> -/* this is a weak define that we are overriding */
> -int board_mmc_getcd(u8 *cd, struct mmc *mmc)
> -{
> -	debug("board_mmc_getcd called\n");
> -	*cd = 1;			/* Assume card is inserted, or eMMC */
> -
> -	if (IS_SD(mmc)) {
> -		/* Seaboard SDMMC3 = SDIO3_CD = GPIO_PI5 */
> -		if (gpio_get_value(GPIO_PI5))
> -			*cd = 0;
> -	}
> +	tegra2_mmc_init(1, 4, GPIO_PI6, GPIO_PI5);
> 
>  	return 0;
>  }
> diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
> index 78b1190..3de9c5d 100644
> --- a/drivers/mmc/tegra2_mmc.c
> +++ b/drivers/mmc/tegra2_mmc.c
> @@ -21,6 +21,7 @@
> 
>  #include <common.h>
>  #include <mmc.h>
> +#include <asm/gpio.h>
>  #include <asm/io.h>
>  #include <asm/arch/clk_rst.h>
>  #include <asm/arch/clock.h>
> @@ -433,20 +434,37 @@ static int mmc_core_init(struct mmc *mmc)
>  	return 0;
>  }
> 
> -static int tegra2_mmc_initialize(int dev_index, int bus_width)
> +int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio)
>  {
>  	struct mmc_host *host;
> +	char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
>  	struct mmc *mmc;
> 
> -	debug(" mmc_initialize called\n");
> +	debug(" tegra2_mmc_init: index %d, bus width %d "
> +		"pwr_gpio %d cd_gpio %d\n",
> +		dev_index, bus_width, pwr_gpio, cd_gpio);
> 
>  	host = &mmc_host[dev_index];
> 
>  	host->clock = 0;
> +	host->pwr_gpio = pwr_gpio;
> +	host->cd_gpio = cd_gpio;
>  	tegra2_get_setup(host, dev_index);
> 
>  	clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
> 
> +	if (host->pwr_gpio >= 0) {
> +		sprintf(gpusage, "SD/MMC%d PWR", dev_index);
> +		gpio_request(host->pwr_gpio, gpusage);
> +		gpio_direction_output(host->pwr_gpio, 1);
> +	}
> +
> +	if (host->cd_gpio >= 0) {
> +		sprintf(gpusage, "SD/MMC%d CD", dev_index);
> +		gpio_request(host->cd_gpio, gpusage);
> +		gpio_direction_input(host->cd_gpio);
> +	}
> +
>  	mmc = &mmc_dev[dev_index];
> 
>  	sprintf(mmc->name, "Tegra2 SD/MMC");
> @@ -478,9 +496,21 @@ static int tegra2_mmc_initialize(int dev_index, int bus_width)
>  	return 0;
>  }
> 
> -int tegra2_mmc_init(int dev_index, int bus_width)
> +/* this is a weak define that we are overriding */
> +int board_mmc_getcd(u8 *cd, struct mmc *mmc)
>  {
> -	debug(" tegra2_mmc_init: index %d, bus width %d\n",
> -		dev_index, bus_width);
> -	return tegra2_mmc_initialize(dev_index, bus_width);
> +	struct mmc_host *host = (struct mmc_host *)mmc->priv;
> +
> +	debug("board_mmc_getcd called\n");
> +
> +	*cd = 1; /* Assume card is inserted, or eMMC */
> +
> +	if (IS_SD(mmc)) {
> +		if (host->cd_gpio >= 0) {
> +			if (gpio_get_value(host->cd_gpio))
> +				*cd = 0;
> +		}
> +	}
> +
> +	return 0;
>  }
> diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra2_mmc.h
> index 28698e0..72f587b 100644
> --- a/drivers/mmc/tegra2_mmc.h
> +++ b/drivers/mmc/tegra2_mmc.h
> @@ -74,9 +74,11 @@ struct mmc_host {
>  	unsigned int clock;	/* Current clock (MHz) */
>  	unsigned int base;	/* Base address, SDMMC1/2/3/4 */
>  	enum periph_id mmc_id;	/* Peripheral ID: PERIPH_ID_... */
> +	int pwr_gpio;		/* Power GPIO */
> +	int cd_gpio;		/* Change Detect GPIO */
>  };
> 
> -int tegra2_mmc_init(int dev_index, int bus_width);
> +int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio);
> 
>  #endif	/* __ASSEMBLY__ */
>  #endif	/* __TEGRA2_MMC_H_ */
> --
> 1.7.0.4

-- 
nvpublic

[U-Boot] [PATCH v6 1/5] tegra2: Use cmd_link_o_target in board Makefiles

[Simon Glass]

Hi,

On Thu, Oct 27, 2011 at 11:25 PM, Mike Frysinger <vapier@gentoo.org> wrote:
> On Fri, Oct 28, 2011 at 07:35, Albert ARIBAUD wrote:
>> Going up my backlog... for 2/4 and 4/5, as their are touching MMC driver
>> code, I'd like Andy to ack them as the the MMC custodian, then I can apply
>> the whole set (pending the MAINTAINER addition).
>
> i don't think this particular patch needs that much acknowledgement.
> but at any rate, this patch is obsolete now as a newer one has already
> been merged by Wolfgang.
> -mike
>

Yes this single patch can be dropped now, meaning that Stephen's series is now:

tegra2: Move MMC clock initialization into MMC driver
tegra2: Move board_mmc_init into board files
tegra2: Modify MMC driver to handle power and cd GPIOs
tegra2: Add support for Ventana

Regards,
Simon