AT91: Add SD/MMC controller support
PATCH v2 1/1 AT91: Add SD/MMC controller support
This patch allows to use the atmel_mci SD/MMC driver on the at91 architecture. It contains:
- initialization code for the MCI controller for all the supported AT91. It allows the use of only one controller even if a SoC has two controllers (anyway there's no support for it in atmel_mci as of now)
- the necessary get_mci_clk_rate function
- definition of MMCI_BASE for use in atmel_mci
- the cpu_mmc_init function. As of now this is not used, but will be required when atmel_mci is ported to the new generic mmc API.
---
Changes since v1 (http://lists.denx.de/pipermail/u-boot/2009-September/059665.html):
- Fix the MCI controller ID in the init code for CAP9, SAM9263 and SAM9G45
- Move AT91_BASE_MCI* define to soc header
- define AT91_BASE_MCI{0,1} instead of AT91_BASE_MCI for boards which have 2 controllers
- rework the way MMCI_BASE is defined accordingly
Note: I am fully aware that MMCI0_BASE and MMCI1_BASE should be defined, instead of MMCI_BASE. However, I'd rather wait until the patch that switches atmel_mci to the generic mmc API is accepted, as it will be easier to do it then.
cpu/arm926ejs/at91/at91cap9_devices.c | 37 ++++++++++++++++++ cpu/arm926ejs/at91/at91sam9260_devices.c | 27 +++++++++++++ cpu/arm926ejs/at91/at91sam9261_devices.c | 18 +++++++++ cpu/arm926ejs/at91/at91sam9263_devices.c | 55 +++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9m10g45_devices.c | 55 +++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9rl_devices.c | 22 +++++++++++ cpu/arm926ejs/at91/cpu.c | 7 +++ include/asm-arm/arch-at91/at91_common.h | 2 + include/asm-arm/arch-at91/at91cap9.h | 3 + include/asm-arm/arch-at91/at91sam9260.h | 2 + include/asm-arm/arch-at91/at91sam9261.h | 1 + include/asm-arm/arch-at91/at91sam9263.h | 3 + include/asm-arm/arch-at91/at91sam9g45.h | 3 + include/asm-arm/arch-at91/at91sam9rl.h | 1 + include/asm-arm/arch-at91/clk.h | 5 ++ include/asm-arm/arch-at91/memory-map.h | 6 +++ 16 files changed, 247 insertions(+), 0 deletions(-)
cpu/arm926ejs/at91/at91cap9_devices.c +37 -0
@@ -79,6 +79,43 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +#ifdef CONFIG_AT91_MCI0 +void at91_mci0_hw_init (unsigned long mask) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91CAP9_ID_MCI0 ); +at91_set_A_periph (AT91_PIN_PA2 ,0 ); + +if (mask & (1 <<0 )) { +at91_set_A_periph (AT91_PIN_PA0 ,1 ); +at91_set_A_periph (AT91_PIN_PA1 ,1 ); +if (mask & (1 <<1 )) { +at91_set_A_periph (AT91_PIN_PA3 ,1 ); +at91_set_A_periph (AT91_PIN_PA4 ,1 ); +at91_set_A_periph (AT91_PIN_PA5 ,1 ); + } + } +} +#endif +#ifdef CONFIG_AT91_MCI1 +void at91_mci1_hw_init (unsigned long mask) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91CAP9_ID_MCI1 ); +at91_set_A_periph (AT91_PIN_PA16 ,0 ); + +if (mask & (1 <<0 )) { +at91_set_A_periph (AT91_PIN_PA17 ,1 ); +at91_set_A_periph (AT91_PIN_PA18 ,1 ); +if (mask & (1 <<1 )) { +at91_set_A_periph (AT91_PIN_PA19 ,1 ); +at91_set_A_periph (AT91_PIN_PA20 ,1 ); +at91_set_A_periph (AT91_PIN_PA21 ,1 ); + } + } +} +#endif +#endif +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9260_devices.c +27 -0
@@ -75,6 +75,33 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (unsigned long mask) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_MCI ); +at91_set_A_periph (AT91_PIN_PA8 ,0 ); + +if (mask & (1 <<0 )) { +at91_set_A_periph (AT91_PIN_PA6 ,1 ); +at91_set_A_periph (AT91_PIN_PA7 ,1 ); +if (mask & (1 <<1 )) { +at91_set_A_periph (AT91_PIN_PA9 ,1 ); +at91_set_A_periph (AT91_PIN_PA10 ,1 ); +at91_set_A_periph (AT91_PIN_PA11 ,1 ); + } + } +if (mask & (1 <<2 )) { +at91_set_B_periph (AT91_PIN_PA0 ,1 ); +at91_set_B_periph (AT91_PIN_PA1 ,1 ); +if (mask & (1 <<3 )) { +at91_set_B_periph (AT91_PIN_PA3 ,1 ); +at91_set_B_periph (AT91_PIN_PA4 ,1 ); +at91_set_B_periph (AT91_PIN_PA5 ,1 ); + } + } +} +#endif /* ATMEL_MCI */ +#if defined(CONFIG_HAS_DATAFLASH ) || defined(CONFIG_ATMEL_SPI )void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9261_devices.c +18 -0
@@ -75,6 +75,24 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (unsigned long mask) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9261_ID_MCI ); +at91_set_B_periph (AT91_PIN_PA2 ,0 ); + +if (mask & (1 <<0 )) { +at91_set_B_periph (AT91_PIN_PA0 ,1 ); +at91_set_B_periph (AT91_PIN_PA1 ,1 ); +if (mask & (1 <<1 )) { +at91_set_B_periph (AT91_PIN_PA4 ,1 ); +at91_set_B_periph (AT91_PIN_PA5 ,1 ); +at91_set_B_periph (AT91_PIN_PA6 ,1 ); + } + } +} +#endif /* ATMEL_MCI */ +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9263_devices.c +55 -0
61 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9m10g45_devices.c +55 -0
61 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9rl_devices.c +22 -0
@@ -75,6 +75,28 @@ void at91_serial_hw_init(void)#endif } +/* +* The AT91SAM9RL64 is said to have 2 slots, but the datasheet doesn't +* seem to mention to what pins the second slot is assigned +*/ +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (unsigned long mask) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_MCI ); +at91_set_A_periph (AT91_PIN_PA2 ,0 ); + +if (mask & (1 <<0 )) { +at91_set_A_periph (AT91_PIN_PA0 ,1 ); +at91_set_A_periph (AT91_PIN_PA1 ,1 ); +if (mask & (1 <<1 )) { +at91_set_A_periph (AT91_PIN_PA3 ,1 ); +at91_set_A_periph (AT91_PIN_PA4 ,1 ); +at91_set_A_periph (AT91_PIN_PA5 ,1 ); + } + } +} +#endif /* ATMEL_MCI */ +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/cpu.c +7 -0
@@ -52,3 +52,10 @@ int print_cpuinfo(void) return 0; }#endif + +#ifdef CONFIG_GENERIC_MMC +int cpu_mmc_init (bd_t *bis) +{ +atmel_mci_init (bis); +} +#endif /* GENERIC_MMC */
include/asm-arm/arch-at91/at91_common.h +2 -0
@@ -32,6 +32,8 @@ void at91_serial0_hw_init(void);void at91_serial1_hw_init (void );void at91_serial2_hw_init (void );void at91_serial3_hw_init (void ); +void at91_mci0_hw_init (unsigned long mask); +void at91_mci1_hw_init (unsigned long mask);void at91_spi0_hw_init (unsigned long cs_mask);void at91_spi1_hw_init (unsigned long cs_mask);void at91_uhp_hw_init (void );
include/asm-arm/arch-at91/at91cap9.h +3 -0
@@ -109,6 +109,9 @@#define AT91_USART1 AT91CAP9_BASE_US1#define AT91_USART2 AT91CAP9_BASE_US2 +#define AT91_BASE_MCI0 AT91CAP9_BASE_MCI0 +#define AT91_BASE_MCI1 AT91CAP9_BASE_MCI1 +/* * SCKCR flags */
include/asm-arm/arch-at91/at91sam9260.h +2 -0
@@ -105,6 +105,8 @@#define AT91_USART4 AT91SAM9260_BASE_US4#define AT91_USART5 AT91SAM9260_BASE_US5 +#define AT91_BASE_MCI0 AT91SAM9260_BASE_MCI +/* * Internal Memory. */
include/asm-arm/arch-at91/at91sam9261.h +1 -0
@@ -88,6 +88,7 @@#define AT91_USART1 AT91SAM9261_BASE_US1#define AT91_USART2 AT91SAM9261_BASE_US2 +#define AT91_BASE_MCI0 AT91SAM9261_BASE_MCI/* * Internal Memory.
include/asm-arm/arch-at91/at91sam9263.h +3 -0
@@ -108,6 +108,9 @@#define AT91_SMC AT91_SMC0#define AT91_SDRAMC AT91_SDRAMC0 +#define AT91_BASE_MCI0 AT91SAM9263_BASE_MCI0 +#define AT91_BASE_MCI1 AT91SAM9263_BASE_MCI1 +/* * Internal Memory. */
include/asm-arm/arch-at91/at91sam9g45.h +3 -0
@@ -114,6 +114,9 @@#define AT91_USART2 AT91SAM9G45_BASE_US2#define AT91_USART3 AT91SAM9G45_BASE_US3 +#define AT91_BASE_MCI0 AT91SAM9G45_BASE_MCI0 +#define AT91_BASE_MCI1 AT91SAM9G45_BASE_MCI1 +/* * Internal Memory. */
include/asm-arm/arch-at91/at91sam9rl.h +1 -0
@@ -99,6 +99,7 @@#define AT91_USART2 AT91SAM9RL_BASE_US2#define AT91_USART3 AT91SAM9RL_BASE_US3 +#define AT91_BASE_MCI0 AT91SAM9RL_BASE_MCI/* * Internal Memory.
include/asm-arm/arch-at91/clk.h +5 -0
@@ -59,5 +59,10 @@ static inline unsigned long get_twi_clk_rate(unsigned int dev_id) return get_mck_clk_rate(); } +static inline unsigned long get_mci_clk_rate (void ) +{ +return get_mck_clk_rate (); +} +int at91_clock_init (unsigned long main_clock);#endif /* __ASM_ARM_ARCH_CLK_H__ */
include/asm-arm/arch-at91/memory-map.h +6 -0
@@ -32,4 +32,10 @@#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU)#define SPI0_BASE AT91_BASE_SPI +#ifndef (CONFIG_AT91_MCI1) +# define MMCI_BASE AT91_BASE_MCI0 +#else +# define MMCI_BASE AT91_BASE_MCI1 +#endif +#endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */
Signature · 1 line
1.6.3.3
PATCH v3 1/1 AT91: Add SD/MMC controller support
This patch allows to use the atmel_mci SD/MMC driver on the at91 architecture. It contains:
- initialization code for the MCI controller for all the supported AT91. It allows the use of only one controller even if a SoC has two controllers (anyway there's no support for it in atmel_mci as of now)
- the necessary get_mci_clk_rate function
- definition of MMCI_BASE for use in atmel_mci
- the cpu_mmc_init function. As of now this is not used, but will be required when atmel_mci is ported to the new generic mmc API.
---
Changes since v1
- Fix the MCI controller ID in the init code for CAP9, SAM9263 and SAM9G45
- Move AT91_BASE_MCI* define to soc header
- define AT91_BASE_MCI{0,1} instead of AT91_BASE_MCI for boards which have 2 controllers
- rework the way MMCI_BASE is defined accordingly
Changes since v2
- allow using 8-bit bus width on CPUs that support it
- change the arguments of atmel_mciX_hw_init to (slot, bus) so that it's more meaningful than (bitmask)
cpu/arm926ejs/at91/at91cap9_devices.c | 40 +++++++++++++++ cpu/arm926ejs/at91/at91sam9260_devices.c | 37 ++++++++++++++ cpu/arm926ejs/at91/at91sam9261_devices.c | 21 ++++++++ cpu/arm926ejs/at91/at91sam9263_devices.c | 72 +++++++++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9m10g45_devices.c | 56 +++++++++++++++++++++ cpu/arm926ejs/at91/at91sam9rl_devices.c | 25 +++++++++ include/asm-arm/arch-at91/at91_common.h | 2 + include/asm-arm/arch-at91/at91cap9.h | 2 + include/asm-arm/arch-at91/at91sam9260.h | 1 + include/asm-arm/arch-at91/at91sam9261.h | 1 + include/asm-arm/arch-at91/at91sam9263.h | 2 + include/asm-arm/arch-at91/at91sam9g45.h | 2 + include/asm-arm/arch-at91/at91sam9rl.h | 1 + include/asm-arm/arch-at91/clk.h | 5 ++ include/asm-arm/arch-at91/memory-map.h | 6 ++ 15 files changed, 273 insertions(+), 0 deletions(-)
cpu/arm926ejs/at91/at91cap9_devices.c +40 -0
@@ -79,6 +79,46 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (int slot,int bus_width) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91CAP9_ID_MCI0 ); + +/* CLK */ +at91_set_A_periph (AT91_PIN_PA2 ,0 ); + +/* CMD */ +at91_set_A_periph (AT91_PIN_PA1 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_A_periph (AT91_PIN_PA0 ,1 ); +if (bus_width ==4 ) { +at91_set_A_periph (AT91_PIN_PA3 ,1 ); +at91_set_A_periph (AT91_PIN_PA4 ,1 ); +at91_set_A_periph (AT91_PIN_PA5 ,1 ); + } +} + +void at91_mci1_hw_init (int slot,int bus_width) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91CAP9_ID_MCI0 ); + +/* CLK */ +at91_set_A_periph (AT91_PIN_PA16 ,0 ); + +/* CMD */ +at91_set_A_periph (AT91_PIN_PA17 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_A_periph (AT91_PIN_PA18 ,1 ); +if (bus_width ==4 ) { +at91_set_A_periph (AT91_PIN_PA19 ,1 ); +at91_set_A_periph (AT91_PIN_PA20 ,1 ); +at91_set_A_periph (AT91_PIN_PA21 ,1 ); + } +} +#endif +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9260_devices.c +37 -0
@@ -75,6 +75,43 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (int slot,int bus_width) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9260_ID_MCI ); + +/* CLK */ +at91_set_A_periph (AT91_PIN_PA8 ,0 ); + +switch (slot) { +case 0 : +/* CMD */ +at91_set_A_periph (AT91_PIN_PA7 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_A_periph (AT91_PIN_PA6 ,1 ); +if (bus_width ==4 ) { +at91_set_A_periph (AT91_PIN_PA9 ,1 ); +at91_set_A_periph (AT91_PIN_PA10 ,1 ); +at91_set_A_periph (AT91_PIN_PA11 ,1 ); + } +break ; +case 1 : +/* CMD */ +at91_set_B_periph (AT91_PIN_PA1 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_B_periph (AT91_PIN_PA0 ,1 ); +if (bus_width ==4 ) { +at91_set_B_periph (AT91_PIN_PA3 ,1 ); +at91_set_B_periph (AT91_PIN_PA4 ,1 ); +at91_set_B_periph (AT91_PIN_PA5 ,1 ); + } +break ; + } +} +#endif /* ATMEL_MCI */ +#if defined(CONFIG_HAS_DATAFLASH ) || defined(CONFIG_ATMEL_SPI )void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9261_devices.c +21 -0
@@ -75,6 +75,27 @@ void at91_serial_hw_init(void)#endif } +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (int slot,int bus_width) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9261_ID_MCI ); + +/* CLK */ +at91_set_B_periph (AT91_PIN_PA2 ,0 ); + +/* CMD */ +at91_set_B_periph (AT91_PIN_PA1 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_B_periph (AT91_PIN_PA0 ,1 ); +if (bus_width ==4 ) { +at91_set_B_periph (AT91_PIN_PA4 ,1 ); +at91_set_B_periph (AT91_PIN_PA5 ,1 ); +at91_set_B_periph (AT91_PIN_PA6 ,1 ); + } +} +#endif /* ATMEL_MCI */ +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
cpu/arm926ejs/at91/at91sam9263_devices.c +72 -0
78 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9m10g45_devices.c +56 -0
62 lines not on this page · raw message
cpu/arm926ejs/at91/at91sam9rl_devices.c +25 -0
@@ -75,6 +75,31 @@ void at91_serial_hw_init(void)#endif } +/* +* The AT91SAM9RL64 is said to have 2 slots, but the datasheet doesn't +* seem to mention to what pins the second slot is assigned +*/ +#ifdef CONFIG_ATMEL_MCI +void at91_mci0_hw_init (int slot,int bus_width) +{ +at91_sys_write (AT91_PMC_PCER ,1 <<AT91SAM9RL_ID_MCI ); + +/* CLK */ +at91_set_A_periph (AT91_PIN_PA2 ,0 ); + +/* CMD */ +at91_set_A_periph (AT91_PIN_PA1 ,1 ); + +/* DAT0, maybe DAT1..DAT3 */ +at91_set_A_periph (AT91_PIN_PA0 ,1 ); +if (bus_width ==4 ) { +at91_set_A_periph (AT91_PIN_PA3 ,1 ); +at91_set_A_periph (AT91_PIN_PA4 ,1 ); +at91_set_A_periph (AT91_PIN_PA5 ,1 ); + } +} +#endif /* ATMEL_MCI */ +#ifdef CONFIG_HAS_DATAFLASH void at91_spi0_hw_init (unsigned long cs_mask) {
include/asm-arm/arch-at91/at91_common.h +2 -0
@@ -32,6 +32,8 @@ void at91_serial0_hw_init(void);void at91_serial1_hw_init (void );void at91_serial2_hw_init (void );void at91_serial3_hw_init (void ); +void at91_mci0_hw_init (int slot,int bus_width); +void at91_mci1_hw_init (int slot,int bus_width);void at91_spi0_hw_init (unsigned long cs_mask);void at91_spi1_hw_init (unsigned long cs_mask);void at91_uhp_hw_init (void );
include/asm-arm/arch-at91/at91cap9.h +2 -0
@@ -112,6 +112,8 @@#define AT91_BASE_SPI AT91CAP9_BASE_SPI0#define AT91_ID_UHP AT91CAP9_ID_UHP#define AT91_PMC_UHP AT91CAP9_PMC_UHP +#define AT91_BASE_MCI0 AT91CAP9_BASE_MCI0 +#define AT91_BASE_MCI1 AT91CAP9_BASE_MCI1/* * SCKCR flags
include/asm-arm/arch-at91/at91sam9260.h +1 -0
@@ -108,6 +108,7 @@#define AT91_BASE_SPI AT91SAM9260_BASE_SPI0#define AT91_ID_UHP AT91SAM9260_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP +#define AT91_BASE_MCI0 AT91SAM9260_BASE_MCI/* * Internal Memory.
include/asm-arm/arch-at91/at91sam9261.h +1 -0
@@ -91,6 +91,7 @@#define AT91_BASE_SPI AT91SAM9261_BASE_SPI0#define AT91_ID_UHP AT91SAM9261_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP +#define AT91_BASE_MCI0 AT91SAM9261_BASE_MCI/* * Internal Memory.
include/asm-arm/arch-at91/at91sam9263.h +2 -0
@@ -111,6 +111,8 @@#define AT91_BASE_SPI AT91SAM9263_BASE_SPI0#define AT91_ID_UHP AT91SAM9263_ID_UHP#define AT91_PMC_UHP AT91SAM926x_PMC_UHP +#define AT91_BASE_MCI0 AT91SAM9263_BASE_MCI0 +#define AT91_BASE_MCI1 AT91SAM9263_BASE_MCI1/* * Internal Memory.
include/asm-arm/arch-at91/at91sam9g45.h +2 -0
@@ -118,6 +118,8 @@#define AT91_BASE_SPI AT91SAM9G45_BASE_SPI0#define AT91_ID_UHP AT91SAM9G45_ID_UHPHS#define AT91_PMC_UHP AT91SAM926x_PMC_UHP +#define AT91_BASE_MCI0 AT91SAM9G45_BASE_MCI0 +#define AT91_BASE_MCI1 AT91SAM9G45_BASE_MCI1/* * Internal Memory.
include/asm-arm/arch-at91/at91sam9rl.h +1 -0
@@ -101,6 +101,7 @@#define AT91_BASE_SPI AT91SAM9RL_BASE_SPI#define AT91_ID_UHP AT91SAM9RL_ID_UHP +#define AT91_BASE_MCI0 AT91SAM9RL_BASE_MCI/*
include/asm-arm/arch-at91/clk.h +5 -0
@@ -59,5 +59,10 @@ static inline unsigned long get_twi_clk_rate(unsigned int dev_id) return get_mck_clk_rate(); } +static inline unsigned long get_mci_clk_rate (void ) +{ +return get_mck_clk_rate (); +} +int at91_clock_init (unsigned long main_clock);#endif /* __ASM_ARM_ARCH_CLK_H__ */
include/asm-arm/arch-at91/memory-map.h +6 -0
@@ -32,4 +32,10 @@#define USART3_BASE (AT91_BASE_SYS + AT91_DBGU)#define SPI0_BASE AT91_BASE_SPI +#ifndef CONFIG_AT91_MCI1 +#define MMCI_BASE AT91_BASE_MCI0 +#else +#define MMCI_BASE AT91_BASE_MCI1 +#endif +#endif /* __ASM_ARM_ARCH_MEMORYMAP_H__ */
Signature · 1 line
1.6.3.3
PATCH v3 1/1 AT91: Add SD/MMC controller support
Dear Albin Tonnerre,
Quoted 20 lines · In message <1252442374-25386-1-git-send-email-albin.tonnerre@free-electrons.com…
This patch allows to use the
atmel_mciSD/MMC driver on the at91 architecture. It contains:
- initialization code for the MCI controller for all the supported AT91. It allows the use of only one controller even if a SoC has two controllers (anyway there's no support for it inatmel_mcias of now)
- the necessaryget_mci_clk_ratefunction
- definition ofMMCI_BASEfor use inatmel_mci
- thecpu_mmc_initfunction. As of now this is not used, but will be required whenatmel_mciis ported to the new generic mmc API.Signed-off-by Albin Tonnerre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>---
Changes since v1
- Fix the MCI controller ID in the init code for CAP9, SAM9263 and SAM9G45
- Move AT91_BASE_MCI* define to soc header
- define AT91_BASE_MCI{0,1} instead ofAT91_BASE_MCIfor boards which have 2 controllers
- rework the wayMMCI_BASEis defined accordingly
Quoted 4 lines
Changes since v2
- allow using 8-bit bus width on CPUs that support it
- change the arguments ofatmel_mciX_hw_initto (slot, bus) so that it's more meaningful than (bitmask)
What's the current state of this patch? Do you consider it ripe for inclusion into mainline, or do you still have changes pending?
Best regards,
Wolfgang Denk
Signature · 10 lines
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
Q: How many DEC repairman does it take to fix a flat?
A: Five; four to hold the car up and one to swap tires.
Q: How long does it take?
A: It's indeterminate. It will depend upon how many flats they've
brought with them.
Q: What happens if you've got TWO flats?
A: They replace your generator.PATCH v3 1/1 AT91: Add SD/MMC controller support
Quoted 23 lines · Wolfgang Denk
Dear Albin Tonnerre,
Quoted 20 lines · In message <1252442374-25386-1-git-send-email-albin.tonnerre@free-electrons.com…
This patch allows to use the
atmel_mciSD/MMC driver on the at91 architecture. It contains:
- initialization code for the MCI controller for all the supported AT91. It allows the use of only one controller even if a SoC has two controllers (anyway there's no support for it inatmel_mcias of now)
- the necessaryget_mci_clk_ratefunction
- definition ofMMCI_BASEfor use inatmel_mci
- thecpu_mmc_initfunction. As of now this is not used, but will be required whenatmel_mciis ported to the new generic mmc API.Signed-off-by Albin Tonnerre <[email protected]>Signed-off-by Jean-Christophe PLAGNIOL-VILLARD <[email protected]>---
Changes since v1
- Fix the MCI controller ID in the init code for CAP9, SAM9263 and SAM9G45
- Move AT91_BASE_MCI* define to soc header
- define AT91_BASE_MCI{0,1} instead ofAT91_BASE_MCIfor boards which have 2 controllers
- rework the wayMMCI_BASEis defined accordingly
Quoted 7 lines
Quoted 4 lines
Changes since v2
- allow using 8-bit bus width on CPUs that support it
- change the arguments ofatmel_mciX_hw_initto (slot, bus) so that it's more meaningful than (bitmask)What's the current state of this patch? Do you consider it ripe for inclusion into mainline, or do you still have changes pending?
I consider it ready for inclusion. Thanks for the heads-up.
Regards,
Signature · 4 lines
Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
A message that is not in the archive (sent off-list or not yet received): F32E8C2599F37641BB4E3F3AC4A3C412014625AC54B7@ws
A message that is not in the archive (sent off-list or not yet received): [email protected]
PATCH v2 1/1 AT91: Add SD/MMC controller support & [PATCH v3]
Hi Albin,
Quoted 10 lines
Someone encoutered the same issue: http://lists.denx.de/pipermail/u-boot/2009-September/059684.html
This is because the patch is based on a change that was part of another patch that added support to a new >board. You can work around this easily: inat91sam9260_devices.c, simply replace#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)with
#if
defined(CONFIG_HAS_DATAFLASH)and the patch should then apply cleanly. Please let me know if that still doesn't work.
Yes this patch apply cleanly, but I had problems on my samg20ek to get the mmc working. On the command mmc init, it always say no mmc card foung.
So I tried now to apply your new Patch V3. What is the Base of this patch (I tried again u-boot 2009.08) Is there a better way to download the version with git?
There I have a lot of problems.
patching file cpu/arm926ejs/at91/at91cap9_devices.c
patching file cpu/arm926ejs/at91/at91sam9260_devices.c
Hunk #1 FAILED at 75.
1 out of 1 hunk FAILED -- saving rejects to file cpu/arm926ejs/at91/at91sam9260_devices.c.rej patching file cpu/arm926ejs/at91/at91sam9261_devices.c
patching file cpu/arm926ejs/at91/at91sam9263_devices.c
patching file cpu/arm926ejs/at91/at91sam9m10g45_devices.c
patching file cpu/arm926ejs/at91/at91sam9rl_devices.c
patching file include/asm-arm/arch-at91/at91_common.h
patching file include/asm-arm/arch-at91/at91cap9.h
Hunk #1 FAILED at 112.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91cap9.h.rej patching file include/asm-arm/arch-at91/at91sam9260.h
Hunk #1 FAILED at 108.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91sam9260.h.rej patching file include/asm-arm/arch-at91/at91sam9261.h
Hunk #1 FAILED at 91.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91sam9261.h.rej patching file include/asm-arm/arch-at91/at91sam9263.h
Hunk #1 FAILED at 111.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91sam9263.h.rej patching file include/asm-arm/arch-at91/at91sam9g45.h
Hunk #1 FAILED at 118.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91sam9g45.h.rej patching file include/asm-arm/arch-at91/at91sam9rl.h
Hunk #1 FAILED at 101.
1 out of 1 hunk FAILED -- saving rejects to file include/asm-arm/arch-at91/at91sam9rl.h.rej patching file include/asm-arm/arch-at91/clk.h
patching file include/asm-arm/arch-at91/memory-map.h
bye
Konrad
PATCH v2 1/1 AT91: Add SD/MMC controller support & [PATCH v3]
Quoted 8 lines · Konrad Mattheis
Hi Albin,
Quoted 4 lines
Someone encoutered the same issue: http://lists.denx.de/pipermail/u-boot/2009-September/059684.html
This is because the patch is based on a change that was part of another patch that added support to a new >board. You can work around this easily: inat91sam9260_devices.c, simply replace#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)
Quoted 7 lines
Quoted 5 lines
with
#if
defined(CONFIG_HAS_DATAFLASH)and the patch should then apply cleanly. Please let me know if that still doesn't work.
Yes this patch apply cleanly, but I had problems on my samg20ek to get the mmc working. On the command mmc init, it always say no mmc card foung.
What modifications have you done to your code after applying the patch? Providing the diff would help spotting potential errors
Quoted 3 lines
So I tried now to apply your new Patch V3. What is the Base of this patch (I tried again u-boot 2009.08) Is there a better way to download the version with git?
It applies on top of http://lists.denx.de/pipermail/u-boot/2009-September/060053.html
The best base to apply those patches is the current master branch of the git repository (git://git.denx.de/u-boot.git)
Regards,
Signature · 11 lines
Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 835 bytes Desc: Digital signature Url : http://lists.denx.de/pipermail/u-boot/attachments/20090909/4fd858ba/attachment.pgp
PATCH v3 1/1 AT91: Problems with SD
Hi Albin,
so I describe you what I did.
Downloaded u-boot 2009.08
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)
to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)
applied Patch:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.html
then applied Patch V3: from mail
added to:include/config/at91sam9260ek.h
#define CONFIG_CMD_MMC 1
#define CONFIG_MMC 1
#define CONFIG_ATMEL_MCI
compiled and the on the at91sam9g20ek
I can start a normal kernel,...
but if I write mmc init I get the following error:
Quoted 2 lines
mmc: clock 150000 too low; setting CLKDIV to 255
No MMC card found
After this I tried to download git://git.denx.de/u-boot.git and then I could not apply the patches. I always got this message:
Reversed (or previously applied) patch detected! Assume -R? [n]
Did you already applied the patches to the git repository?
bye Konrad
PATCH v3 1/1 AT91: Problems with SD
Quoted 18 lines · Konrad Mattheis
Hi Albin,
so I describe you what I did.
Downloaded u-boot 2009.08
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)applied Patch:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.htmlthen applied Patch V3: from mail
added to:include/config/at91sam9260ek.h
Quoted 7 lines
#define
CONFIG_CMD_MMC1
#defineCONFIG_MMC1
#defineCONFIG_ATMEL_MCIcompiled and the on the at91sam9g20ek
I can start a normal kernel,...
but if I write mmc init I get the following error:
Ok, so that's what I thought: you're missing a call to at91_mciX_hw_init in your board init code. This function assigns the correst I/O pins to the MCI controller and takes care of enabling the clock. Please have a look at at91_mciX_hw_init cpu/arm926ejs/at91/at91sam9260_devices.c to see what arguments the function expects.
Quoted 7 lines
Quoted 2 lines
mmc: clock 150000 too low; setting CLKDIV to 255
No MMC card foundAfter this I tried to download
git://git.denx.de/u-boot.gitand then I could not apply the patches. I always got this message:
Reversed (or previously applied) patch detected! Assume -R? [n]
Did you already applied the patches to the git repository?
The CONFIG_ATMEL_SPI change is in mainline, yes. Other parts of the patch aren't.
Regards,
Signature · 4 lines
Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
A message that is not in the archive (sent off-list or not yet received): F32E8C2599F37641BB4E3F3AC4A3C412014625AC54DA@ws
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): F32E8C2599F37641BB4E3F3AC4A3C412014625AC54DB@ws
A message that is not in the archive (sent off-list or not yet received): [email protected]
A message that is not in the archive (sent off-list or not yet received): F32E8C2599F37641BB4E3F3AC4A3C412014625AC54DE@ws
PATCH v3 1/1 AT91: Problems with SD
Hi Konrad,
Quoted 2 lines · Konrad Mattheis
I will try this later on the day. What is the Base for this patch? Again 2009.08 or do I have to apply other patches?
2009.08 is fine.
Quoted 2 lines
You wrote in this message that this is a port to the new generic mmc api.
Do I also have to make different initialization? LikeCONFIG_GENERIC_MMCinstead ofCONFIG_AT91_MMC
You need CONFIG_GENERIC_MMC in addition to CONFIG_ATMEL_MCI, not instead of.
Regards,
Signature · 4 lines
Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com
PATCH v3 1/1 AT91: Add SD/MMC controller support
In reply to Albin TonnerreHello there,
I tried to get mmc working on a board using an at91sam9g20. The mmc-card is wired on slotb.
I applied the patches:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.html
http://lists.denx.de/pipermail/u-boot/2009-August/059456.html
http://lists.denx.de/pipermail/u-boot/2009-September/060243.html
It didn't work as I always got (apart from the message of a too low clock which I avoided by setting f_min / f_max on my own):
mmc: command 8 failed (status: 0x0010c1e5)
mmc: command 55 failed (status: 0x0010c1e5)
mmc: command 1 failed (status: 0x0010c1e5)
Card did not respond to voltage select!
So I had a look at linux sources and discovered that the MCI selected the wrong slot. After modifying atmel_mci_set_ios() to set SDCR to use slotb ("mmci_writel(SDCR, sdcr | 1);") I got my card working.
Hope this helps someone.
Regards
Sebastian Heutling
[U-Boot] AT91 working SD with u-boot
Hi,
for me this is working:
Downloaded u-boot 2009.08
file cpu/arm926ejs/at91/at91sam9260_devices.c
Quoted 5 lines
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)
patches:
SOC headers:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.html
SD Patch V3
http://lists.denx.de/pipermail/u-boot/2009-September/060243.html
MCI support
http://lists.denx.de/pipermail/u-boot/2009-August/059595.html
add to board init code:
at91_mciX_hw_init (X for mci unit 0 / 1) for parameters have a look at cpu/arm926ejs/at91/at91sam9260_devices.c
bye
Konrad Mattheis
[U-Boot] AT91 working SD with u-boot
Hi Konrad,
are you using the AT91SAM9G20-EK?
In that case the difference between us is that I'm working on a different board which is using the slotb MCI while the AT91SAM9G20-EK uses slota.
In case of slota it just worked because MCI_SDCR is 0 on reset but for slotb the SDCSEL field must be set to 1.
Regards
Sebastian Heutling
Quoted 33 lines · Konrad Mattheis
Hi,
for me this is working:
Downloaded u-boot 2009.08
file
cpu/arm926ejs/at91/at91sam9260_devices.cQuoted 5 lines
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)patches:
SOC headers:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.htmlSD Patch V3
http://lists.denx.de/pipermail/u-boot/2009-September/060243.htmlMCI support
http://lists.denx.de/pipermail/u-boot/2009-August/059595.htmladd to board init code:
at91_mciX_hw_init(X for mci unit 0 / 1) for parameters have a look atcpu/arm926ejs/at91/at91sam9260_devices.cbye
Konrad Mattheis
[U-Boot] AT91 working SD with u-boot
Hi Sebastian,
yes I'm using an AT91SAM9G20-EK Rev.c with two SD slots. I used slot a but I think you just have to init slot b.
in PatchV3 you can read:
Quoted 6 lines
at91_mci0_hw_init(int slot, int bus_width)switch (slot) { case 0: ..... case 1:
So I think you just have to call at91_mci0_hw_init(1,4) for slot b.
bye
Konrad
Quoted 59 lines
-----Urspr?ngliche Nachricht-----
Von: Sebastian Heutling [mailto:heutling at who-ing.de]
Gesendet: Donnerstag, 1. Oktober 2009 10:26
An: Konrad Mattheis
Cc: u-boot at lists.denx.de
Betreff: Re: AT91 working SD with u-bootHi Konrad,
are you using the AT91SAM9G20-EK?
In that case the difference between us is that I'm working on a different board which is using the slotb MCI while the AT91SAM9G20-EK uses slota.
In case of slota it just worked because
MCI_SDCRis 0 on reset but for slotb the SDCSEL field must be set to 1.Regards
Sebastian Heutling
Quoted 21 lines · Konrad Mattheis
Hi,
for me this is working:
Downloaded u-boot 2009.08
file
cpu/arm926ejs/at91/at91sam9260_devices.cQuoted 5 lines
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)patches:
SOC headers:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.htmlSD Patch V3
http://lists.denx.de/pipermail/u-boot/2009-September/060243.htmlQuoted 6 lines
MCI support
http://lists.denx.de/pipermail/u-boot/2009-August/059595.htmladd to board init code:
at91_mciX_hw_init(X for mci unit 0 / 1) for parameters have a lookat
cpu/arm926ejs/at91/at91sam9260_devices.cQuoted 6 lines
bye
Konrad Mattheis
[U-Boot] AT91 working SD with u-boot
Hi Konrad,
Quoted 7 lines · Konrad Mattheis
Hi Sebastian,
yes I'm using an AT91SAM9G20-EK
Rev.cwith two SD slots. I used slot a but I think you just have to init slot b.in PatchV3 you can read:
Quoted 8 lines
Quoted 6 lines
at91_mci0_hw_init(int slot, int bus_width)switch (slot) { case 0: ..... case 1:So I think you just have to call
at91_mci0_hw_init(1,4)for slot b.
No - that is not enough. It just enables the clock for MCI and configures the pins. But the MCI itself needs to know which slot to address.
Suppose you want to use both slots at the same time (and the drivers would support that).
Then you would call:
at91_mci0_hw_init(0, 4)at91_mci0_hw_init(1, 4)
In order to access both slots the driver (atmel_mci) needs to select which slot to address. And that is what the SDCSEL field of MCI-SDCR is for (see also Datasheet of the AT91SAM9G20 35.9.4 (probably at page 607)).
Regards
Sebastian
[U-Boot] AT91 working SD with u-boot
Quoted 28 lines · Sebastian Heutling
Hi Konrad,
Quoted 7 lines · Konrad Mattheis
Hi Sebastian,
yes I'm using an AT91SAM9G20-EK
Rev.cwith two SD slots. I used slot a but I think you just have to init slot b.in PatchV3 you can read:
Quoted 8 lines
Quoted 6 lines
at91_mci0_hw_init(int slot, int bus_width)switch (slot) { case 0: ..... case 1:So I think you just have to call
at91_mci0_hw_init(1,4)for slot b.No - that is not enough. It just enables the clock for MCI and configures the pins. But the MCI itself needs to know which slot to address.
Suppose you want to use both slots at the same time (and the drivers would support that).
Then you would call:
Quoted 6 lines
at91_mci0_hw_init(0, 4)at91_mci0_hw_init(1, 4)In order to access both slots the driver (
atmel_mci) needs to select which slot to address. And that is what the SDCSEL field of MCI-SDCR is for (see also Datasheet of the AT91SAM9G20 35.9.4 (probably at page 607)).
But the driver doesn't support for the moment. I might add such support if I have some time (and if that works - has anybody ever tried doing that with Linux?). For now the best way to get it working is to select the correct slot in your board config code.
Cheers,
Signature · 11 lines
Albin Tonnerre, Free Electrons Kernel, drivers and embedded Linux development, consulting, training and support. http://free-electrons.com -------------- next part -------------- A non-text attachment was scrubbed... Name: not available Type: application/pgp-signature Size: 836 bytes Desc: Digital signature Url : http://lists.denx.de/pipermail/u-boot/attachments/20091004/ac8252e4/attachment.pgp
[U-Boot] AT91 working SD with u-boot
In reply to Sebastian HeutlingQuoted 9 lines · Sebastian Heutling <heutling <at> who-ing.de> writes:
Hi Konrad,
are you using the AT91SAM9G20-EK?
In that case the difference between us is that I'm working on a different board which is using the slotb MCI while the AT91SAM9G20-EK uses slota.
Quoted 35 lines
In case of slota it just worked because
MCI_SDCRis 0 on reset but for slotb the SDCSEL field must be set to 1.Regards
Sebastian Heutling
Quoted 27 lines · Konrad Mattheis
Hi,
for me this is working:
Downloaded u-boot 2009.08
file
cpu/arm926ejs/at91/at91sam9260_devices.cQuoted 5 lines
changed:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)to:
Quoted 1 line
#if
defined(CONFIG_HAS_DATAFLASH)||defined(CONFIG_ATMEL_SPI)patches:
SOC headers:
http://lists.denx.de/pipermail/u-boot/2009-September/060053.htmlSD Patch V3
http://lists.denx.de/pipermail/u-boot/2009-September/060243.htmlMCI support
http://lists.denx.de/pipermail/u-boot/2009-August/059595.htmladd to board init code:
at91_mciX_hw_init(X for mci unit 0 / 1) for parameters have a look at
cpu/arm926ejs/at91/at91sam9260_devices.c
Quoted 7 lines
Quoted 6 lines
bye
Konrad Mattheis
Hello,
Thanks a lot for your post. Could you please let me know what configurations are to be added to /include/configs/board.h file to enable MMC/SD support. I've added the following configurations
/* MMC/SD Support */
/* To include File system support for MMC */
#define CONFIG_DOS_PARTITION
#define CONFIG_CMD_EXT2
#define CONFIG_CMD_FAT
#define CONFIG_MMC
#define CONFIG_GENERIC_MMC
#define CONFIG_DAVINCI_MMC
#define CONFIG_CMD_MM
/* To enable Environment variables to reside on MMC. */
#define CONFIG_DOS_PARTITION 1
//#undef CONFIG_MMC
#define CONFIG_SYS_MMC_BASE 0xFFFB4000
#define CONFIG_SYS_MMC_BLOCKSIZE 512
and when I enter mmcinit, u-boot says command not found. Please find the logs:
and thanks alot for your time :)
Electrum> mmcElectrum> mmc
Usage:
MMC sub system
Electrum> mmcinit
Unknown command 'mmcinit' - try 'help'
Electrum> mmcinfo
MMC Device 0 not found
Thanks,
Kalyan.