mmc: tegra2: rename tegra2_mmc.* to tegra_mmc.*
authorTom Warren <twarren.nvidia@gmail.com>
Tue, 22 May 2012 11:44:48 +0000 (11:44 +0000)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Sat, 7 Jul 2012 12:07:20 +0000 (14:07 +0200)
In anticipation of Tegra3 support, continue removing/renaming
Tegra2-specific files. No functional changes (yet).
Updated copyrights to 2012.

Signed-off-by: Tom Warren <twarren@nvidia.com>
16 files changed:
board/nvidia/harmony/harmony.c
board/nvidia/seaboard/seaboard.c
board/nvidia/whistler/whistler.c
drivers/mmc/Makefile
drivers/mmc/tegra2_mmc.c [deleted file]
drivers/mmc/tegra2_mmc.h [deleted file]
drivers/mmc/tegra_mmc.c [new file with mode: 0644]
drivers/mmc/tegra_mmc.h [new file with mode: 0644]
include/configs/harmony.h
include/configs/medcom.h
include/configs/paz00.h
include/configs/plutux.h
include/configs/seaboard.h
include/configs/trimslice.h
include/configs/ventana.h
include/configs/whistler.h

index 8f8e7bf3fe54310151d3e24468f0bc3dc483e193..f27ad37b701e2e60a7b03e562111fae17b79e82b 100644 (file)
@@ -29,7 +29,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 #include <mmc.h>
 #endif
 
@@ -41,7 +41,7 @@ void gpio_config_uart(void)
 {
 }
 
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
index 94efb1e83d5eef8793ab78a43fa52e03eb47e7af..36039c4ed869808273c54cb994530cabcff1cd96 100644 (file)
@@ -29,7 +29,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 #include <mmc.h>
 #endif
 
