diff mbox

[U-Boot,2/3] mx25pdk: Add esdhc support

Message ID 1349927934-3063-2-git-send-email-festevam@gmail.com
State Changes Requested
Delegated to: Stefano Babic
Headers show

Commit Message

Fabio Estevam Oct. 11, 2012, 3:58 a.m. UTC 
From: Fabio Estevam <fabio.estevam@freescale.com>

mx25pdk has a SD/MMC slot connected to esdhc1.

Add support for it and allow the environment variables to be saved into SD/MMC.

Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
---
 board/freescale/mx25pdk/mx25pdk.c |   51 +++++++++++++++++++++++++++++++++++++
 include/configs/mx25pdk.h         |   16 +++++++++++-
 2 files changed, 66 insertions(+), 1 deletion(-)

Comments

Stefano Babic Oct. 11, 2012, 7:17 a.m. UTC | #1 
Am 11/10/2012 05:58, schrieb Fabio Estevam:
> From: Fabio Estevam <fabio.estevam@freescale.com>
> 
> mx25pdk has a SD/MMC slot connected to esdhc1.
> 
> Add support for it and allow the environment variables to be saved into SD/MMC.
> 
> Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> ---

Hi Fabio,

>  board/freescale/mx25pdk/mx25pdk.c |   51 +++++++++++++++++++++++++++++++++++++
>  include/configs/mx25pdk.h         |   16 +++++++++++-
>  2 files changed, 66 insertions(+), 1 deletion(-)
> 
> diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
> index 4a8352f..e850b3e 100644
> --- a/board/freescale/mx25pdk/mx25pdk.c
> +++ b/board/freescale/mx25pdk/mx25pdk.c
> @@ -19,12 +19,23 @@
>  
>  #include <common.h>
>  #include <asm/io.h>
> +#include <asm/gpio.h>
>  #include <asm/arch/imx-regs.h>
>  #include <asm/arch/imx25-pinmux.h>
>  #include <asm/arch/sys_proto.h>
> +#include <mmc.h>
> +#include <fsl_esdhc.h>
> +
> +#define CARD_DETECT		IMX_GPIO_NR(2, 1)
>  
>  DECLARE_GLOBAL_DATA_PTR;
>  
> +#ifdef CONFIG_FSL_ESDHC
> +struct fsl_esdhc_cfg esdhc_cfg[1] = {
> +	{IMX_MMC_SDHC1_BASE},
> +};
> +#endif
> +
>  int dram_init(void)
>  {
>  	/* dram_init must store complete ramsize in gd->ram_size */
> @@ -48,6 +59,46 @@ int board_init(void)
>  	return 0;
>  }
>  
> +#ifdef CONFIG_FSL_ESDHC
> +int board_mmc_getcd(struct mmc *mmc)
> +{
> +	struct iomuxc_mux_ctl *muxctl;
> +	struct iomuxc_pad_ctl *padctl;
> +	u32 gpio_mux_mode = MX25_PIN_MUX_MODE(5);
> +
> +	/*
> +	 * Set up the Card Detect pin.
> +	 *
> +	 * SD1_GPIO_CD: gpio2_1 is ALT 5 mode of pin A15
> +	 *
> +	 */
> +	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
> +	padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
> +
> +	writel(gpio_mux_mode, &muxctl->pad_a15);
> +	writel(0x0, &padctl->pad_a15);
> +
> +	gpio_direction_input(CARD_DETECT);
> +	return !gpio_get_value(CARD_DETECT);
> +}
> +
> +int board_mmc_init(bd_t *bis)
> +{
> +	struct iomuxc_mux_ctl *muxctl;
> +	u32 sdhc1_mux_mode = MX25_PIN_MUX_MODE(0) | MX25_PIN_MUX_SION;
> +
> +	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_cmd);
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_clk);
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data0);
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data1);
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data2);
> +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data3);
> +

You need also to set up the SDHC clock. This comes after merging:

	http://patchwork.ozlabs.org/patch/188329/

Adding
	esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC1_CLK);

before calling fsl_esdhc_initialize() should be enough.

