diff options
Diffstat (limited to 'drivers/mci/mxs.c')
| -rw-r--r-- | drivers/mci/mxs.c | 45 |
1 files changed, 16 insertions, 29 deletions
diff --git a/drivers/mci/mxs.c b/drivers/mci/mxs.c index afd6a56397..6883b78d5c 100644 --- a/drivers/mci/mxs.c +++ b/drivers/mci/mxs.c @@ -1,26 +1,13 @@ +// SPDX-License-Identifier: GPL-2.0-or-later +// SPDX-FileCopyrightText: 2010 Juergen Beisert <jbe@pengutronix.de>, Pengutronix +// SPDX-FileCopyrightText: 2007 SigmaTel, Inc. (Ioannis Kappas <ikappas@sigmatel.com>) +// SPDX-FileCopyrightText: 2003 Russell King +// SPDX-FileCopyrightText: 2004-2005 Pierre Ossman +// SPDX-FileCopyrightText: 2008-2009 Freescale Semiconductor, Inc +// SPDX-FileCopyrightText: 2008 Embedded Alley Solutions, Inc + /* - * Copyright (C) 2010 Juergen Beisert, Pengutronix <jbe@pengutronix.de> - * - * This code is based on: - * - * Copyright (C) 2007 SigmaTel, Inc., Ioannis Kappas <ikappas@sigmatel.com> - * - * Portions copyright (C) 2003 Russell King, PXA MMCI Driver - * Portions copyright (C) 2004-2005 Pierre Ossman, W83L51xD SD/MMC driver - * - * Copyright 2008-2009 Freescale Semiconductor, Inc. All Rights Reserved. - * Copyright 2008 Embedded Alley Solutions, Inc All Rights Reserved. - * - * 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. - * + * This code is reused code from the PXA MMCI Driver and W83L51xD SD/MMC driver. */ /** @@ -40,9 +27,8 @@ #include <linux/clk.h> #include <linux/err.h> #include <asm/bitops.h> -#include <mach/mci.h> -#include <mach/clock.h> -#include <mach/ssp.h> +#include <mach/mxs/mci.h> +#include <mach/mxs/ssp.h> #define CLOCKRATE_MIN (1 * 1000 * 1000) #define CLOCKRATE_MAX (480 * 1000 * 1000) @@ -446,7 +432,7 @@ static unsigned mxs_mci_setup_clock_speed(struct mxs_mci_host *mxs_mci, unsigned * @param mci_dev MCI device instance * @return 0 on success, negative value else */ -static int mxs_mci_initialize(struct mci_host *host, struct device_d *mci_dev) +static int mxs_mci_initialize(struct mci_host *host, struct device *mci_dev) { struct mxs_mci_host *mxs_mci = to_mxs_mci(host); @@ -530,7 +516,7 @@ static void mxs_mci_set_ios(struct mci_host *host, struct mci_ios *ios) const unsigned char bus_width[3] = { 1, 4, 8 }; -static void mxs_mci_info(struct device_d *hw_dev) +static void mxs_mci_info(struct device *hw_dev) { struct mxs_mci_host *mxs_mci = hw_dev->priv; @@ -542,7 +528,7 @@ static void mxs_mci_info(struct device_d *hw_dev) printf("\n"); } -static int mxs_mci_probe(struct device_d *hw_dev) +static int mxs_mci_probe(struct device *hw_dev) { struct resource *iores; struct mxs_mci_platform_data *pd = hw_dev->platform_data; @@ -611,8 +597,9 @@ static __maybe_unused struct of_device_id mxs_mmc_compatible[] = { /* sentinel */ } }; +MODULE_DEVICE_TABLE(of, mxs_mmc_compatible); -static struct driver_d mxs_mci_driver = { +static struct driver mxs_mci_driver = { .name = "mxs_mci", .probe = mxs_mci_probe, .of_compatible = DRV_OF_COMPAT(mxs_mmc_compatible), |