mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-28 20:37:27 +00:00
mmc: sdhci: make sdhci-of device drivers self registered
The patch turns the sdhci-of-core common stuff into helper functions added into sdhci-pltfm.c, and makes sdhci-of device drviers self registered using the same pair of .probe and .remove used by sdhci-pltfm device drivers. As a result, sdhci-of-core.c and sdhci-of.h can be eliminated with those common things merged into sdhci-pltfm.c and sdhci-pltfm.h respectively. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> Acked-by: Anton Vorontsov <cbouatmailru@gmail.com> Reviewed-by: Wolfram Sang <w.sang@pengutronix.de> Signed-off-by: Chris Ball <cjb@laptop.org>
This commit is contained in:
Shawn Guo
Chris Ball
parent
e307148fd4
commit
38576af1f8
@ -81,18 +81,9 @@ config MMC_RICOH_MMC
|
||||
|
||||
If unsure, say Y.
|
||||
|
||||
config MMC_SDHCI_OF
|
||||
tristate "SDHCI support on OpenFirmware platforms"
|
||||
depends on MMC_SDHCI && OF
|
||||
help
|
||||
This selects the OF support for Secure Digital Host Controller
|
||||
Interfaces.
|
||||
|
||||
If unsure, say N.
|
||||
|
||||
config MMC_SDHCI_OF_ESDHC
|
||||
bool "SDHCI OF support for the Freescale eSDHC controller"
|
||||
depends on MMC_SDHCI_OF
|
||||
depends on MMC_SDHCI
|
||||
depends on PPC_OF
|
||||
select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
||||
help
|
||||
@ -102,7 +93,7 @@ config MMC_SDHCI_OF_ESDHC
|
||||
|
||||
config MMC_SDHCI_OF_HLWD
|
||||
bool "SDHCI OF support for the Nintendo Wii SDHCI controllers"
|
||||
depends on MMC_SDHCI_OF
|
||||
depends on MMC_SDHCI
|
||||
depends on PPC_OF
|
||||
select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
||||
help
|
||||
|
||||
@ -52,11 +52,10 @@ obj-$(CONFIG_MMC_SDHCI_DOVE) += sdhci-dove.o
|
||||
sdhci-dove-objs := sdhci-pltfm.o
|
||||
obj-$(CONFIG_MMC_SDHCI_TEGRA) += sdhci-tegra.o
|
||||
sdhci-tegra-objs := sdhci-pltfm.o
|
||||
|
||||
obj-$(CONFIG_MMC_SDHCI_OF) += sdhci-of.o
|
||||
sdhci-of-y := sdhci-of-core.o
|
||||
sdhci-of-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
|
||||
sdhci-of-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
|
||||
obj-$(CONFIG_MMC_SDHCI_OF_ESDHC) += sdhci-of-esdhc.o
|
||||
sdhci-of-esdhc-objs := sdhci-pltfm.o
|
||||
obj-$(CONFIG_MMC_SDHCI_OF_HLWD) += sdhci-of-hlwd.o
|
||||
sdhci-of-hlwd-objs := sdhci-pltfm.o
|
||||
|
||||
ifeq ($(CONFIG_CB710_DEBUG),y)
|
||||
CFLAGS-cb710-mmc += -DDEBUG
|
||||
|
||||
@ -16,7 +16,7 @@
|
||||
#include <linux/io.h>
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include "sdhci-of.h"
|
||||
#include "sdhci-pltfm.h"
|
||||
#include "sdhci.h"
|
||||
#include "sdhci-esdhc.h"
|
||||
|
||||
@ -85,9 +85,58 @@ static struct sdhci_ops sdhci_esdhc_ops = {
|
||||
.get_min_clock = esdhc_of_get_min_clock,
|
||||
};
|
||||
|
||||
struct sdhci_pltfm_data sdhci_esdhc_pdata = {
|
||||
static struct sdhci_pltfm_data sdhci_esdhc_pdata = {
|
||||
/* card detection could be handled via GPIO */
|
||||
.quirks = ESDHC_DEFAULT_QUIRKS | SDHCI_QUIRK_BROKEN_CARD_DETECTION
|
||||
| SDHCI_QUIRK_NO_CARD_NO_RESET,
|
||||
.ops = &sdhci_esdhc_ops,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_esdhc_probe(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_register(pdev, &sdhci_esdhc_pdata);
|
||||
}
|
||||
|
||||
static int __devexit sdhci_esdhc_remove(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_unregister(pdev);
|
||||
}
|
||||
|
||||
static const struct of_device_id sdhci_esdhc_of_match[] = {
|
||||
{ .compatible = "fsl,mpc8379-esdhc" },
|
||||
{ .compatible = "fsl,mpc8536-esdhc" },
|
||||
{ .compatible = "fsl,esdhc" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sdhci_esdhc_of_match);
|
||||
|
||||
static struct platform_driver sdhci_esdhc_driver = {
|
||||
.driver = {
|
||||
.name = "sdhci-esdhc",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = sdhci_esdhc_of_match,
|
||||
},
|
||||
.probe = sdhci_esdhc_probe,
|
||||
.remove = __devexit_p(sdhci_esdhc_remove),
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = sdhci_pltfm_suspend,
|
||||
.resume = sdhci_pltfm_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __init sdhci_esdhc_init(void)
|
||||
{
|
||||
return platform_driver_register(&sdhci_esdhc_driver);
|
||||
}
|
||||
module_init(sdhci_esdhc_init);
|
||||
|
||||
static void __exit sdhci_esdhc_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&sdhci_esdhc_driver);
|
||||
}
|
||||
module_exit(sdhci_esdhc_exit);
|
||||
|
||||
MODULE_DESCRIPTION("SDHCI OF driver for Freescale MPC eSDHC");
|
||||
MODULE_AUTHOR("Xiaobo Xie <X.Xie@freescale.com>, "
|
||||
"Anton Vorontsov <avorontsov@ru.mvista.com>");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
@ -21,7 +21,7 @@
|
||||
|
||||
#include <linux/delay.h>
|
||||
#include <linux/mmc/host.h>
|
||||
#include "sdhci-of.h"
|
||||
#include "sdhci-pltfm.h"
|
||||
#include "sdhci.h"
|
||||
|
||||
/*
|
||||
@ -60,8 +60,54 @@ static struct sdhci_ops sdhci_hlwd_ops = {
|
||||
.write_b = sdhci_hlwd_writeb,
|
||||
};
|
||||
|
||||
struct sdhci_pltfm_data sdhci_hlwd_pdata = {
|
||||
static struct sdhci_pltfm_data sdhci_hlwd_pdata = {
|
||||
.quirks = SDHCI_QUIRK_32BIT_DMA_ADDR |
|
||||
SDHCI_QUIRK_32BIT_DMA_SIZE,
|
||||
.ops = &sdhci_hlwd_ops,
|
||||
};
|
||||
|
||||
static int __devinit sdhci_hlwd_probe(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_register(pdev, &sdhci_hlwd_pdata);
|
||||
}
|
||||
|
||||
static int __devexit sdhci_hlwd_remove(struct platform_device *pdev)
|
||||
{
|
||||
return sdhci_pltfm_unregister(pdev);
|
||||
}
|
||||
|
||||
static const struct of_device_id sdhci_hlwd_of_match[] = {
|
||||
{ .compatible = "nintendo,hollywood-sdhci" },
|
||||
{ }
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, sdhci_hlwd_of_match);
|
||||
|
||||
static struct platform_driver sdhci_hlwd_driver = {
|
||||
.driver = {
|
||||
.name = "sdhci-hlwd",
|
||||
.owner = THIS_MODULE,
|
||||
.of_match_table = sdhci_hlwd_of_match,
|
||||
},
|
||||
.probe = sdhci_hlwd_probe,
|
||||
.remove = __devexit_p(sdhci_hlwd_remove),
|
||||
#ifdef CONFIG_PM
|
||||
.suspend = sdhci_pltfm_suspend,
|
||||
.resume = sdhci_pltfm_resume,
|
||||
#endif
|
||||
};
|
||||
|
||||
static int __init sdhci_hlwd_init(void)
|
||||
{
|
||||
return platform_driver_register(&sdhci_hlwd_driver);
|
||||
}
|
||||
module_init(sdhci_hlwd_init);
|
||||
|
||||
static void __exit sdhci_hlwd_exit(void)
|
||||
{
|
||||
platform_driver_unregister(&sdhci_hlwd_driver);
|
||||
}
|
||||
module_exit(sdhci_hlwd_exit);
|
||||
|
||||
MODULE_DESCRIPTION("Nintendo Wii SDHCI OF driver");
|
||||
MODULE_AUTHOR("The GameCube Linux Team, Albert Herranz");
|
||||
MODULE_LICENSE("GPL v2");
|
||||
|
||||
@ -1,33 +0,0 @@
|
||||
/*
|
||||
* OpenFirmware bindings for Secure Digital Host Controller Interface.
|
||||
*
|
||||
* Copyright (c) 2007 Freescale Semiconductor, Inc.
|
||||
* Copyright (c) 2009 MontaVista Software, Inc.
|
||||
*
|
||||
* Authors: Xiaobo Xie <X.Xie@freescale.com>
|
||||
* Anton Vorontsov <avorontsov@ru.mvista.com>
|
||||
*
|
||||
* 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.
|
||||
*/
|
||||
|
||||
#ifndef __SDHCI_OF_H
|
||||
#define __SDHCI_OF_H
|
||||
|
||||
#include <linux/types.h>
|
||||
#include "sdhci.h"
|
||||
#include "sdhci-pltfm.h"
|
||||
|
||||
extern u32 sdhci_be32bs_readl(struct sdhci_host *host, int reg);
|
||||
extern u16 sdhci_be32bs_readw(struct sdhci_host *host, int reg);
|
||||
extern u8 sdhci_be32bs_readb(struct sdhci_host *host, int reg);
|
||||
extern void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg);
|
||||
extern void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg);
|
||||
extern void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg);
|
||||
|
||||
extern struct sdhci_pltfm_data sdhci_esdhc_pdata;
|
||||
extern struct sdhci_pltfm_data sdhci_hlwd_pdata;
|
||||
|
||||
#endif /* __SDHCI_OF_H */
|
||||
@ -2,6 +2,12 @@
|
||||
* sdhci-pltfm.c Support for SDHCI platform devices
|
||||
* Copyright (c) 2009 Intel Corporation
|
||||
*
|
||||
* Copyright (c) 2007 Freescale Semiconductor, Inc.
|
||||
* Copyright (c) 2009 MontaVista Software, Inc.
|
||||
*
|
||||
* Authors: Xiaobo Xie <X.Xie@freescale.com>
|
||||
* Anton Vorontsov <avorontsov@ru.mvista.com>
|
||||
*
|
||||
* 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.
|
||||
@ -23,13 +29,114 @@
|
||||
*/
|
||||
|
||||
#include <linux/err.h>
|
||||
|
||||
#include <linux/of.h>
|
||||
#ifdef CONFIG_PPC
|
||||
#include <asm/machdep.h>
|
||||
#endif
|
||||
#include "sdhci.h"
|
||||
#include "sdhci-pltfm.h"
|
||||
|
||||
static struct sdhci_ops sdhci_pltfm_ops = {
|
||||
};
|
||||
|
||||
#ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
||||
/*
|
||||
* These accessors are designed for big endian hosts doing I/O to
|
||||
* little endian controllers incorporating a 32-bit hardware byte swapper.
|
||||
*/
|
||||
u32 sdhci_be32bs_readl(struct sdhci_host *host, int reg)
|
||||
{
|
||||
return in_be32(host->ioaddr + reg);
|
||||
}
|
||||
|
||||
u16 sdhci_be32bs_readw(struct sdhci_host *host, int reg)
|
||||
{
|
||||
return in_be16(host->ioaddr + (reg ^ 0x2));
|
||||
}
|
||||
|
||||
u8 sdhci_be32bs_readb(struct sdhci_host *host, int reg)
|
||||
{
|
||||
return in_8(host->ioaddr + (reg ^ 0x3));
|
||||
}
|
||||
|
||||
void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg)
|
||||
{
|
||||
out_be32(host->ioaddr + reg, val);
|
||||
}
|
||||
|
||||
void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg)
|
||||
{
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
int base = reg & ~0x3;
|
||||
int shift = (reg & 0x2) * 8;
|
||||
|
||||
switch (reg) {
|
||||
case SDHCI_TRANSFER_MODE:
|
||||
/*
|
||||
* Postpone this write, we must do it together with a
|
||||
* command write that is down below.
|
||||
*/
|
||||
pltfm_host->xfer_mode_shadow = val;
|
||||
return;
|
||||
case SDHCI_COMMAND:
|
||||
sdhci_be32bs_writel(host,
|
||||
val << 16 | pltfm_host->xfer_mode_shadow,
|
||||
SDHCI_TRANSFER_MODE);
|
||||
return;
|
||||
}
|
||||
clrsetbits_be32(host->ioaddr + base, 0xffff << shift, val << shift);
|
||||
}
|
||||
|
||||
void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg)
|
||||
{
|
||||
int base = reg & ~0x3;
|
||||
int shift = (reg & 0x3) * 8;
|
||||
|
||||
clrsetbits_be32(host->ioaddr + base , 0xff << shift, val << shift);
|
||||
}
|
||||
#endif /* CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER */
|
||||
|
||||
#ifdef CONFIG_OF
|
||||
static bool sdhci_of_wp_inverted(struct device_node *np)
|
||||
{
|
||||
if (of_get_property(np, "sdhci,wp-inverted", NULL))
|
||||
return true;
|
||||
|
||||
/* Old device trees don't have the wp-inverted property. */
|
||||
#ifdef CONFIG_PPC
|
||||
return machine_is(mpc837x_rdb) || machine_is(mpc837x_mds);
|
||||
#else
|
||||
return false;
|
||||
#endif /* CONFIG_PPC */
|
||||
}
|
||||
|
||||
void sdhci_get_of_property(struct platform_device *pdev)
|
||||
{
|
||||
struct device_node *np = pdev->dev.of_node;
|
||||
struct sdhci_host *host = platform_get_drvdata(pdev);
|
||||
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
|
||||
const __be32 *clk;
|
||||
int size;
|
||||
|
||||
if (of_device_is_available(np)) {
|
||||
if (of_get_property(np, "sdhci,auto-cmd12", NULL))
|
||||
host->quirks |= SDHCI_QUIRK_MULTIBLOCK_READ_ACMD12;
|
||||
|
||||
if (of_get_property(np, "sdhci,1-bit-only", NULL))
|
||||
host->quirks |= SDHCI_QUIRK_FORCE_1_BIT_DATA;
|
||||
|
||||
if (sdhci_of_wp_inverted(np))
|
||||
host->quirks |= SDHCI_QUIRK_INVERTED_WRITE_PROTECT;
|
||||
|
||||
clk = of_get_property(np, "clock-frequency", &size);
|
||||
if (clk && size == sizeof(*clk) && *clk)
|
||||
pltfm_host->clock = be32_to_cpup(clk);
|
||||
}
|
||||
}
|
||||
#else
|
||||
void sdhci_get_of_property(struct platform_device *pdev) {}
|
||||
#endif /* CONFIG_OF */
|
||||
|
||||
struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
|
||||
struct sdhci_pltfm_data *pdata)
|
||||
{
|
||||
@ -117,6 +224,8 @@ int sdhci_pltfm_register(struct platform_device *pdev,
|
||||
if (IS_ERR(host))
|
||||
return PTR_ERR(host);
|
||||
|
||||
sdhci_get_of_property(pdev);
|
||||
|
||||
ret = sdhci_add_host(host);
|
||||
if (ret)
|
||||
sdhci_pltfm_free(pdev);
|
||||
|
||||
@ -15,6 +15,7 @@
|
||||
#include <linux/types.h>
|
||||
#include <linux/platform_device.h>
|
||||
#include <linux/mmc/sdhci-pltfm.h>
|
||||
#include <linux/mmc/sdhci.h>
|
||||
|
||||
struct sdhci_pltfm_host {
|
||||
struct clk *clk;
|
||||
@ -25,6 +26,17 @@ struct sdhci_pltfm_host {
|
||||
u16 xfer_mode_shadow;
|
||||
};
|
||||
|
||||
#ifdef CONFIG_MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
||||
extern u32 sdhci_be32bs_readl(struct sdhci_host *host, int reg);
|
||||
extern u16 sdhci_be32bs_readw(struct sdhci_host *host, int reg);
|
||||
extern u8 sdhci_be32bs_readb(struct sdhci_host *host, int reg);
|
||||
extern void sdhci_be32bs_writel(struct sdhci_host *host, u32 val, int reg);
|
||||
extern void sdhci_be32bs_writew(struct sdhci_host *host, u16 val, int reg);
|
||||
extern void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg);
|
||||
#endif
|
||||
|
||||
extern void sdhci_get_of_property(struct platform_device *pdev);
|
||||
|
||||
extern struct sdhci_host *sdhci_pltfm_init(struct platform_device *pdev,
|
||||
struct sdhci_pltfm_data *pdata);
|
||||
extern void sdhci_pltfm_free(struct platform_device *pdev);
|
||||
|
||||
Loading…
Reference in New Issue
Block a user