From 426fc7180a423644964ad79441040bf7e5673ba6 Mon Sep 17 00:00:00 2001 From: Jarielle Catbagan Date: Tue, 4 Aug 2015 11:03:28 -0700 Subject: BBB: Migrate MMC1 clock enable from am335x_mmc.c:mmcInit() to cpuio.c:initCPUio() --- ports/beagleboneblack/am335x_mmc.c | 4 ---- ports/beagleboneblack/cpuio.c | 4 ++++ 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/beagleboneblack/am335x_mmc.c b/ports/beagleboneblack/am335x_mmc.c index 10aef23..bba60a2 100644 --- a/ports/beagleboneblack/am335x_mmc.c +++ b/ports/beagleboneblack/am335x_mmc.c @@ -135,10 +135,6 @@ mmcInit(int interface, int verbose) { uint32_t cmd, arg, resp[4]; - /* Enable MMC1 clocks */ - CM_PER_REG(CM_PER_MMC1_CLKCTRL) |= CM_PER_MMC1_CLKCTRL_MODULEMODE_ENABLE; - while (CM_PER_REG(CM_PER_MMC1_CLKCTRL) & CM_PER_MMC0_CLKCTRL_IDLEST); - /* Reset the MMC1 Controller */ MMC1_REG(SD_SYSCONFIG) = SD_SYSCONFIG_SOFTRESET; while (!(MMC1_REG(SD_SYSSTATUS) & SD_SYSSTATUS_RESETDONE)); diff --git a/ports/beagleboneblack/cpuio.c b/ports/beagleboneblack/cpuio.c index 1579fb0..a8a901d 100644 --- a/ports/beagleboneblack/cpuio.c +++ b/ports/beagleboneblack/cpuio.c @@ -241,6 +241,10 @@ initCPUio(void) CM_PER_REG(CM_PER_MMC0_CLKCTRL) |= CM_PER_MMC0_CLKCTRL_MODULEMODE_ENABLE; while (CM_PER_REG(CM_PER_MMC0_CLKCTRL) & CM_PER_MMC0_CLKCTRL_IDLEST); + /* Enable MMC1 clocks */ + CM_PER_REG(CM_PER_MMC1_CLKCTRL) |= CM_PER_MMC1_CLKCTRL_MODULEMODE_ENABLE; + while (CM_PER_REG(CM_PER_MMC1_CLKCTRL) & CM_PER_MMC0_CLKCTRL_IDLEST); + pinMuxInit(); InitUART(DEFAULT_BAUD_RATE); -- cgit v1.2.3