mmc: Split mmc struct, rework mmc initialization (v2)

[people/ms/u-boot.git] / drivers / mmc / pxa_mmc_gen.c

diff --git a/drivers/mmc/pxa_mmc_gen.c b/drivers/mmc/pxa_mmc_gen.c
index 188e1d4c6b0163a84e8f50f5f278cc517318ce55..1f297571e563c7c69bf653f574c890ea916ac69b 100644 (file)
--- a/drivers/mmc/pxa_mmc_gen.c
+++ b/drivers/mmc/pxa_mmc_gen.c
@@ -52,7 +52,7 @@ struct pxa_mmc_priv {
 /* Wait for bit to be set */
 static int pxa_mmc_wait(struct mmc *mmc, uint32_t mask)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        unsigned int timeout = PXA_MMC_TIMEOUT;
 
@@ -71,7 +71,7 @@ static int pxa_mmc_wait(struct mmc *mmc, uint32_t mask)
 
 static int pxa_mmc_stop_clock(struct mmc *mmc)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        unsigned int timeout = PXA_MMC_TIMEOUT;
 
@@ -100,7 +100,7 @@ static int pxa_mmc_stop_clock(struct mmc *mmc)
 static int pxa_mmc_start_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
                                uint32_t cmdat)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        int ret;
 
@@ -143,7 +143,7 @@ static int pxa_mmc_start_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
 
 static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        uint32_t a, b, c;
        int i;
@@ -185,7 +185,7 @@ static int pxa_mmc_cmd_done(struct mmc *mmc, struct mmc_cmd *cmd)
 
 static int pxa_mmc_do_read_xfer(struct mmc *mmc, struct mmc_data *data)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        uint32_t len;
        uint32_t *buf = (uint32_t *)data->dest;
@@ -221,7 +221,7 @@ static int pxa_mmc_do_read_xfer(struct mmc *mmc, struct mmc_data *data)
 
 static int pxa_mmc_do_write_xfer(struct mmc *mmc, struct mmc_data *data)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        uint32_t len;
        uint32_t *buf = (uint32_t *)data->src;
@@ -264,7 +264,7 @@ static int pxa_mmc_do_write_xfer(struct mmc *mmc, struct mmc_data *data)
 static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd,
                                struct mmc_data *data)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        uint32_t cmdat = 0;
        int ret;
@@ -317,7 +317,7 @@ static int pxa_mmc_request(struct mmc *mmc, struct mmc_cmd *cmd,
 
 static void pxa_mmc_set_ios(struct mmc *mmc)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
        uint32_t tmp;
        uint32_t pxa_mmc_clock;
@@ -335,7 +335,7 @@ static void pxa_mmc_set_ios(struct mmc *mmc)
 
        /* Set clock to the card the usual way. */
        pxa_mmc_clock = 0;
-       tmp = mmc->f_max / mmc->clock;
+       tmp = mmc->cfg->f_max / mmc->clock;
        tmp += tmp % 2;
 
        while (tmp > 1) {
@@ -348,7 +348,7 @@ static void pxa_mmc_set_ios(struct mmc *mmc)
 
 static int pxa_mmc_init(struct mmc *mmc)
 {
-       struct pxa_mmc_priv *priv = (struct pxa_mmc_priv *)mmc->priv;
+       struct pxa_mmc_priv *priv = mmc->priv;
        struct pxa_mmc_regs *regs = priv->regs;
 
        /* Make sure the clock are stopped */
@@ -372,6 +372,16 @@ static const struct mmc_ops pxa_mmc_ops = {
        .init           = pxa_mmc_init,
 };
 
+static struct mmc_config pxa_mmc_cfg = {
+       .name           = "PXA MMC",
+       .ops            = &pxa_mmc_ops,
+       .voltages       = MMC_VDD_32_33 | MMC_VDD_33_34,
+       .f_max          = PXAMMC_MAX_SPEED,
+       .f_min          = PXAMMC_MIN_SPEED,
+       .host_caps      = PXAMMC_HOST_CAPS,
+       .b_max          = CONFIG_SYS_MMC_MAX_BLK_COUNT,
+};
+
 int pxa_mmc_register(int card_index)
 {
        struct mmc *mmc;
@@ -379,13 +389,11 @@ int pxa_mmc_register(int card_index)
        uint32_t reg;
        int ret = -ENOMEM;
 
-       mmc = malloc(sizeof(struct mmc));
-       if (!mmc)
-               goto err0;
-
        priv = malloc(sizeof(struct pxa_mmc_priv));
        if (!priv)
-               goto err1;
+               goto err0;
+
+       memset(priv, 0, sizeof(*priv));
 
        switch (card_index) {
        case 0:
@@ -395,23 +403,12 @@ int pxa_mmc_register(int card_index)
                priv->regs = (struct pxa_mmc_regs *)MMC1_BASE;
                break;
        default:
+               ret = -EINVAL;
                printf("PXA MMC: Invalid MMC controller ID (card_index = %d)\n",
                        card_index);
-               goto err2;
+               goto err1;
        }
 
-       mmc->priv = priv;
-
-       mmc->name = "PXA MMC";
-       mmc->ops = &pxa_mmc_ops;
-
-       mmc->voltages   = MMC_VDD_32_33 | MMC_VDD_33_34;
-       mmc->f_max      = PXAMMC_MAX_SPEED;
-       mmc->f_min      = PXAMMC_MIN_SPEED;
-       mmc->host_caps  = PXAMMC_HOST_CAPS;
-
-       mmc->b_max = 0;
-
 #ifndef        CONFIG_CPU_MONAHANS     /* PXA2xx */
        reg = readl(CKEN);
        reg |= CKEN12_MMC;
@@ -422,14 +419,14 @@ int pxa_mmc_register(int card_index)
        writel(reg, CKENA);
 #endif
 
-       mmc_register(mmc);
+       mmc = mmc_create(&pxa_mmc_cfg, priv);
+       if (mmc == NULL)
+               goto err1;
 
        return 0;
 
-err2:
-       free(priv);
 err1:
-       free(mmc);
+       free(priv);
 err0:
        return ret;
 }