 drivers/mmc/host/Kconfig         |    9 ++
 drivers/mmc/host/Makefile        |    1 
 drivers/mmc/host/sdhci-cns3xxx.c |   97 +++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-pltfm.c   |    3 
 drivers/mmc/host/sdhci-pltfm.h   |    4 +
 5 files changed, 114 insertions(+)

drivers/mmc/host/Kconfig renamed from drivers/mmc/host/Kconfig~sdhci-pltfm-add-support-for-cns3xxx-soc-devices +9 -0

diff -puN drivers/mmc/host/Kconfig~sdhci-pltfm-add-support-for-cns3xxx-soc-devices drivers/mmc/host/Kconfig
@@ -121,6 +121,15 @@ config MMC_SDHCI_PLTFM
 
 	  If unsure, say N.
 
+config MMC_SDHCI_CNS3XXX
+	bool "SDHCI support on the Cavium Networks CNS3xxx SoC"
+	depends on ARCH_CNS3XXX
+	depends on MMC_SDHCI_PLTFM
+	help
+	  This selects the SDHCI support for CNS3xxx System-on-Chip devices.
+
+	  If unsure, say N.
+
 config MMC_SDHCI_S3C
 	tristate "SDHCI support on Samsung S3C SoC"
 	depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX)

drivers/mmc/host/Makefile renamed from drivers/mmc/host/Makefile~sdhci-pltfm-add-support-for-cns3xxx-soc-devices +1 -0

diff -puN drivers/mmc/host/Makefile~sdhci-pltfm-add-support-for-cns3xxx-soc-devices drivers/mmc/host/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_MMC_JZ4740)	+= jz4740_mmc.o
 
 obj-$(CONFIG_MMC_SDHCI_PLTFM)			+= sdhci-platform.o
 sdhci-platform-y				:= sdhci-pltfm.o
+sdhci-platform-$(CONFIG_MMC_SDHCI_CNS3XXX)	+= sdhci-cns3xxx.o
 
 obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o
 sdhci-of-y				:= sdhci-of-core.o

drivers/mmc/host/sdhci-cns3xxx.c new file +97 -0

97 lines not on this page · raw message

drivers/mmc/host/sdhci-pltfm.c renamed from drivers/mmc/host/sdhci-pltfm.c~sdhci-pltfm-add-support-for-cns3xxx-soc-devices +3 -0

diff -puN drivers/mmc/host/sdhci-pltfm.c~sdhci-pltfm-add-support-for-cns3xxx-soc-devices drivers/mmc/host/sdhci-pltfm.c
@@ -158,6 +158,9 @@ static int __devexit sdhci_pltfm_remove(
 
 static const struct platform_device_id sdhci_pltfm_ids[] = {
 	{ "sdhci", },
+#ifdef CONFIG_MMC_SDHCI_CNS3XXX
+	{ "sdhci-cns3xxx", (kernel_ulong_t)&sdhci_cns3xxx_pdata },
+#endif
 	{ },
 };
 MODULE_DEVICE_TABLE(platform, sdhci_pltfm_ids);

drivers/mmc/host/sdhci-pltfm.h renamed from drivers/mmc/host/sdhci-pltfm.h~sdhci-pltfm-add-support-for-cns3xxx-soc-devices +4 -0

diff -puN drivers/mmc/host/sdhci-pltfm.h~sdhci-pltfm-add-support-for-cns3xxx-soc-devices drivers/mmc/host/sdhci-pltfm.h
@@ -11,4 +11,8 @@
 #ifndef _DRIVERS_MMC_SDHCI_PLTFM_H
 #define _DRIVERS_MMC_SDHCI_PLTFM_H
 
+#include <linux/sdhci-pltfm.h>
+
+extern struct sdhci_pltfm_data sdhci_cns3xxx_pdata;
+
 #endif /* _DRIVERS_MMC_SDHCI_PLTFM_H */