@@ -54,7 +54,7 @@ void gpio_config_uart(void)
 }
 #endif
 
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 /*
  * Routine: pin_mux_mmc
  * Description: setup the pin muxes/tristate values for the SDMMC(s)
index 1c2f33face5f8f34ea4317b6ae1d4771cb6433f4..3ec24df2e740405b2b178d466192ce6442656865 100644 (file)
@@ -30,7 +30,7 @@
 #include <asm/arch/pinmux.h>
 #include <asm/arch/mmc.h>
 #include <asm/gpio.h>
-#ifdef CONFIG_TEGRA2_MMC
+#ifdef CONFIG_TEGRA_MMC
 #include <mmc.h>
 #endif
 
index a8e681c2fed546f5634a2c056951104421882512..c56773701575e52c7c0509b7769db643985aaa53 100644 (file)
@@ -42,7 +42,7 @@ COBJS-$(CONFIG_PXA_MMC_GENERIC) += pxa_mmc_gen.o
 COBJS-$(CONFIG_SDHCI) += sdhci.o
 COBJS-$(CONFIG_S5P_SDHCI) += s5p_sdhci.o
 COBJS-$(CONFIG_SH_MMCIF) += sh_mmcif.o
-COBJS-$(CONFIG_TEGRA2_MMC) += tegra2_mmc.o
+COBJS-$(CONFIG_TEGRA_MMC) += tegra_mmc.o
 
 COBJS  := $(COBJS-y)
 SRCS   := $(COBJS:.o=.c)
diff --git a/drivers/mmc/tegra2_mmc.c b/drivers/mmc/tegra2_mmc.c
deleted file mode 100644 (file)
index fb8a57d..0000000
+++ /dev/null
@@ -1,570 +0,0 @@
-/*
- * (C) Copyright 2009 SAMSUNG Electronics
- * Minkyu Kang <mk7.kang@samsung.com>
- * Jaehoon Chung <jh80.chung@samsung.com>
- * Portions Copyright 2011 NVIDIA Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- */
-
-#include <common.h>
-#include <mmc.h>
-#include <asm/gpio.h>
-#include <asm/io.h>
-#include <asm/arch/clk_rst.h>
-#include <asm/arch/clock.h>
-#include "tegra2_mmc.h"
-
-/* support 4 mmc hosts */
-struct mmc mmc_dev[4];
-struct mmc_host mmc_host[4];
-
-
-/**
- * Get the host address and peripheral ID for a device. Devices are numbered
- * from 0 to 3.
- *
- * @param host         Structure to fill in (base, reg, mmc_id)
- * @param dev_index    Device index (0-3)
- */
-static void tegra2_get_setup(struct mmc_host *host, int dev_index)
-{
-       debug("tegra2_get_base_mmc: dev_index = %d\n", dev_index);
-
-       switch (dev_index) {
-       case 1:
-               host->base = TEGRA2_SDMMC3_BASE;
-               host->mmc_id = PERIPH_ID_SDMMC3;
-               break;
-       case 2:
-               host->base = TEGRA2_SDMMC2_BASE;
-               host->mmc_id = PERIPH_ID_SDMMC2;
-               break;
-       case 3:
-               host->base = TEGRA2_SDMMC1_BASE;
-               host->mmc_id = PERIPH_ID_SDMMC1;
-               break;
-       case 0:
-       default:
-               host->base = TEGRA2_SDMMC4_BASE;
-               host->mmc_id = PERIPH_ID_SDMMC4;
-               break;
-       }
-
-       host->reg = (struct tegra2_mmc *)host->base;
-}
-
-static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data)
-{
-       unsigned char ctrl;
-
-       debug("data->dest: %08X, data->blocks: %u, data->blocksize: %u\n",
-       (u32)data->dest, data->blocks, data->blocksize);
-
-       writel((u32)data->dest, &host->reg->sysad);
-       /*
-        * DMASEL[4:3]
-        * 00 = Selects SDMA
-        * 01 = Reserved
-        * 10 = Selects 32-bit Address ADMA2
-        * 11 = Selects 64-bit Address ADMA2
-        */
-       ctrl = readb(&host->reg->hostctl);
-       ctrl &= ~TEGRA_MMC_HOSTCTL_DMASEL_MASK;
-       ctrl |= TEGRA_MMC_HOSTCTL_DMASEL_SDMA;
-       writeb(ctrl, &host->reg->hostctl);
-
-       /* We do not handle DMA boundaries, so set it to max (512 KiB) */
-       writew((7 << 12) | (data->blocksize & 0xFFF), &host->reg->blksize);
-       writew(data->blocks, &host->reg->blkcnt);
-}
-
-static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data)
-{
-       unsigned short mode;
-       debug(" mmc_set_transfer_mode called\n");
-       /*
-        * TRNMOD
-        * MUL1SIN0[5]  : Multi/Single Block Select
-        * RD1WT0[4]    : Data Transfer Direction Select
-        *      1 = read
-        *      0 = write
-        * ENACMD12[2]  : Auto CMD12 Enable
-        * ENBLKCNT[1]  : Block Count Enable
-        * ENDMA[0]     : DMA Enable
-        */
-       mode = (TEGRA_MMC_TRNMOD_DMA_ENABLE |
-               TEGRA_MMC_TRNMOD_BLOCK_COUNT_ENABLE);
-
-       if (data->blocks > 1)
-               mode |= TEGRA_MMC_TRNMOD_MULTI_BLOCK_SELECT;
-
-       if (data->flags & MMC_DATA_READ)
-               mode |= TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_READ;
-
-       if (data->flags & MMC_DATA_WRITE) {
-               if ((uintptr_t)data->src & (ARCH_DMA_MINALIGN - 1))
-                       printf("Warning: unaligned write to %p may fail\n",
-                              data->src);
-               flush_dcache_range((ulong)data->src, (ulong)data->src +
-                       data->blocks * data->blocksize);
-       }
-
-       writew(mode, &host->reg->trnmod);
-}
-
-static int mmc_wait_inhibit(struct mmc_host *host,
-                           struct mmc_cmd *cmd,
-                           struct mmc_data *data,
-                           unsigned int timeout)
-{
-       /*
-        * PRNSTS
-        * CMDINHDAT[1] : Command Inhibit (DAT)
-        * CMDINHCMD[0] : Command Inhibit (CMD)
-        */
-       unsigned int mask = TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD;
-
-       /*
-        * We shouldn't wait for data inhibit for stop commands, even
-        * though they might use busy signaling
-        */
-       if ((data == NULL) && (cmd->resp_type & MMC_RSP_BUSY))
-               mask |= TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT;
-
-       while (readl(&host->reg->prnsts) & mask) {
-               if (timeout == 0) {
-                       printf("%s: timeout error\n", __func__);
-                       return -1;
-               }
-               timeout--;
-               udelay(1000);
-       }
-
-       return 0;
-}
-
-static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
-                       struct mmc_data *data)
-{
-       struct mmc_host *host = (struct mmc_host *)mmc->priv;
-       int flags, i;
-       int result;
-       unsigned int mask = 0;
-       unsigned int retry = 0x100000;
-       debug(" mmc_send_cmd called\n");
-
-       result = mmc_wait_inhibit(host, cmd, data, 10 /* ms */);
-
-       if (result < 0)
-               return result;
-
-       if (data)
-               mmc_prepare_data(host, data);
-
-       debug("cmd->arg: %08x\n", cmd->cmdarg);
-       writel(cmd->cmdarg, &host->reg->argument);
-
-       if (data)
-               mmc_set_transfer_mode(host, data);
-
-       if ((cmd->resp_type & MMC_RSP_136) && (cmd->resp_type & MMC_RSP_BUSY))
-               return -1;
-
-       /*
-        * CMDREG
-        * CMDIDX[13:8] : Command index
-        * DATAPRNT[5]  : Data Present Select
-        * ENCMDIDX[4]  : Command Index Check Enable
-        * ENCMDCRC[3]  : Command CRC Check Enable
-        * RSPTYP[1:0]
-        *      00 = No Response
-        *      01 = Length 136
-        *      10 = Length 48
-        *      11 = Length 48 Check busy after response
-        */
-       if (!(cmd->resp_type & MMC_RSP_PRESENT))
-               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_NO_RESPONSE;
-       else if (cmd->resp_type & MMC_RSP_136)
-               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_136;
-       else if (cmd->resp_type & MMC_RSP_BUSY)
-               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48_BUSY;
-       else
-               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48;
-
-       if (cmd->resp_type & MMC_RSP_CRC)
-               flags |= TEGRA_MMC_TRNMOD_CMD_CRC_CHECK;
-       if (cmd->resp_type & MMC_RSP_OPCODE)
-               flags |= TEGRA_MMC_TRNMOD_CMD_INDEX_CHECK;
-       if (data)
-               flags |= TEGRA_MMC_TRNMOD_DATA_PRESENT_SELECT_DATA_TRANSFER;
-
-       debug("cmd: %d\n", cmd->cmdidx);
-
-       writew((cmd->cmdidx << 8) | flags, &host->reg->cmdreg);
-
-       for (i = 0; i < retry; i++) {
-               mask = readl(&host->reg->norintsts);
-               /* Command Complete */
-               if (mask & TEGRA_MMC_NORINTSTS_CMD_COMPLETE) {
-                       if (!data)
-                               writel(mask, &host->reg->norintsts);
-                       break;
-               }
-       }
-
-       if (i == retry) {
-               printf("%s: waiting for status update\n", __func__);
-               writel(mask, &host->reg->norintsts);
-               return TIMEOUT;
-       }
-
-       if (mask & TEGRA_MMC_NORINTSTS_CMD_TIMEOUT) {
-               /* Timeout Error */
-               debug("timeout: %08x cmd %d\n", mask, cmd->cmdidx);
-               writel(mask, &host->reg->norintsts);
-               return TIMEOUT;
-       } else if (mask & TEGRA_MMC_NORINTSTS_ERR_INTERRUPT) {
-               /* Error Interrupt */
-               debug("error: %08x cmd %d\n", mask, cmd->cmdidx);
-               writel(mask, &host->reg->norintsts);
-               return -1;
-       }
-
-       if (cmd->resp_type & MMC_RSP_PRESENT) {
-               if (cmd->resp_type & MMC_RSP_136) {
-                       /* CRC is stripped so we need to do some shifting. */
-                       for (i = 0; i < 4; i++) {
-                               unsigned int offset =
-                                       (unsigned int)(&host->reg->rspreg3 - i);
-                               cmd->response[i] = readl(offset) << 8;
-
-                               if (i != 3) {
-                                       cmd->response[i] |=
-                                               readb(offset - 1);
-                               }
-                               debug("cmd->resp[%d]: %08x\n",
-                                               i, cmd->response[i]);
-                       }
-               } else if (cmd->resp_type & MMC_RSP_BUSY) {
-                       for (i = 0; i < retry; i++) {
-                               /* PRNTDATA[23:20] : DAT[3:0] Line Signal */
-                               if (readl(&host->reg->prnsts)
-                                       & (1 << 20))    /* DAT[0] */
-                                       break;
-                       }
-
-                       if (i == retry) {
-                               printf("%s: card is still busy\n", __func__);
-                               writel(mask, &host->reg->norintsts);
-                               return TIMEOUT;
-                       }
-
-                       cmd->response[0] = readl(&host->reg->rspreg0);
-                       debug("cmd->resp[0]: %08x\n", cmd->response[0]);
-               } else {
-                       cmd->response[0] = readl(&host->reg->rspreg0);
-                       debug("cmd->resp[0]: %08x\n", cmd->response[0]);
-               }
-       }
-
-       if (data) {
-               unsigned long   start = get_timer(0);
-
-               while (1) {
-                       mask = readl(&host->reg->norintsts);
-
-                       if (mask & TEGRA_MMC_NORINTSTS_ERR_INTERRUPT) {
-                               /* Error Interrupt */
-                               writel(mask, &host->reg->norintsts);
-                               printf("%s: error during transfer: 0x%08x\n",
-                                               __func__, mask);
-                               return -1;
-                       } else if (mask & TEGRA_MMC_NORINTSTS_DMA_INTERRUPT) {
-                               /*
-                                * DMA Interrupt, restart the transfer where
-                                * it was interrupted.
-                                */
-                               unsigned int address = readl(&host->reg->sysad);
-
-                               debug("DMA end\n");
-                               writel(TEGRA_MMC_NORINTSTS_DMA_INTERRUPT,
-                                      &host->reg->norintsts);
-                               writel(address, &host->reg->sysad);
-                       } else if (mask & TEGRA_MMC_NORINTSTS_XFER_COMPLETE) {
-                               /* Transfer Complete */
-                               debug("r/w is done\n");
-                               break;
-                       } else if (get_timer(start) > 2000UL) {
-                               writel(mask, &host->reg->norintsts);
-                               printf("%s: MMC Timeout\n"
-                                      "    Interrupt status        0x%08x\n"
-                                      "    Interrupt status enable 0x%08x\n"
-                                      "    Interrupt signal enable 0x%08x\n"
-                                      "    Present status          0x%08x\n",
-                                      __func__, mask,
-                                      readl(&host->reg->norintstsen),
-                                      readl(&host->reg->norintsigen),
-                                      readl(&host->reg->prnsts));
-                               return -1;
-                       }
-               }
-               writel(mask, &host->reg->norintsts);
-               if (data->flags & MMC_DATA_READ) {
-                       if ((uintptr_t)data->dest & (ARCH_DMA_MINALIGN - 1))
-                               printf("Warning: unaligned read from %p "
-                                       "may fail\n", data->dest);
-                       invalidate_dcache_range((ulong)data->dest,
-                               (ulong)data->dest +
-                                       data->blocks * data->blocksize);
-               }
-       }
-
-       udelay(1000);
-       return 0;
-}
-
-static void mmc_change_clock(struct mmc_host *host, uint clock)
-{
-       int div;
-       unsigned short clk;
-       unsigned long timeout;
-
-       debug(" mmc_change_clock called\n");
-
-       /*
-        * Change Tegra2 SDMMCx clock divisor here. Source is 216MHz,
-        * PLLP_OUT0
-        */
-       if (clock == 0)
-               goto out;
-       clock_adjust_periph_pll_div(host->mmc_id, CLOCK_ID_PERIPH, clock,
-                                   &div);
-       debug("div = %d\n", div);
-
-       writew(0, &host->reg->clkcon);
-
-       /*
-        * CLKCON
-        * SELFREQ[15:8]        : base clock divided by value
-        * ENSDCLK[2]           : SD Clock Enable
-        * STBLINTCLK[1]        : Internal Clock Stable
-        * ENINTCLK[0]          : Internal Clock Enable
-        */
-       div >>= 1;
-       clk = ((div << TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_SHIFT) |
-              TEGRA_MMC_CLKCON_INTERNAL_CLOCK_ENABLE);
-       writew(clk, &host->reg->clkcon);
-
-       /* Wait max 10 ms */
-       timeout = 10;
-       while (!(readw(&host->reg->clkcon) &
-                TEGRA_MMC_CLKCON_INTERNAL_CLOCK_STABLE)) {
-               if (timeout == 0) {
-                       printf("%s: timeout error\n", __func__);
-                       return;
-               }
-               timeout--;
-               udelay(1000);
-       }
-
-       clk |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE;
-       writew(clk, &host->reg->clkcon);
-
-       debug("mmc_change_clock: clkcon = %08X\n", clk);
-
-out:
-       host->clock = clock;
-}
-
-static void mmc_set_ios(struct mmc *mmc)
-{
-       struct mmc_host *host = mmc->priv;
-       unsigned char ctrl;
-       debug(" mmc_set_ios called\n");
-
-       debug("bus_width: %x, clock: %d\n", mmc->bus_width, mmc->clock);
-
-       /* Change clock first */
-       mmc_change_clock(host, mmc->clock);
-
-       ctrl = readb(&host->reg->hostctl);
-
-       /*
-        * WIDE8[5]
-        * 0 = Depend on WIDE4
-        * 1 = 8-bit mode
-        * WIDE4[1]
-        * 1 = 4-bit mode
-        * 0 = 1-bit mode
-        */
-       if (mmc->bus_width == 8)
-               ctrl |= (1 << 5);
-       else if (mmc->bus_width == 4)
-               ctrl |= (1 << 1);
-       else
-               ctrl &= ~(1 << 1);
-
-       writeb(ctrl, &host->reg->hostctl);
-       debug("mmc_set_ios: hostctl = %08X\n", ctrl);
-}
-
-static void mmc_reset(struct mmc_host *host)
-{
-       unsigned int timeout;
-       debug(" mmc_reset called\n");
-
-       /*
-        * RSTALL[0] : Software reset for all
-        * 1 = reset
-        * 0 = work
-        */
-       writeb(TEGRA_MMC_SWRST_SW_RESET_FOR_ALL, &host->reg->swrst);
-
-       host->clock = 0;
-
-       /* Wait max 100 ms */
-       timeout = 100;
-
-       /* hw clears the bit when it's done */
-       while (readb(&host->reg->swrst) & TEGRA_MMC_SWRST_SW_RESET_FOR_ALL) {
-               if (timeout == 0) {
-                       printf("%s: timeout error\n", __func__);
-                       return;
-               }
-               timeout--;
-               udelay(1000);
-       }
-}
-
-static int mmc_core_init(struct mmc *mmc)
-{
-       struct mmc_host *host = (struct mmc_host *)mmc->priv;
-       unsigned int mask;
-       debug(" mmc_core_init called\n");
-
-       mmc_reset(host);
-
-       host->version = readw(&host->reg->hcver);
-       debug("host version = %x\n", host->version);
-
-       /* mask all */
-       writel(0xffffffff, &host->reg->norintstsen);
-       writel(0xffffffff, &host->reg->norintsigen);
-
-       writeb(0xe, &host->reg->timeoutcon);    /* TMCLK * 2^27 */
-       /*
-        * NORMAL Interrupt Status Enable Register init
-        * [5] ENSTABUFRDRDY : Buffer Read Ready Status Enable
-        * [4] ENSTABUFWTRDY : Buffer write Ready Status Enable
-        * [3] ENSTADMAINT   : DMA boundary interrupt
-        * [1] ENSTASTANSCMPLT : Transfre Complete Status Enable
-        * [0] ENSTACMDCMPLT : Command Complete Status Enable
-       */
-       mask = readl(&host->reg->norintstsen);
-       mask &= ~(0xffff);
-       mask |= (TEGRA_MMC_NORINTSTSEN_CMD_COMPLETE |
-                TEGRA_MMC_NORINTSTSEN_XFER_COMPLETE |
-                TEGRA_MMC_NORINTSTSEN_DMA_INTERRUPT |
-                TEGRA_MMC_NORINTSTSEN_BUFFER_WRITE_READY |
-                TEGRA_MMC_NORINTSTSEN_BUFFER_READ_READY);
-       writel(mask, &host->reg->norintstsen);
-
-       /*
-        * NORMAL Interrupt Signal Enable Register init
-        * [1] ENSTACMDCMPLT : Transfer Complete Signal Enable
-        */
-       mask = readl(&host->reg->norintsigen);
-       mask &= ~(0xffff);
-       mask |= TEGRA_MMC_NORINTSIGEN_XFER_COMPLETE;
-       writel(mask, &host->reg->norintsigen);
-
-       return 0;
-}
-
-int tegra2_mmc_getcd(struct mmc *mmc)
-{
-       struct mmc_host *host = (struct mmc_host *)mmc->priv;
-
-       debug("tegra2_mmc_getcd called\n");
-
-       if (host->cd_gpio >= 0)
-               return !gpio_get_value(host->cd_gpio);
-
-       return 1;
-}
-
-int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio)
-{
-       struct mmc_host *host;
-       char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
-       struct mmc *mmc;
-
-       debug(" tegra2_mmc_init: index %d, bus width %d "
-               "pwr_gpio %d cd_gpio %d\n",
-               dev_index, bus_width, pwr_gpio, cd_gpio);
-
-       host = &mmc_host[dev_index];
-
-       host->clock = 0;
-       host->pwr_gpio = pwr_gpio;
-       host->cd_gpio = cd_gpio;
-       tegra2_get_setup(host, dev_index);
-
-       clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
-
-       if (host->pwr_gpio >= 0) {
-               sprintf(gpusage, "SD/MMC%d PWR", dev_index);
-               gpio_request(host->pwr_gpio, gpusage);
-               gpio_direction_output(host->pwr_gpio, 1);
-       }
-
-       if (host->cd_gpio >= 0) {
-               sprintf(gpusage, "SD/MMC%d CD", dev_index);
-               gpio_request(host->cd_gpio, gpusage);
-               gpio_direction_input(host->cd_gpio);
-       }
-
-       mmc = &mmc_dev[dev_index];
-
-       sprintf(mmc->name, "Tegra2 SD/MMC");
-       mmc->priv = host;
-       mmc->send_cmd = mmc_send_cmd;
-       mmc->set_ios = mmc_set_ios;
-       mmc->init = mmc_core_init;
-       mmc->getcd = tegra2_mmc_getcd;
-
-       mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
-       if (bus_width == 8)
-               mmc->host_caps = MMC_MODE_8BIT;
-       else
-               mmc->host_caps = MMC_MODE_4BIT;
-       mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
-
-       /*
-        * min freq is for card identification, and is the highest
-        *  low-speed SDIO card frequency (actually 400KHz)
-        * max freq is highest HS eMMC clock as per the SD/MMC spec
-        *  (actually 52MHz)
-        * Both of these are the closest equivalents w/216MHz source
-        *  clock and Tegra2 SDMMC divisors.
-        */
-       mmc->f_min = 375000;
-       mmc->f_max = 48000000;
-
-       mmc_register(mmc);
-
-       return 0;
-}
diff --git a/drivers/mmc/tegra2_mmc.h b/drivers/mmc/tegra2_mmc.h
deleted file mode 100644 (file)
index 67c00db..0000000
+++ /dev/null
@@ -1,131 +0,0 @@
-/*
- * (C) Copyright 2009 SAMSUNG Electronics
- * Minkyu Kang <mk7.kang@samsung.com>
- * Portions Copyright (C) 2011 NVIDIA Corporation
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 2 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
- *
- */
-
-#ifndef __TEGRA2_MMC_H_
-#define __TEGRA2_MMC_H_
-
-#define TEGRA2_SDMMC1_BASE     0xC8000000
-#define TEGRA2_SDMMC2_BASE     0xC8000200
-#define TEGRA2_SDMMC3_BASE     0xC8000400
-#define TEGRA2_SDMMC4_BASE     0xC8000600
-
-#ifndef __ASSEMBLY__
-struct tegra2_mmc {
-       unsigned int    sysad;          /* _SYSTEM_ADDRESS_0 */
-       unsigned short  blksize;        /* _BLOCK_SIZE_BLOCK_COUNT_0 15:00 */
-       unsigned short  blkcnt;         /* _BLOCK_SIZE_BLOCK_COUNT_0 31:16 */
-       unsigned int    argument;       /* _ARGUMENT_0 */
-       unsigned short  trnmod;         /* _CMD_XFER_MODE_0 15:00 xfer mode */
-       unsigned short  cmdreg;         /* _CMD_XFER_MODE_0 31:16 cmd reg */
-       unsigned int    rspreg0;        /* _RESPONSE_R0_R1_0 CMD RESP 31:00 */
-       unsigned int    rspreg1;        /* _RESPONSE_R2_R3_0 CMD RESP 63:32 */
-       unsigned int    rspreg2;        /* _RESPONSE_R4_R5_0 CMD RESP 95:64 */
-       unsigned int    rspreg3;        /* _RESPONSE_R6_R7_0 CMD RESP 127:96 */
-       unsigned int    bdata;          /* _BUFFER_DATA_PORT_0 */
-       unsigned int    prnsts;         /* _PRESENT_STATE_0 */
-       unsigned char   hostctl;        /* _POWER_CONTROL_HOST_0 7:00 */
-       unsigned char   pwrcon;         /* _POWER_CONTROL_HOST_0 15:8 */
-       unsigned char   blkgap;         /* _POWER_CONTROL_HOST_9 23:16 */
-       unsigned char   wakcon;         /* _POWER_CONTROL_HOST_0 31:24 */
-       unsigned short  clkcon;         /* _CLOCK_CONTROL_0 15:00 */
-       unsigned char   timeoutcon;     /* _TIMEOUT_CTRL 23:16 */
-       unsigned char   swrst;          /* _SW_RESET_ 31:24 */
-       unsigned int    norintsts;      /* _INTERRUPT_STATUS_0 */
-       unsigned int    norintstsen;    /* _INTERRUPT_STATUS_ENABLE_0 */
-       unsigned int    norintsigen;    /* _INTERRUPT_SIGNAL_ENABLE_0 */
-       unsigned short  acmd12errsts;   /* _AUTO_CMD12_ERR_STATUS_0 15:00 */
-       unsigned char   res1[2];        /* _RESERVED 31:16 */
-       unsigned int    capareg;        /* _CAPABILITIES_0 */
-       unsigned char   res2[4];        /* RESERVED, offset 44h-47h */
-       unsigned int    maxcurr;        /* _MAXIMUM_CURRENT_0 */
-       unsigned char   res3[4];        /* RESERVED, offset 4Ch-4Fh */
-       unsigned short  setacmd12err;   /* offset 50h */
-       unsigned short  setinterr;      /* offset 52h */
-       unsigned char   admaerr;        /* offset 54h */
-       unsigned char   res4[3];        /* RESERVED, offset 55h-57h */
-       unsigned long   admaaddr;       /* offset 58h-5Fh */
-       unsigned char   res5[0x9c];     /* RESERVED, offset 60h-FBh */
-       unsigned short  slotintstatus;  /* offset FCh */
-       unsigned short  hcver;          /* HOST Version */
-       unsigned char   res6[0x100];    /* RESERVED, offset 100h-1FFh */
-};
-
-#define TEGRA_MMC_HOSTCTL_DMASEL_MASK                          (3 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_SDMA                          (0 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_32BIT                   (2 << 3)
-#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_64BIT                   (3 << 3)
-
-#define TEGRA_MMC_TRNMOD_DMA_ENABLE                            (1 << 0)
-#define TEGRA_MMC_TRNMOD_BLOCK_COUNT_ENABLE                    (1 << 1)
-#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_WRITE               (0 << 4)
-#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_READ                        (1 << 4)
-#define TEGRA_MMC_TRNMOD_MULTI_BLOCK_SELECT                    (1 << 5)
-
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_MASK                 (3 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_NO_RESPONSE          (0 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_136           (1 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48            (2 << 0)
-#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48_BUSY       (3 << 0)
-
-#define TEGRA_MMC_TRNMOD_CMD_CRC_CHECK                         (1 << 3)
-#define TEGRA_MMC_TRNMOD_CMD_INDEX_CHECK                       (1 << 4)
-#define TEGRA_MMC_TRNMOD_DATA_PRESENT_SELECT_DATA_TRANSFER     (1 << 5)
-
-#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD                       (1 << 0)
-#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT                       (1 << 1)
-
-#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_ENABLE                 (1 << 0)
-#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_STABLE                 (1 << 1)
-#define TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE                       (1 << 2)
-
-#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_SHIFT                  8
-#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_MASK                   (0xff << 8)
-
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_ALL                       (1 << 0)
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_CMD_LINE                  (1 << 1)
-#define TEGRA_MMC_SWRST_SW_RESET_FOR_DAT_LINE                  (1 << 2)
-
-#define TEGRA_MMC_NORINTSTS_CMD_COMPLETE                       (1 << 0)
-#define TEGRA_MMC_NORINTSTS_XFER_COMPLETE                      (1 << 1)
-#define TEGRA_MMC_NORINTSTS_DMA_INTERRUPT                      (1 << 3)
-#define TEGRA_MMC_NORINTSTS_ERR_INTERRUPT                      (1 << 15)
-#define TEGRA_MMC_NORINTSTS_CMD_TIMEOUT                                (1 << 16)
-
-#define TEGRA_MMC_NORINTSTSEN_CMD_COMPLETE                     (1 << 0)
-#define TEGRA_MMC_NORINTSTSEN_XFER_COMPLETE                    (1 << 1)
-#define TEGRA_MMC_NORINTSTSEN_DMA_INTERRUPT                    (1 << 3)
-#define TEGRA_MMC_NORINTSTSEN_BUFFER_WRITE_READY               (1 << 4)
-#define TEGRA_MMC_NORINTSTSEN_BUFFER_READ_READY                        (1 << 5)
-
-#define TEGRA_MMC_NORINTSIGEN_XFER_COMPLETE                    (1 << 1)
-
-struct mmc_host {
-       struct tegra2_mmc *reg;
-       unsigned int version;   /* SDHCI spec. version */
-       unsigned int clock;     /* Current clock (MHz) */
-       unsigned int base;      /* Base address, SDMMC1/2/3/4 */
-       enum periph_id mmc_id;  /* Peripheral ID: PERIPH_ID_... */
-       int pwr_gpio;           /* Power GPIO */
-       int cd_gpio;            /* Change Detect GPIO */
-};
-
-#endif /* __ASSEMBLY__ */
-#endif /* __TEGRA2_MMC_H_ */
diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
new file mode 100644 (file)
index 0000000..29bf583
--- /dev/null
@@ -0,0 +1,570 @@
+/*
+ * (C) Copyright 2009 SAMSUNG Electronics
+ * Minkyu Kang <mk7.kang@samsung.com>
+ * Jaehoon Chung <jh80.chung@samsung.com>
+ * Portions Copyright 2011-2012 NVIDIA Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+
+#include <common.h>
+#include <mmc.h>
+#include <asm/gpio.h>
+#include <asm/io.h>
+#include <asm/arch/clk_rst.h>
+#include <asm/arch/clock.h>
+#include "tegra_mmc.h"
+
+/* support 4 mmc hosts */
+struct mmc mmc_dev[4];
+struct mmc_host mmc_host[4];
+
+
+/**
+ * Get the host address and peripheral ID for a device. Devices are numbered
+ * from 0 to 3.
+ *
+ * @param host         Structure to fill in (base, reg, mmc_id)
+ * @param dev_index    Device index (0-3)
+ */
+static void tegra2_get_setup(struct mmc_host *host, int dev_index)
+{
+       debug("tegra2_get_base_mmc: dev_index = %d\n", dev_index);
+
+       switch (dev_index) {
+       case 1:
+               host->base = TEGRA2_SDMMC3_BASE;
+               host->mmc_id = PERIPH_ID_SDMMC3;
+               break;
+       case 2:
+               host->base = TEGRA2_SDMMC2_BASE;
+               host->mmc_id = PERIPH_ID_SDMMC2;
+               break;
+       case 3:
+               host->base = TEGRA2_SDMMC1_BASE;
+               host->mmc_id = PERIPH_ID_SDMMC1;
+               break;
+       case 0:
+       default:
+               host->base = TEGRA2_SDMMC4_BASE;
+               host->mmc_id = PERIPH_ID_SDMMC4;
+               break;
+       }
+
+       host->reg = (struct tegra2_mmc *)host->base;
+}
+
+static void mmc_prepare_data(struct mmc_host *host, struct mmc_data *data)
+{
+       unsigned char ctrl;
+
+       debug("data->dest: %08X, data->blocks: %u, data->blocksize: %u\n",
+       (u32)data->dest, data->blocks, data->blocksize);
+
+       writel((u32)data->dest, &host->reg->sysad);
+       /*
+        * DMASEL[4:3]
+        * 00 = Selects SDMA
+        * 01 = Reserved
+        * 10 = Selects 32-bit Address ADMA2
+        * 11 = Selects 64-bit Address ADMA2
+        */
+       ctrl = readb(&host->reg->hostctl);
+       ctrl &= ~TEGRA_MMC_HOSTCTL_DMASEL_MASK;
+       ctrl |= TEGRA_MMC_HOSTCTL_DMASEL_SDMA;
+       writeb(ctrl, &host->reg->hostctl);
+
+       /* We do not handle DMA boundaries, so set it to max (512 KiB) */
+       writew((7 << 12) | (data->blocksize & 0xFFF), &host->reg->blksize);
+       writew(data->blocks, &host->reg->blkcnt);
+}
+
+static void mmc_set_transfer_mode(struct mmc_host *host, struct mmc_data *data)
+{
+       unsigned short mode;
+       debug(" mmc_set_transfer_mode called\n");
+       /*
+        * TRNMOD
+        * MUL1SIN0[5]  : Multi/Single Block Select
+        * RD1WT0[4]    : Data Transfer Direction Select
+        *      1 = read
+        *      0 = write
+        * ENACMD12[2]  : Auto CMD12 Enable
+        * ENBLKCNT[1]  : Block Count Enable
+        * ENDMA[0]     : DMA Enable
+        */
+       mode = (TEGRA_MMC_TRNMOD_DMA_ENABLE |
+               TEGRA_MMC_TRNMOD_BLOCK_COUNT_ENABLE);
+
+       if (data->blocks > 1)
+               mode |= TEGRA_MMC_TRNMOD_MULTI_BLOCK_SELECT;
+
+       if (data->flags & MMC_DATA_READ)
+               mode |= TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_READ;
+
+       if (data->flags & MMC_DATA_WRITE) {
+               if ((uintptr_t)data->src & (ARCH_DMA_MINALIGN - 1))
+                       printf("Warning: unaligned write to %p may fail\n",
+                              data->src);
+               flush_dcache_range((ulong)data->src, (ulong)data->src +
+                       data->blocks * data->blocksize);
+       }
+
+       writew(mode, &host->reg->trnmod);
+}
+
+static int mmc_wait_inhibit(struct mmc_host *host,
+                           struct mmc_cmd *cmd,
+                           struct mmc_data *data,
+                           unsigned int timeout)
+{
+       /*
+        * PRNSTS
+        * CMDINHDAT[1] : Command Inhibit (DAT)
+        * CMDINHCMD[0] : Command Inhibit (CMD)
+        */
+       unsigned int mask = TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD;
+
+       /*
+        * We shouldn't wait for data inhibit for stop commands, even
+        * though they might use busy signaling
+        */
+       if ((data == NULL) && (cmd->resp_type & MMC_RSP_BUSY))
+               mask |= TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT;
+
+       while (readl(&host->reg->prnsts) & mask) {
+               if (timeout == 0) {
+                       printf("%s: timeout error\n", __func__);
+                       return -1;
+               }
+               timeout--;
+               udelay(1000);
+       }
+
+       return 0;
+}
+
+static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
+                       struct mmc_data *data)
+{
+       struct mmc_host *host = (struct mmc_host *)mmc->priv;
+       int flags, i;
+       int result;
+       unsigned int mask = 0;
+       unsigned int retry = 0x100000;
+       debug(" mmc_send_cmd called\n");
+
+       result = mmc_wait_inhibit(host, cmd, data, 10 /* ms */);
+
+       if (result < 0)
+               return result;
+
+       if (data)
+               mmc_prepare_data(host, data);
+
+       debug("cmd->arg: %08x\n", cmd->cmdarg);
+       writel(cmd->cmdarg, &host->reg->argument);
+
+       if (data)
+               mmc_set_transfer_mode(host, data);
+
+       if ((cmd->resp_type & MMC_RSP_136) && (cmd->resp_type & MMC_RSP_BUSY))
+               return -1;
+
+       /*
+        * CMDREG
+        * CMDIDX[13:8] : Command index
+        * DATAPRNT[5]  : Data Present Select
+        * ENCMDIDX[4]  : Command Index Check Enable
+        * ENCMDCRC[3]  : Command CRC Check Enable
+        * RSPTYP[1:0]
+        *      00 = No Response
+        *      01 = Length 136
+        *      10 = Length 48
+        *      11 = Length 48 Check busy after response
+        */
+       if (!(cmd->resp_type & MMC_RSP_PRESENT))
+               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_NO_RESPONSE;
+       else if (cmd->resp_type & MMC_RSP_136)
+               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_136;
+       else if (cmd->resp_type & MMC_RSP_BUSY)
+               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48_BUSY;
+       else
+               flags = TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48;
+
+       if (cmd->resp_type & MMC_RSP_CRC)
+               flags |= TEGRA_MMC_TRNMOD_CMD_CRC_CHECK;
+       if (cmd->resp_type & MMC_RSP_OPCODE)
+               flags |= TEGRA_MMC_TRNMOD_CMD_INDEX_CHECK;
+       if (data)
+               flags |= TEGRA_MMC_TRNMOD_DATA_PRESENT_SELECT_DATA_TRANSFER;
+
+       debug("cmd: %d\n", cmd->cmdidx);
+
+       writew((cmd->cmdidx << 8) | flags, &host->reg->cmdreg);
+
+       for (i = 0; i < retry; i++) {
+               mask = readl(&host->reg->norintsts);
+               /* Command Complete */
+               if (mask & TEGRA_MMC_NORINTSTS_CMD_COMPLETE) {
+                       if (!data)
+                               writel(mask, &host->reg->norintsts);
+                       break;
+               }
+       }
+
+       if (i == retry) {
+               printf("%s: waiting for status update\n", __func__);
+               writel(mask, &host->reg->norintsts);
+               return TIMEOUT;
+       }
+
+       if (mask & TEGRA_MMC_NORINTSTS_CMD_TIMEOUT) {
+               /* Timeout Error */
+               debug("timeout: %08x cmd %d\n", mask, cmd->cmdidx);
+               writel(mask, &host->reg->norintsts);
+               return TIMEOUT;
+       } else if (mask & TEGRA_MMC_NORINTSTS_ERR_INTERRUPT) {
+               /* Error Interrupt */
+               debug("error: %08x cmd %d\n", mask, cmd->cmdidx);
+               writel(mask, &host->reg->norintsts);
+               return -1;
+       }
+
+       if (cmd->resp_type & MMC_RSP_PRESENT) {
+               if (cmd->resp_type & MMC_RSP_136) {
+                       /* CRC is stripped so we need to do some shifting. */
+                       for (i = 0; i < 4; i++) {
+                               unsigned int offset =
+                                       (unsigned int)(&host->reg->rspreg3 - i);
+                               cmd->response[i] = readl(offset) << 8;
+
+                               if (i != 3) {
+                                       cmd->response[i] |=
+                                               readb(offset - 1);
+                               }
+                               debug("cmd->resp[%d]: %08x\n",
+                                               i, cmd->response[i]);
+                       }
+               } else if (cmd->resp_type & MMC_RSP_BUSY) {
+                       for (i = 0; i < retry; i++) {
+                               /* PRNTDATA[23:20] : DAT[3:0] Line Signal */
+                               if (readl(&host->reg->prnsts)
+                                       & (1 << 20))    /* DAT[0] */
+                                       break;
+                       }
+
+                       if (i == retry) {
+                               printf("%s: card is still busy\n", __func__);
+                               writel(mask, &host->reg->norintsts);
+                               return TIMEOUT;
+                       }
+
+                       cmd->response[0] = readl(&host->reg->rspreg0);
+                       debug("cmd->resp[0]: %08x\n", cmd->response[0]);
+               } else {
+                       cmd->response[0] = readl(&host->reg->rspreg0);
+                       debug("cmd->resp[0]: %08x\n", cmd->response[0]);
+               }
+       }
+
+       if (data) {
+               unsigned long   start = get_timer(0);
+
+               while (1) {
+                       mask = readl(&host->reg->norintsts);
+
+                       if (mask & TEGRA_MMC_NORINTSTS_ERR_INTERRUPT) {
+                               /* Error Interrupt */
+                               writel(mask, &host->reg->norintsts);
+                               printf("%s: error during transfer: 0x%08x\n",
+                                               __func__, mask);
+                               return -1;
+                       } else if (mask & TEGRA_MMC_NORINTSTS_DMA_INTERRUPT) {
+                               /*
+                                * DMA Interrupt, restart the transfer where
+                                * it was interrupted.
+                                */
+                               unsigned int address = readl(&host->reg->sysad);
+
+                               debug("DMA end\n");
+                               writel(TEGRA_MMC_NORINTSTS_DMA_INTERRUPT,
+                                      &host->reg->norintsts);
+                               writel(address, &host->reg->sysad);
+                       } else if (mask & TEGRA_MMC_NORINTSTS_XFER_COMPLETE) {
+                               /* Transfer Complete */
+                               debug("r/w is done\n");
+                               break;
+                       } else if (get_timer(start) > 2000UL) {
+                               writel(mask, &host->reg->norintsts);
+                               printf("%s: MMC Timeout\n"
+                                      "    Interrupt status        0x%08x\n"
+                                      "    Interrupt status enable 0x%08x\n"
+                                      "    Interrupt signal enable 0x%08x\n"
+                                      "    Present status          0x%08x\n",
+                                      __func__, mask,
+                                      readl(&host->reg->norintstsen),
+                                      readl(&host->reg->norintsigen),
+                                      readl(&host->reg->prnsts));
+                               return -1;
+                       }
+               }
+               writel(mask, &host->reg->norintsts);
+               if (data->flags & MMC_DATA_READ) {
+                       if ((uintptr_t)data->dest & (ARCH_DMA_MINALIGN - 1))
+                               printf("Warning: unaligned read from %p "
+                                       "may fail\n", data->dest);
+                       invalidate_dcache_range((ulong)data->dest,
+                               (ulong)data->dest +
+                                       data->blocks * data->blocksize);
+               }
+       }
+
+       udelay(1000);
+       return 0;
+}
+
+static void mmc_change_clock(struct mmc_host *host, uint clock)
+{
+       int div;
+       unsigned short clk;
+       unsigned long timeout;
+
+       debug(" mmc_change_clock called\n");
+
+       /*
+        * Change Tegra2 SDMMCx clock divisor here. Source is 216MHz,
+        * PLLP_OUT0
+        */
+       if (clock == 0)
+               goto out;
+       clock_adjust_periph_pll_div(host->mmc_id, CLOCK_ID_PERIPH, clock,
+                                   &div);
+       debug("div = %d\n", div);
+
+       writew(0, &host->reg->clkcon);
+
+       /*
+        * CLKCON
+        * SELFREQ[15:8]        : base clock divided by value
+        * ENSDCLK[2]           : SD Clock Enable
+        * STBLINTCLK[1]        : Internal Clock Stable
+        * ENINTCLK[0]          : Internal Clock Enable
+        */
+       div >>= 1;
+       clk = ((div << TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_SHIFT) |
+              TEGRA_MMC_CLKCON_INTERNAL_CLOCK_ENABLE);
+       writew(clk, &host->reg->clkcon);
+
+       /* Wait max 10 ms */
+       timeout = 10;
+       while (!(readw(&host->reg->clkcon) &
+                TEGRA_MMC_CLKCON_INTERNAL_CLOCK_STABLE)) {
+               if (timeout == 0) {
+                       printf("%s: timeout error\n", __func__);
+                       return;
+               }
+               timeout--;
+               udelay(1000);
+       }
+
+       clk |= TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE;
+       writew(clk, &host->reg->clkcon);
+
+       debug("mmc_change_clock: clkcon = %08X\n", clk);
+
+out:
+       host->clock = clock;
+}
+
+static void mmc_set_ios(struct mmc *mmc)
+{
+       struct mmc_host *host = mmc->priv;
+       unsigned char ctrl;
+       debug(" mmc_set_ios called\n");
+
+       debug("bus_width: %x, clock: %d\n", mmc->bus_width, mmc->clock);
+
+       /* Change clock first */
+       mmc_change_clock(host, mmc->clock);
+
+       ctrl = readb(&host->reg->hostctl);
+
+       /*
+        * WIDE8[5]
+        * 0 = Depend on WIDE4
+        * 1 = 8-bit mode
+        * WIDE4[1]
+        * 1 = 4-bit mode
+        * 0 = 1-bit mode
+        */
+       if (mmc->bus_width == 8)
+               ctrl |= (1 << 5);
+       else if (mmc->bus_width == 4)
+               ctrl |= (1 << 1);
+       else
+               ctrl &= ~(1 << 1);
+
+       writeb(ctrl, &host->reg->hostctl);
+       debug("mmc_set_ios: hostctl = %08X\n", ctrl);
+}
+
+static void mmc_reset(struct mmc_host *host)
+{
+       unsigned int timeout;
+       debug(" mmc_reset called\n");
+
+       /*
+        * RSTALL[0] : Software reset for all
+        * 1 = reset
+        * 0 = work
+        */
+       writeb(TEGRA_MMC_SWRST_SW_RESET_FOR_ALL, &host->reg->swrst);
+
+       host->clock = 0;
+
+       /* Wait max 100 ms */
+       timeout = 100;
+
+       /* hw clears the bit when it's done */
+       while (readb(&host->reg->swrst) & TEGRA_MMC_SWRST_SW_RESET_FOR_ALL) {
+               if (timeout == 0) {
+                       printf("%s: timeout error\n", __func__);
+                       return;
+               }
+               timeout--;
+               udelay(1000);
+       }
+}
+
+static int mmc_core_init(struct mmc *mmc)
+{
+       struct mmc_host *host = (struct mmc_host *)mmc->priv;
+       unsigned int mask;
+       debug(" mmc_core_init called\n");
+
+       mmc_reset(host);
+
+       host->version = readw(&host->reg->hcver);
+       debug("host version = %x\n", host->version);
+
+       /* mask all */
+       writel(0xffffffff, &host->reg->norintstsen);
+       writel(0xffffffff, &host->reg->norintsigen);
+
+       writeb(0xe, &host->reg->timeoutcon);    /* TMCLK * 2^27 */
+       /*
+        * NORMAL Interrupt Status Enable Register init
+        * [5] ENSTABUFRDRDY : Buffer Read Ready Status Enable
+        * [4] ENSTABUFWTRDY : Buffer write Ready Status Enable
+        * [3] ENSTADMAINT   : DMA boundary interrupt
+        * [1] ENSTASTANSCMPLT : Transfre Complete Status Enable
+        * [0] ENSTACMDCMPLT : Command Complete Status Enable
+       */
+       mask = readl(&host->reg->norintstsen);
+       mask &= ~(0xffff);
+       mask |= (TEGRA_MMC_NORINTSTSEN_CMD_COMPLETE |
+                TEGRA_MMC_NORINTSTSEN_XFER_COMPLETE |
+                TEGRA_MMC_NORINTSTSEN_DMA_INTERRUPT |
+                TEGRA_MMC_NORINTSTSEN_BUFFER_WRITE_READY |
+                TEGRA_MMC_NORINTSTSEN_BUFFER_READ_READY);
+       writel(mask, &host->reg->norintstsen);
+
+       /*
+        * NORMAL Interrupt Signal Enable Register init
+        * [1] ENSTACMDCMPLT : Transfer Complete Signal Enable
+        */
+       mask = readl(&host->reg->norintsigen);
+       mask &= ~(0xffff);
+       mask |= TEGRA_MMC_NORINTSIGEN_XFER_COMPLETE;
+       writel(mask, &host->reg->norintsigen);
+
+       return 0;
+}
+
+int tegra2_mmc_getcd(struct mmc *mmc)
+{
+       struct mmc_host *host = (struct mmc_host *)mmc->priv;
+
+       debug("tegra2_mmc_getcd called\n");
+
+       if (host->cd_gpio >= 0)
+               return !gpio_get_value(host->cd_gpio);
+
+       return 1;
+}
+
+int tegra2_mmc_init(int dev_index, int bus_width, int pwr_gpio, int cd_gpio)
+{
+       struct mmc_host *host;
+       char gpusage[12]; /* "SD/MMCn PWR" or "SD/MMCn CD" */
+       struct mmc *mmc;
+
+       debug(" tegra2_mmc_init: index %d, bus width %d "
+               "pwr_gpio %d cd_gpio %d\n",
+               dev_index, bus_width, pwr_gpio, cd_gpio);
+
+       host = &mmc_host[dev_index];
+
+       host->clock = 0;
+       host->pwr_gpio = pwr_gpio;
+       host->cd_gpio = cd_gpio;
+       tegra2_get_setup(host, dev_index);
+
+       clock_start_periph_pll(host->mmc_id, CLOCK_ID_PERIPH, 20000000);
+
+       if (host->pwr_gpio >= 0) {
+               sprintf(gpusage, "SD/MMC%d PWR", dev_index);
+               gpio_request(host->pwr_gpio, gpusage);
+               gpio_direction_output(host->pwr_gpio, 1);
+       }
+
+       if (host->cd_gpio >= 0) {
+               sprintf(gpusage, "SD/MMC%d CD", dev_index);
+               gpio_request(host->cd_gpio, gpusage);
+               gpio_direction_input(host->cd_gpio);
+       }
+
+       mmc = &mmc_dev[dev_index];
+
+       sprintf(mmc->name, "Tegra2 SD/MMC");
+       mmc->priv = host;
+       mmc->send_cmd = mmc_send_cmd;
+       mmc->set_ios = mmc_set_ios;
+       mmc->init = mmc_core_init;
+       mmc->getcd = tegra2_mmc_getcd;
+
+       mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
+       if (bus_width == 8)
+               mmc->host_caps = MMC_MODE_8BIT;
+       else
+               mmc->host_caps = MMC_MODE_4BIT;
+       mmc->host_caps |= MMC_MODE_HS_52MHz | MMC_MODE_HS | MMC_MODE_HC;
+
+       /*
+        * min freq is for card identification, and is the highest
+        *  low-speed SDIO card frequency (actually 400KHz)
+        * max freq is highest HS eMMC clock as per the SD/MMC spec
+        *  (actually 52MHz)
+        * Both of these are the closest equivalents w/216MHz source
+        *  clock and Tegra2 SDMMC divisors.
+        */
+       mmc->f_min = 375000;
+       mmc->f_max = 48000000;
+
+       mmc_register(mmc);
+
+       return 0;
+}
diff --git a/drivers/mmc/tegra_mmc.h b/drivers/mmc/tegra_mmc.h
new file mode 100644 (file)
index 0000000..f9cdcaa
--- /dev/null
@@ -0,0 +1,131 @@
+/*
+ * (C) Copyright 2009 SAMSUNG Electronics
+ * Minkyu Kang <mk7.kang@samsung.com>
+ * Portions Copyright (C) 2011-2012 NVIDIA Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+#ifndef __TEGRA_MMC_H_
+#define __TEGRA_MMC_H_
+
+#define TEGRA2_SDMMC1_BASE     0xC8000000
+#define TEGRA2_SDMMC2_BASE     0xC8000200
+#define TEGRA2_SDMMC3_BASE     0xC8000400
+#define TEGRA2_SDMMC4_BASE     0xC8000600
+
+#ifndef __ASSEMBLY__
+struct tegra2_mmc {
+       unsigned int    sysad;          /* _SYSTEM_ADDRESS_0 */
+       unsigned short  blksize;        /* _BLOCK_SIZE_BLOCK_COUNT_0 15:00 */
+       unsigned short  blkcnt;         /* _BLOCK_SIZE_BLOCK_COUNT_0 31:16 */
+       unsigned int    argument;       /* _ARGUMENT_0 */
+       unsigned short  trnmod;         /* _CMD_XFER_MODE_0 15:00 xfer mode */
+       unsigned short  cmdreg;         /* _CMD_XFER_MODE_0 31:16 cmd reg */
+       unsigned int    rspreg0;        /* _RESPONSE_R0_R1_0 CMD RESP 31:00 */
+       unsigned int    rspreg1;        /* _RESPONSE_R2_R3_0 CMD RESP 63:32 */
+       unsigned int    rspreg2;        /* _RESPONSE_R4_R5_0 CMD RESP 95:64 */
+       unsigned int    rspreg3;        /* _RESPONSE_R6_R7_0 CMD RESP 127:96 */
+       unsigned int    bdata;          /* _BUFFER_DATA_PORT_0 */
+       unsigned int    prnsts;         /* _PRESENT_STATE_0 */
+       unsigned char   hostctl;        /* _POWER_CONTROL_HOST_0 7:00 */
+       unsigned char   pwrcon;         /* _POWER_CONTROL_HOST_0 15:8 */
+       unsigned char   blkgap;         /* _POWER_CONTROL_HOST_9 23:16 */
+       unsigned char   wakcon;         /* _POWER_CONTROL_HOST_0 31:24 */
+       unsigned short  clkcon;         /* _CLOCK_CONTROL_0 15:00 */
+       unsigned char   timeoutcon;     /* _TIMEOUT_CTRL 23:16 */
+       unsigned char   swrst;          /* _SW_RESET_ 31:24 */
+       unsigned int    norintsts;      /* _INTERRUPT_STATUS_0 */
+       unsigned int    norintstsen;    /* _INTERRUPT_STATUS_ENABLE_0 */
+       unsigned int    norintsigen;    /* _INTERRUPT_SIGNAL_ENABLE_0 */
+       unsigned short  acmd12errsts;   /* _AUTO_CMD12_ERR_STATUS_0 15:00 */
+       unsigned char   res1[2];        /* _RESERVED 31:16 */
+       unsigned int    capareg;        /* _CAPABILITIES_0 */
+       unsigned char   res2[4];        /* RESERVED, offset 44h-47h */
+       unsigned int    maxcurr;        /* _MAXIMUM_CURRENT_0 */
+       unsigned char   res3[4];        /* RESERVED, offset 4Ch-4Fh */
+       unsigned short  setacmd12err;   /* offset 50h */
+       unsigned short  setinterr;      /* offset 52h */
+       unsigned char   admaerr;        /* offset 54h */
+       unsigned char   res4[3];        /* RESERVED, offset 55h-57h */
+       unsigned long   admaaddr;       /* offset 58h-5Fh */
+       unsigned char   res5[0x9c];     /* RESERVED, offset 60h-FBh */
+       unsigned short  slotintstatus;  /* offset FCh */
+       unsigned short  hcver;          /* HOST Version */
+       unsigned char   res6[0x100];    /* RESERVED, offset 100h-1FFh */
+};
+
+#define TEGRA_MMC_HOSTCTL_DMASEL_MASK                          (3 << 3)
+#define TEGRA_MMC_HOSTCTL_DMASEL_SDMA                          (0 << 3)
+#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_32BIT                   (2 << 3)
+#define TEGRA_MMC_HOSTCTL_DMASEL_ADMA2_64BIT                   (3 << 3)
+
+#define TEGRA_MMC_TRNMOD_DMA_ENABLE                            (1 << 0)
+#define TEGRA_MMC_TRNMOD_BLOCK_COUNT_ENABLE                    (1 << 1)
+#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_WRITE               (0 << 4)
+#define TEGRA_MMC_TRNMOD_DATA_XFER_DIR_SEL_READ                        (1 << 4)
+#define TEGRA_MMC_TRNMOD_MULTI_BLOCK_SELECT                    (1 << 5)
+
+#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_MASK                 (3 << 0)
+#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_NO_RESPONSE          (0 << 0)
+#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_136           (1 << 0)
+#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48            (2 << 0)
+#define TEGRA_MMC_CMDREG_RESP_TYPE_SELECT_LENGTH_48_BUSY       (3 << 0)
+
+#define TEGRA_MMC_TRNMOD_CMD_CRC_CHECK                         (1 << 3)
+#define TEGRA_MMC_TRNMOD_CMD_INDEX_CHECK                       (1 << 4)
+#define TEGRA_MMC_TRNMOD_DATA_PRESENT_SELECT_DATA_TRANSFER     (1 << 5)
+
+#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_CMD                       (1 << 0)
+#define TEGRA_MMC_PRNSTS_CMD_INHIBIT_DAT                       (1 << 1)
+
+#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_ENABLE                 (1 << 0)
+#define TEGRA_MMC_CLKCON_INTERNAL_CLOCK_STABLE                 (1 << 1)
+#define TEGRA_MMC_CLKCON_SD_CLOCK_ENABLE                       (1 << 2)
+
+#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_SHIFT                  8
+#define TEGRA_MMC_CLKCON_SDCLK_FREQ_SEL_MASK                   (0xff << 8)
+
+#define TEGRA_MMC_SWRST_SW_RESET_FOR_ALL                       (1 << 0)
+#define TEGRA_MMC_SWRST_SW_RESET_FOR_CMD_LINE                  (1 << 1)
+#define TEGRA_MMC_SWRST_SW_RESET_FOR_DAT_LINE                  (1 << 2)
+
+#define TEGRA_MMC_NORINTSTS_CMD_COMPLETE                       (1 << 0)
+#define TEGRA_MMC_NORINTSTS_XFER_COMPLETE                      (1 << 1)
+#define TEGRA_MMC_NORINTSTS_DMA_INTERRUPT                      (1 << 3)
+#define TEGRA_MMC_NORINTSTS_ERR_INTERRUPT                      (1 << 15)
+#define TEGRA_MMC_NORINTSTS_CMD_TIMEOUT                                (1 << 16)
+
+#define TEGRA_MMC_NORINTSTSEN_CMD_COMPLETE                     (1 << 0)
+#define TEGRA_MMC_NORINTSTSEN_XFER_COMPLETE                    (1 << 1)
+#define TEGRA_MMC_NORINTSTSEN_DMA_INTERRUPT                    (1 << 3)
+#define TEGRA_MMC_NORINTSTSEN_BUFFER_WRITE_READY               (1 << 4)
+#define TEGRA_MMC_NORINTSTSEN_BUFFER_READ_READY                        (1 << 5)
+
+#define TEGRA_MMC_NORINTSIGEN_XFER_COMPLETE                    (1 << 1)
+
+struct mmc_host {
+       struct tegra2_mmc *reg;
+       unsigned int version;   /* SDHCI spec. version */
+       unsigned int clock;     /* Current clock (MHz) */
+       unsigned int base;      /* Base address, SDMMC1/2/3/4 */
+       enum periph_id mmc_id;  /* Peripheral ID: PERIPH_ID_... */
+       int pwr_gpio;           /* Power GPIO */
+       int cd_gpio;            /* Change Detect GPIO */
+};
+
+#endif /* __ASSEMBLY__ */
+#endif /* __TEGRA_MMC_H_ */
index 88189bedb578bdd6c29bf072fa8c9cc44dd45b14..d13ead990984adaacdf1b2f96edd7e88379c1c01 100644 (file)
@@ -55,7 +55,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index eecfa50e3eb18f98c12e1bf2574b109030d4e39d..d3d10550af392181b3f19deca4cb9f9c0888ade6 100644 (file)
@@ -45,7 +45,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index 3edd102d15d6e4591c9e031c71faa10616939ab7..d6f7fe38a0dee68218a93b968accc0534fa3adfb 100644 (file)
@@ -42,7 +42,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index 188827623689b63f4deb71263fb94c0e59e63948..e73be0bf929470128a790299c84abc262bc3effa 100644 (file)
@@ -45,7 +45,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index db11d8a308c91d716374ad3165b01c85932c5f8b..cae6e2347ec248dff690eacaf3c5721ed21047b8 100644 (file)
@@ -86,7 +86,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index 21b9ef234b0262d7591971e27549d2b6034fb9cc..7e6adc74a3f6277d00e02df0759f324dc838df3d 100644 (file)
@@ -58,7 +58,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index 665076d08eca3ca1fe27b66b85f72a0dec30cb9d..77a0a141520b14ad774501121cb8aa9308d717f8 100644 (file)
@@ -49,7 +49,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION
index ec96cff49b2379a516a783869faa42988d4113fb..9dafe5cadca2715a229bfc226d0684d4bf121b5f 100644 (file)
@@ -58,7 +58,7 @@
 /* SD/MMC */
 #define CONFIG_MMC
 #define CONFIG_GENERIC_MMC
-#define CONFIG_TEGRA2_MMC
+#define CONFIG_TEGRA_MMC
 #define CONFIG_CMD_MMC
 
 #define CONFIG_DOS_PARTITION