Best regards,
Stefano
Benoît Thébaudeau Oct. 11, 2012, 11:03 a.m. UTC | #2 
On Thursday, October 11, 2012 9:17:46 AM, Stefano Babic wrote:
> Am 11/10/2012 05:58, schrieb Fabio Estevam:
> > From: Fabio Estevam <fabio.estevam@freescale.com>
> > 
> > mx25pdk has a SD/MMC slot connected to esdhc1.
> > 
> > Add support for it and allow the environment variables to be saved
> > into SD/MMC.
> > 
> > Signed-off-by: Fabio Estevam <fabio.estevam@freescale.com>
> > ---
> 
> Hi Fabio,
> 
> >  board/freescale/mx25pdk/mx25pdk.c |   51
> >  +++++++++++++++++++++++++++++++++++++
> >  include/configs/mx25pdk.h         |   16 +++++++++++-
> >  2 files changed, 66 insertions(+), 1 deletion(-)
> > 
> > diff --git a/board/freescale/mx25pdk/mx25pdk.c
> > b/board/freescale/mx25pdk/mx25pdk.c
> > index 4a8352f..e850b3e 100644
> > --- a/board/freescale/mx25pdk/mx25pdk.c
> > +++ b/board/freescale/mx25pdk/mx25pdk.c
> > @@ -19,12 +19,23 @@
> >  
> >  #include <common.h>
> >  #include <asm/io.h>
> > +#include <asm/gpio.h>
> >  #include <asm/arch/imx-regs.h>
> >  #include <asm/arch/imx25-pinmux.h>
> >  #include <asm/arch/sys_proto.h>
> > +#include <mmc.h>
> > +#include <fsl_esdhc.h>
> > +
> > +#define CARD_DETECT		IMX_GPIO_NR(2, 1)
> >  
> >  DECLARE_GLOBAL_DATA_PTR;
> >  
> > +#ifdef CONFIG_FSL_ESDHC
> > +struct fsl_esdhc_cfg esdhc_cfg[1] = {
> > +	{IMX_MMC_SDHC1_BASE},
> > +};
> > +#endif
> > +
> >  int dram_init(void)
> >  {
> >  	/* dram_init must store complete ramsize in gd->ram_size */
> > @@ -48,6 +59,46 @@ int board_init(void)
> >  	return 0;
> >  }
> >  
> > +#ifdef CONFIG_FSL_ESDHC
> > +int board_mmc_getcd(struct mmc *mmc)
> > +{
> > +	struct iomuxc_mux_ctl *muxctl;
> > +	struct iomuxc_pad_ctl *padctl;
> > +	u32 gpio_mux_mode = MX25_PIN_MUX_MODE(5);
> > +
> > +	/*
> > +	 * Set up the Card Detect pin.
> > +	 *
> > +	 * SD1_GPIO_CD: gpio2_1 is ALT 5 mode of pin A15
> > +	 *
> > +	 */
> > +	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
> > +	padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
> > +
> > +	writel(gpio_mux_mode, &muxctl->pad_a15);
> > +	writel(0x0, &padctl->pad_a15);
> > +
> > +	gpio_direction_input(CARD_DETECT);
> > +	return !gpio_get_value(CARD_DETECT);
> > +}
> > +
> > +int board_mmc_init(bd_t *bis)
> > +{
> > +	struct iomuxc_mux_ctl *muxctl;
> > +	u32 sdhc1_mux_mode = MX25_PIN_MUX_MODE(0) | MX25_PIN_MUX_SION;
> > +
> > +	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_cmd);
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_clk);
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data0);
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data1);
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data2);
> > +	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data3);
> > +
> 
> You need also to set up the SDHC clock. This comes after merging:
> 
> 	http://patchwork.ozlabs.org/patch/188329/
> 
> Adding
> 	esdhc_cfg.sdhc_clk = mxc_get_clock(MXC_ESDHC1_CLK);
> 
> before calling fsl_esdhc_initialize() should be enough.

Adding
#include <asm/arch/clock.h>
is also needed.

Best regards,
Benoît
diff mbox

Patch

diff --git a/board/freescale/mx25pdk/mx25pdk.c b/board/freescale/mx25pdk/mx25pdk.c
index 4a8352f..e850b3e 100644
--- a/board/freescale/mx25pdk/mx25pdk.c
+++ b/board/freescale/mx25pdk/mx25pdk.c
@@ -19,12 +19,23 @@ 
 
 #include <common.h>
 #include <asm/io.h>
+#include <asm/gpio.h>
 #include <asm/arch/imx-regs.h>
 #include <asm/arch/imx25-pinmux.h>
 #include <asm/arch/sys_proto.h>
