[U-Boot,v2,1/2] ARM: at91sam9m10g45ek: enable mci0 support

Also we enable the mmc command in configuration file.

As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
so remove the redundant CONFIG_DOS_PARTITION definition.

Signed-off-by: Josh Wu <josh.wu@atmel.com>
---
v1 -> v2:
  1. refined the comment for the pins.
  2. remove detected pin initialization.
  3. move the mci initialization code to devices.c
  4. remove useless header file: mmc.h

 .../cpu/arm926ejs/at91/at91sam9m10g45_devices.c    |   17 +++++++++++++++++
 board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c    |   10 ++++++++++
 include/configs/at91sam9m10g45ek.h                 |   15 ++++++++++++++-
 3 files changed, 41 insertions(+), 1 deletion(-)

Hi Josh,

On 05/21/2014 10:42 AM, Josh Wu wrote:
> Also we enable the mmc command in configuration file.
>
> As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
> so remove the redundant CONFIG_DOS_PARTITION definition.
>
> Signed-off-by: Josh Wu <josh.wu@atmel.com>

Acked-by: Bo Shen <voice.shen@atmel.com>

> ---
> v1 -> v2:
>    1. refined the comment for the pins.
>    2. remove detected pin initialization.
>    3. move the mci initialization code to devices.c
>    4. remove useless header file: mmc.h
>
>   .../cpu/arm926ejs/at91/at91sam9m10g45_devices.c    |   17 +++++++++++++++++
>   board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c    |   10 ++++++++++
>   include/configs/at91sam9m10g45ek.h                 |   15 ++++++++++++++-
>   3 files changed, 41 insertions(+), 1 deletion(-)
>
> diff --git a/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
> index 7d7725c..0e6c0da 100644
> --- a/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
> +++ b/arch/arm/cpu/arm926ejs/at91/at91sam9m10g45_devices.c
> @@ -165,3 +165,20 @@ void at91_macb_hw_init(void)
>   #endif
>   }
>   #endif
> +
> +#ifdef CONFIG_GENERIC_ATMEL_MCI
> +void at91_mci_hw_init(void)
> +{
> +	struct at91_pmc *pmc = (struct at91_pmc *)ATMEL_BASE_PMC;
> +
> +	at91_set_a_periph(AT91_PIO_PORTA, 0, 0);	/* MCI0 CLK */
> +	at91_set_a_periph(AT91_PIO_PORTA, 1, 0);	/* MCI0 CDA */
> +	at91_set_a_periph(AT91_PIO_PORTA, 2, 0);	/* MCI0 DA0 */
> +	at91_set_a_periph(AT91_PIO_PORTA, 3, 0);	/* MCI0 DA1 */
> +	at91_set_a_periph(AT91_PIO_PORTA, 4, 0);	/* MCI0 DA2 */
> +	at91_set_a_periph(AT91_PIO_PORTA, 5, 0);	/* MCI0 DA3 */
> +
> +	/* Enable clock */
> +	writel(1 << ATMEL_ID_MCI0, &pmc->pcer);
> +}
> +#endif
> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> index b7e2efd..5788116 100644
> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
> @@ -16,6 +16,7 @@
>   #include <asm/arch/clk.h>
>   #include <lcd.h>
>   #include <atmel_lcdc.h>
> +#include <atmel_mci.h>
>   #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
>   #include <net.h>
>   #endif
> @@ -217,6 +218,15 @@ void lcd_show_board_info(void)
>   #endif /* CONFIG_LCD_INFO */
>   #endif
>
> +#ifdef CONFIG_GENERIC_ATMEL_MCI
> +int board_mmc_init(bd_t *bis)
> +{
> +	at91_mci_hw_init();
> +
> +	return atmel_mci_init((void *)ATMEL_BASE_MCI0);
> +}
> +#endif
> +
>   int board_early_init_f(void)
>   {
>   	at91_seriald_hw_init();
> diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h
> index ccfda71..df277e7 100644
> --- a/include/configs/at91sam9m10g45ek.h
> +++ b/include/configs/at91sam9m10g45ek.h
> @@ -115,6 +115,20 @@
>
>   #endif
>
> +/* MMC */
> +#define CONFIG_CMD_MMC
> +
> +#ifdef CONFIG_CMD_MMC
> +#define CONFIG_MMC
> +#define CONFIG_GENERIC_MMC
> +#define CONFIG_GENERIC_ATMEL_MCI
> +#endif
> +
> +#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC)
> +#define CONFIG_CMD_FAT
> +#define CONFIG_DOS_PARTITION
> +#endif
> +
>   /* Ethernet */
>   #define CONFIG_MACB
>   #define CONFIG_RMII
> @@ -126,7 +140,6 @@
>   #define CONFIG_USB_EHCI
>   #define CONFIG_USB_EHCI_ATMEL
>   #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS	2
> -#define CONFIG_DOS_PARTITION
>   #define CONFIG_USB_STORAGE
>
>   #define CONFIG_SYS_LOAD_ADDR		0x22000000	/* load address */
>

Best Regards,
Bo Shen

Dear Josh Wu,

Josh Wu <Josh.wu@atmel.com> writes:
>Also we enable the mmc command in configuration file.
>
>As both CONFIG_CMD_MMC and CONFIG_CMD_USB use the CONFIG_DOS_PARTITION,
>so remove the redundant CONFIG_DOS_PARTITION definition.
>
>Signed-off-by: Josh Wu <josh.wu@atmel.com>
>
>---
>v1 -> v2:
>  1. refined the comment for the pins.
>  2. remove detected pin initialization.
>  3. move the mci initialization code to devices.c
>  4. remove useless header file: mmc.h
>
> .../cpu/arm926ejs/at91/at91sam9m10g45_devices.c    |   17 +++++++++++++++++
> board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c    |   10 ++++++++++
> include/configs/at91sam9m10g45ek.h                 |   15 ++++++++++++++-
> 3 files changed, 41 insertions(+), 1 deletion(-)

applied to u-boot-atmel/master, thanks!

Best regards,
Andreas Bießmann