Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 38576af1 authored by Shawn Guo's avatar Shawn Guo Committed by Chris Ball
Browse files

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: default avatarShawn Guo <shawn.guo@linaro.org>
Acked-by: default avatarAnton Vorontsov <cbouatmailru@gmail.com>
Reviewed-by: default avatarWolfram Sang <w.sang@pengutronix.de>
Signed-off-by: default avatarChris Ball <cjb@laptop.org>
parent e307148f

drivers/mmc/host/Kconfig

+2 −11
Original line number Diff line number Diff line
@@ -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

drivers/mmc/host/Makefile

+4 −5
Original line number Diff line number Diff line
@@ -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

drivers/mmc/host/sdhci-of-esdhc.c

+51 −2
Original line number Diff line number Diff line
@@ -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");

drivers/mmc/host/sdhci-of-hlwd.c

+48 −2
Original line number Diff line number Diff line
@@ -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");

drivers/mmc/host/sdhci-of.h

deleted100644 → 0
+0 −33
Original line number Diff line number Diff line 
/*

 * 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 */