+#include <mmc.h>
+#include <fsl_esdhc.h>
+
+#define CARD_DETECT		IMX_GPIO_NR(2, 1)
 
 DECLARE_GLOBAL_DATA_PTR;
 
+#ifdef CONFIG_FSL_ESDHC
+struct fsl_esdhc_cfg esdhc_cfg[1] = {
+	{IMX_MMC_SDHC1_BASE},
+};
+#endif
+
 int dram_init(void)
 {
 	/* dram_init must store complete ramsize in gd->ram_size */
@@ -48,6 +59,46 @@  int board_init(void)
 	return 0;
 }
 
+#ifdef CONFIG_FSL_ESDHC
+int board_mmc_getcd(struct mmc *mmc)
+{
+	struct iomuxc_mux_ctl *muxctl;
+	struct iomuxc_pad_ctl *padctl;
+	u32 gpio_mux_mode = MX25_PIN_MUX_MODE(5);
+
+	/*
+	 * Set up the Card Detect pin.
+	 *
+	 * SD1_GPIO_CD: gpio2_1 is ALT 5 mode of pin A15
+	 *
+	 */
+	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
+	padctl = (struct iomuxc_pad_ctl *)IMX_IOPADCTL_BASE;
+
+	writel(gpio_mux_mode, &muxctl->pad_a15);
+	writel(0x0, &padctl->pad_a15);
+
+	gpio_direction_input(CARD_DETECT);
+	return !gpio_get_value(CARD_DETECT);
+}
+
+int board_mmc_init(bd_t *bis)
+{
+	struct iomuxc_mux_ctl *muxctl;
+	u32 sdhc1_mux_mode = MX25_PIN_MUX_MODE(0) | MX25_PIN_MUX_SION;
+
+	muxctl = (struct iomuxc_mux_ctl *)IMX_IOPADMUX_BASE;
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_cmd);
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_clk);
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data0);
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data1);
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data2);
+	writel(sdhc1_mux_mode, &muxctl->pad_sd1_data3);
+
+	return fsl_esdhc_initialize(bis, &esdhc_cfg[0]);
+}
+#endif
+
 int checkboard(void)
 {
 	puts("Board: MX25PDK\n");
diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h
index 2087502..1770521 100644
--- a/include/configs/mx25pdk.h
+++ b/include/configs/mx25pdk.h
@@ -20,6 +20,7 @@ 
 #define CONFIG_MX25
 #define CONFIG_SYS_HZ			1000
 #define CONFIG_SYS_TEXT_BASE		0x81200000
+#define CONFIG_MXC_GPIO
 
 #define CONFIG_DISPLAY_CPUINFO
 #define CONFIG_DISPLAY_BOARDINFO
@@ -58,9 +59,10 @@ 
 /* No NOR flash present */
 #define CONFIG_ENV_OFFSET      (6 * 64 * 1024)
 #define CONFIG_ENV_SIZE        (8 * 1024)
-#define CONFIG_ENV_IS_NOWHERE
 
 #define CONFIG_SYS_NO_FLASH
+#define CONFIG_ENV_IS_IN_MMC
+#define CONFIG_SYS_MMC_ENV_DEV 0
 
 /* U-Boot general configuration */
 #define CONFIG_SYS_PROMPT	"MX25PDK U-Boot > "
@@ -78,6 +80,9 @@ 
 /* U-Boot commands */
 #include <config_cmd_default.h>
 #define CONFIG_CMD_CACHE
+#define CONFIG_CMD_MMC
+#define CONFIG_CMD_EXT2
+#define CONFIG_CMD_FAT
 
 /* Ethernet */
 #define CONFIG_FEC_MXC
@@ -86,6 +91,15 @@ 
 #define CONFIG_CMD_NET
 #define CONFIG_ENV_OVERWRITE
 
+/* ESDHC driver */
+#define CONFIG_MMC
+#define CONFIG_GENERIC_MMC
+#define CONFIG_FSL_ESDHC
+#define CONFIG_SYS_FSL_ESDHC_ADDR	0
+#define CONFIG_SYS_FSL_ESDHC_NUM	1
+
+#define CONFIG_DOS_PARTITION
+
 #define CONFIG_BOOTDELAY	3
 
 #define CONFIG_LOADADDR		0x81000000	/* loadaddr env var */