diff options
Diffstat (limited to 'drivers/mci/omap_hsmmc.c')
| -rw-r--r-- | drivers/mci/omap_hsmmc.c | 51 |
1 files changed, 16 insertions, 35 deletions
diff --git a/drivers/mci/omap_hsmmc.c b/drivers/mci/omap_hsmmc.c index 4e809bae4f..41d5a62f32 100644 --- a/drivers/mci/omap_hsmmc.c +++ b/drivers/mci/omap_hsmmc.c @@ -1,22 +1,6 @@ -/* - * (C) Copyright 2008 - * Texas Instruments, <www.ti.com> - * Sukumar Ghorai <s-ghorai@ti.com> - * - * See file CREDITS for list of people who contributed to this - * project. - * - * 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's version 2 of - * the License. - * - * 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. - * - */ +// SPDX-License-Identifier: GPL-2.0-only +// SPDX-FileCopyrightText: 2008 Texas Instruments (http://www.ti.com/, Sukumar Ghorai <s-ghorai@ti.com>) + /* #define DEBUG */ #include <config.h> #include <common.h> @@ -28,12 +12,12 @@ #include <io.h> #include <linux/err.h> -#include <mach/omap_hsmmc.h> +#include <mach/omap/omap_hsmmc.h> #if defined(CONFIG_MFD_TWL6030) && \ defined(CONFIG_MCI_OMAP_HSMMC) && \ defined(CONFIG_ARCH_OMAP4) -#include <mach/omap4_twl6030_mmc.h> +#include <mach/omap/omap4_twl6030_mmc.h> #endif struct hsmmc { @@ -186,7 +170,7 @@ static struct omap_mmc_driver_data omap4_data = { struct omap_hsmmc { struct mci_host mci; - struct device_d *dev; + struct device *dev; struct hsmmc *base; void __iomem *iobase; }; @@ -223,7 +207,7 @@ static int mmc_init_stream(struct omap_hsmmc *hsmmc) return 0; } -static int mmc_init_setup(struct mci_host *mci, struct device_d *dev) +static int mmc_init_setup(struct mci_host *mci, struct device *dev) { struct omap_hsmmc *hsmmc = to_hsmmc(mci); struct hsmmc *mmc_base = hsmmc->base; @@ -584,14 +568,7 @@ static void mmc_set_ios(struct mci_host *mci, struct mci_ios *ios) writel(readl(&mmc_base->sysctl) | CEN_ENABLE, &mmc_base->sysctl); } -static int omap_mmc_detect(struct device_d *dev) -{ - struct omap_hsmmc *hsmmc = dev->priv; - - return mci_detect_card(&hsmmc->mci); -} - -static int omap_mmc_probe(struct device_d *dev) +static int omap_mmc_probe(struct device *dev) { struct resource *iores; struct omap_hsmmc *hsmmc; @@ -636,9 +613,6 @@ static int omap_mmc_probe(struct device_d *dev) mci_of_parse(&hsmmc->mci); - dev->priv = hsmmc; - dev->detect = omap_mmc_detect, - mci_register(&hsmmc->mci); return 0; @@ -664,11 +638,18 @@ static __maybe_unused struct of_device_id omap_mmc_dt_ids[] = { .compatible = "ti,omap4-hsmmc", .data = &omap4_data, }, { + .compatible = "ti,am335-sdhci", + .data = &omap4_data, + }, { + .compatible = "ti,am437-sdhci", + .data = &omap4_data, + }, { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, omap_mmc_dt_ids); -static struct driver_d omap_mmc_driver = { +static struct driver omap_mmc_driver = { .name = "omap-hsmmc", .probe = omap_mmc_probe, .id_table = omap_mmc_ids, |