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

[Josh Wu <josh.wu@atmel.com>]

Hi, Bo

On 5/21/2014 9:27 AM, Bo Shen wrote:
> Hi Josh,
>
> On 05/20/2014 06:38 PM, Josh Wu wrote:
>> Enable mci0 support. And 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>
>> ---
>>   board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c |   28 
>> +++++++++++++++++++++++
>>   include/configs/at91sam9m10g45ek.h              |   15 +++++++++++-
>>   2 files changed, 42 insertions(+), 1 deletion(-)
>>
>> diff --git a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c 
>> b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> index b7e2efd..fd6860b 100644
>> --- a/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> +++ b/board/atmel/at91sam9m10g45ek/at91sam9m10g45ek.c
>> @@ -15,7 +15,9 @@
>>   #include <asm/arch/gpio.h>
>>   #include <asm/arch/clk.h>
>>   #include <lcd.h>
>> +#include <mmc.h>
>>   #include <atmel_lcdc.h>
>> +#include <atmel_mci.h>
>>   #if defined(CONFIG_RESET_PHY_R) && defined(CONFIG_MACB)
>>   #include <net.h>
>>   #endif
>> @@ -217,6 +219,29 @@ void lcd_show_board_info(void)
>>   #endif /* CONFIG_LCD_INFO */
>>   #endif
>>
>> +#ifdef CONFIG_GENERIC_ATMEL_MCI
>> +void at91sam9m10g45ek_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 DB0 */
>> +    at91_set_a_periph(AT91_PIO_PORTA, 3, 0);    /* MCI0 DB1 */
>> +    at91_set_a_periph(AT91_PIO_PORTA, 4, 0);    /* MCI0 DB2 */
>> +    at91_set_a_periph(AT91_PIO_PORTA, 5, 0);    /* MCI0 DB3 */
>
> The comments for pin should be DAx while not DBx.

I'll fix it in v2.

>
>> +
>> +    /* Enable clock */
>> +    writel(1 << ATMEL_ID_MCI0, &pmc->pcer);
>> +}
>> +
>> +int board_mmc_init(bd_t *bis)
>> +{
>> +    at91_set_pio_input(AT91_PIO_PORTD, 10, 0);    /* MCI0 CD */
>
> As we won't use it, so I think we should remove it.

Okay. Thanks.

Best Regards,
Josh Wu

>
>> +    return atmel_mci_init((void *)ATMEL_BASE_MCI0);
>> +}
>> +#endif
>> +
>>   int board_early_init_f(void)
>>   {
>>       at91_seriald_hw_init();
>> @@ -247,6 +272,9 @@ int board_init(void)
>>   #ifdef CONFIG_ATMEL_SPI
>>       at91_spi0_hw_init(1 << 4);
>>   #endif
>> +#ifdef CONFIG_GENERIC_ATMEL_MCI
>> +    at91sam9m10g45ek_mci_hw_init();
>> +#endif
>>   #ifdef CONFIG_MACB
>>       at91sam9m10g45ek_macb_hw_init();
>>   #endif
>> 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