mmc: Remove ops from struct mmc and put in mmc_ops

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

diff --git a/drivers/mmc/tegra_mmc.c b/drivers/mmc/tegra_mmc.c
index e86bc680ff2806ef3b4d9f1169cf81c72f5956b1..5f7b590b8fb59d915f383ef83524aacaaa24ee2a 100644 (file)
--- a/drivers/mmc/tegra_mmc.c
+++ b/drivers/mmc/tegra_mmc.c
@@ -4,19 +4,7 @@
  * Jaehoon Chung <jh80.chung@samsung.com>
  * Portions Copyright 2011-2013 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
+ * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #include <bouncebuf.h>
@@ -326,7 +314,7 @@ static int mmc_send_cmd_bounced(struct mmc *mmc, struct mmc_cmd *cmd,
        return 0;
 }
 
-static int mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
+static int tegra_mmc_send_cmd(struct mmc *mmc, struct mmc_cmd *cmd,
                        struct mmc_data *data)
 {
        void *buf;
@@ -408,7 +396,7 @@ out:
        host->clock = clock;
 }
 
-static void mmc_set_ios(struct mmc *mmc)
+static void tegra_mmc_set_ios(struct mmc *mmc)
 {
        struct mmc_host *host = mmc->priv;
        unsigned char ctrl;
@@ -476,7 +464,7 @@ static void mmc_reset(struct mmc_host *host, struct mmc *mmc)
        pad_init_mmc(host);
 }
 
-static int mmc_core_init(struct mmc *mmc)
+static int tegra_mmc_core_init(struct mmc *mmc)
 {
        struct mmc_host *host = (struct mmc_host *)mmc->priv;
        unsigned int mask;
@@ -533,6 +521,13 @@ int tegra_mmc_getcd(struct mmc *mmc)
        return 1;
 }
 
+static const struct mmc_ops tegra_mmc_ops = {
+       .send_cmd       = tegra_mmc_send_cmd,
+       .set_ios        = tegra_mmc_set_ios,
+       .init           = tegra_mmc_core_init,
+       .getcd          = tegra_mmc_getcd,
+};
+
 static int do_mmc_init(int dev_index)
 {
        struct mmc_host *host;
@@ -570,11 +565,7 @@ static int do_mmc_init(int dev_index)
 
        sprintf(mmc->name, "Tegra SD/MMC");
        mmc->priv = host;
-       mmc->send_cmd = mmc_send_cmd;
-       mmc->set_ios = mmc_set_ios;
-       mmc->init = mmc_core_init;
-       mmc->getcd = tegra_mmc_getcd;
-       mmc->getwp = NULL;
+       mmc->ops = &tegra_mmc_ops;
 
        mmc->voltages = MMC_VDD_32_33 | MMC_VDD_33_34 | MMC_VDD_165_195;
        mmc->host_caps = 0;
@@ -680,6 +671,15 @@ void tegra_mmc_init(void)
        const void *blob = gd->fdt_blob;
        debug("%s entry\n", __func__);
 
+       /* See if any Tegra124 MMC controllers are present */
+       count = fdtdec_find_aliases_for_id(blob, "sdhci",
+               COMPAT_NVIDIA_TEGRA124_SDMMC, node_list, MAX_HOSTS);
+       debug("%s: count of Tegra124 sdhci nodes is %d\n", __func__, count);
+       if (process_nodes(blob, node_list, count)) {
+               printf("%s: Error processing T30 mmc node(s)!\n", __func__);
+               return;
+       }
+
        /* See if any Tegra30 MMC controllers are present */
        count = fdtdec_find_aliases_for_id(blob, "sdhci",
                COMPAT_NVIDIA_TEGRA30_SDMMC, node_list, MAX_HOSTS);