| Message ID | 1299129759-30678-3-git-send-email-matt.waddel@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
On Wed, Mar 2, 2011 at 11:22 PM, <matt.waddel@linaro.org> wrote: > From: Matt Waddel <matt.waddel@linaro.org> > > Added the board specific definitions to use the MMCI device. > > Signed-off-by: Matt Waddel <matt.waddel@linaro.org> Looks fine to me. I can apply this to my tree if that's fine with the maintainer. If not, I'm also OK if the maintainer wants to pull in the driver patch (with the previously-mentioned small change). Either way: Acked-by: Andy Fleming <afleming@freescale.com> Andy
On 04/13/2011 05:09 AM, Andy Fleming wrote: > On Wed, Mar 2, 2011 at 11:22 PM, <matt.waddel@linaro.org> wrote: >> From: Matt Waddel <matt.waddel@linaro.org> >> >> Added the board specific definitions to use the MMCI device. >> >> Signed-off-by: Matt Waddel <matt.waddel@linaro.org> > > Looks fine to me. I can apply this to my tree if that's fine with the > maintainer. If not, I'm also OK if the maintainer wants to pull in > the driver patch (with the previously-mentioned small change). Hi Andy, I made the ffs() change you suggested and have posted a 4th version of the 3 patches (even though the 2nd one was the only one that changed, I wanted to make sure they were all still in sync with the repository). If you could apply these to your tree that would be great. > > Either way: > Acked-by: Andy Fleming <afleming@freescale.com> Thanks, Matt > > Andy > _______________________________________________ > U-Boot mailing list > U-Boot@lists.denx.de > http://lists.denx.de/mailman/listinfo/u-boot
From: Matt Waddel <matt.waddel@linaro.org>
These patches add support for the ARM PrimeCell PL180 MultiMedia Interface.
The Versatile Express was the test platform for these changes.
---
Change log:
v2 - Rename patch items to a more descriptive name (ie. mmci -> arm_mmci)
Fixed conflicting fuction call and added prototype to arm_mmci.h
v3 - Rename patch items (arm_mmci -> arm_pl180_mmci)
(Note: Patch 1/3 still did not change with these corrections)
v4 - Removed convert_from_bytes_to_power_of_two() routine and used generic ffs
call instead. (Feedback from Andy Fleming.)
Matt Waddel (3):
MMC: Max blocks value adjustable
MMC: Add support for PL180 ARM mmc device
ARMV7: Vexpress: Add MMC support
board/armltd/vexpress/ca9x4_ct_vxp.c | 9 +
drivers/mmc/Makefile | 1 +
drivers/mmc/arm_pl180_mmci.c | 441 ++++++++++++++++++++++++++++++++++
drivers/mmc/arm_pl180_mmci.h | 183 ++++++++++++++
drivers/mmc/mmc.c | 19 +-
include/configs/ca9x4_ct_vxp.h | 4 +
6 files changed, 647 insertions(+), 10 deletions(-)
create mode 100644 drivers/mmc/arm_pl180_mmci.c
create mode 100644 drivers/mmc/arm_pl180_mmci.h
diff --git a/board/armltd/vexpress/ca9x4_ct_vxp.c b/board/armltd/vexpress/ca9x4_ct_vxp.c index ce1be1e..3566b95 100644 --- a/board/armltd/vexpress/ca9x4_ct_vxp.c +++ b/board/armltd/vexpress/ca9x4_ct_vxp.c @@ -86,6 +86,15 @@ int board_eth_init(bd_t *bis) return rc; } +int cpu_mmc_init(bd_t *bis) +{ + int rc = 0; +#ifdef CONFIG_ARM_PL180_MMCI + rc = arm_pl180_mmci_init(); +#endif + return rc; +} + static void flash__init(void) { /* Setup the sytem control register to allow writing to flash */ diff --git a/include/configs/ca9x4_ct_vxp.h b/include/configs/ca9x4_ct_vxp.h index 63f003d..4ab58c0 100644 --- a/include/configs/ca9x4_ct_vxp.h +++ b/include/configs/ca9x4_ct_vxp.h @@ -86,6 +86,10 @@ #define CONFIG_MMC 1 #define CONFIG_CMD_MMC #define CONFIG_GENERIC_MMC +#define CONFIG_ARM_PL180_MMCI +#define CONFIG_ARM_PL180_MMCI_BASE 0x10005000 +#define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 +#define CONFIG_ARM_PL180_MMCI_CLOCK_FREQ 6250000 /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE