![Sebastian Hesselbarth](/assets/img/avatar_default.png)
f8ec589b86
("mmc: sdhci-dove: allow GPIOs to be used for card detection on Dove" added a gpio based card detect interrupt handler that was hooked up into card_tasket.3560db8e24
("mmc: sdhci: push card_tasklet into threaded irq handler") now removed that very card_tasklet causing sdhci-dove to fail on build with: drivers/mmc/host/sdhci-dove.c: In function 'sdhci_dove_carddetect_irq': drivers/mmc/host/sdhci-dove.c:42:24: error: 'struct sdhci_host' has no member named 'card_tasklet' To fix both the build error and get a working gpio card detection without card_tasklet, replace sdhci_get_of_property() with more recent mmc_of_parse(). It takes care of gpio-based card detect passed through DT already and allows to remove the offending code sections dealing with removed card_tasklet. Signed-off-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org> Signed-off-by: Chris Ball <chris@printf.net>
163 lines
3.8 KiB
C
163 lines
3.8 KiB
C
/*
|
|
* sdhci-dove.c Support for SDHCI on Marvell's Dove SoC
|
|
*
|
|
* Author: Saeed Bishara <saeed@marvell.com>
|
|
* Mike Rapoport <mike@compulab.co.il>
|
|
* Based on sdhci-cns3xxx.c
|
|
*
|
|
* This program is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License version 2 as
|
|
* published by the Free Software Foundation.
|
|
*
|
|
* 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., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
*/
|
|
|
|
#include <linux/clk.h>
|
|
#include <linux/err.h>
|
|
#include <linux/io.h>
|
|
#include <linux/mmc/host.h>
|
|
#include <linux/module.h>
|
|
#include <linux/of.h>
|
|
|
|
#include "sdhci-pltfm.h"
|
|
|
|
struct sdhci_dove_priv {
|
|
struct clk *clk;
|
|
};
|
|
|
|
static u16 sdhci_dove_readw(struct sdhci_host *host, int reg)
|
|
{
|
|
u16 ret;
|
|
|
|
switch (reg) {
|
|
case SDHCI_HOST_VERSION:
|
|
case SDHCI_SLOT_INT_STATUS:
|
|
/* those registers don't exist */
|
|
return 0;
|
|
default:
|
|
ret = readw(host->ioaddr + reg);
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static u32 sdhci_dove_readl(struct sdhci_host *host, int reg)
|
|
{
|
|
u32 ret;
|
|
|
|
ret = readl(host->ioaddr + reg);
|
|
|
|
switch (reg) {
|
|
case SDHCI_CAPABILITIES:
|
|
/* Mask the support for 3.0V */
|
|
ret &= ~SDHCI_CAN_VDD_300;
|
|
break;
|
|
}
|
|
return ret;
|
|
}
|
|
|
|
static const struct sdhci_ops sdhci_dove_ops = {
|
|
.read_w = sdhci_dove_readw,
|
|
.read_l = sdhci_dove_readl,
|
|
.set_clock = sdhci_set_clock,
|
|
.set_bus_width = sdhci_set_bus_width,
|
|
.reset = sdhci_reset,
|
|
.set_uhs_signaling = sdhci_set_uhs_signaling,
|
|
};
|
|
|
|
static const struct sdhci_pltfm_data sdhci_dove_pdata = {
|
|
.ops = &sdhci_dove_ops,
|
|
.quirks = SDHCI_QUIRK_NO_SIMULT_VDD_AND_POWER |
|
|
SDHCI_QUIRK_NO_BUSY_IRQ |
|
|
SDHCI_QUIRK_BROKEN_TIMEOUT_VAL |
|
|
SDHCI_QUIRK_FORCE_DMA |
|
|
SDHCI_QUIRK_NO_HISPD_BIT,
|
|
};
|
|
|
|
static int sdhci_dove_probe(struct platform_device *pdev)
|
|
{
|
|
struct sdhci_host *host;
|
|
struct sdhci_pltfm_host *pltfm_host;
|
|
struct sdhci_dove_priv *priv;
|
|
int ret;
|
|
|
|
priv = devm_kzalloc(&pdev->dev, sizeof(struct sdhci_dove_priv),
|
|
GFP_KERNEL);
|
|
if (!priv) {
|
|
dev_err(&pdev->dev, "unable to allocate private data");
|
|
return -ENOMEM;
|
|
}
|
|
|
|
priv->clk = devm_clk_get(&pdev->dev, NULL);
|
|
|
|
host = sdhci_pltfm_init(pdev, &sdhci_dove_pdata, 0);
|
|
if (IS_ERR(host))
|
|
return PTR_ERR(host);
|
|
|
|
pltfm_host = sdhci_priv(host);
|
|
pltfm_host->priv = priv;
|
|
|
|
if (!IS_ERR(priv->clk))
|
|
clk_prepare_enable(priv->clk);
|
|
|
|
ret = mmc_of_parse(host->mmc);
|
|
if (ret)
|
|
goto err_sdhci_add;
|
|
|
|
ret = sdhci_add_host(host);
|
|
if (ret)
|
|
goto err_sdhci_add;
|
|
|
|
return 0;
|
|
|
|
err_sdhci_add:
|
|
if (!IS_ERR(priv->clk))
|
|
clk_disable_unprepare(priv->clk);
|
|
sdhci_pltfm_free(pdev);
|
|
return ret;
|
|
}
|
|
|
|
static int sdhci_dove_remove(struct platform_device *pdev)
|
|
{
|
|
struct sdhci_host *host = platform_get_drvdata(pdev);
|
|
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
|
struct sdhci_dove_priv *priv = pltfm_host->priv;
|
|
|
|
sdhci_pltfm_unregister(pdev);
|
|
|
|
if (!IS_ERR(priv->clk))
|
|
clk_disable_unprepare(priv->clk);
|
|
|
|
return 0;
|
|
}
|
|
|
|
static const struct of_device_id sdhci_dove_of_match_table[] = {
|
|
{ .compatible = "marvell,dove-sdhci", },
|
|
{}
|
|
};
|
|
MODULE_DEVICE_TABLE(of, sdhci_dove_of_match_table);
|
|
|
|
static struct platform_driver sdhci_dove_driver = {
|
|
.driver = {
|
|
.name = "sdhci-dove",
|
|
.owner = THIS_MODULE,
|
|
.pm = SDHCI_PLTFM_PMOPS,
|
|
.of_match_table = sdhci_dove_of_match_table,
|
|
},
|
|
.probe = sdhci_dove_probe,
|
|
.remove = sdhci_dove_remove,
|
|
};
|
|
|
|
module_platform_driver(sdhci_dove_driver);
|
|
|
|
MODULE_DESCRIPTION("SDHCI driver for Dove");
|
|
MODULE_AUTHOR("Saeed Bishara <saeed@marvell.com>, "
|
|
"Mike Rapoport <mike@compulab.co.il>");
|
|
MODULE_LICENSE("GPL v2");
|