Skip to contentSkip to conversation

sdhci-of: add support for the wii sdhci controller

PATCH New [email protected] 1 participant 1 message Dec 17, 2009

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 16/20 sdhci-of: add support for the wii sdhci controller

From: Albert Herranz <[email protected]>

Add support for the Secure Digital Host Controller Interface found on the "Hollywood" chipset of the Nintendo Wii video game console.

---

 drivers/mmc/host/Kconfig         |   13 +++++
 drivers/mmc/host/Makefile        |    1 
 drivers/mmc/host/sdhci-of-core.c |    3 +
 drivers/mmc/host/sdhci-of-hlwd.c |   65 +++++++++++++++++++++++++++++
 drivers/mmc/host/sdhci-of.h      |    1 
 5 files changed, 82 insertions(+), 1 deletion(-)
drivers/mmc/host/Kconfig renamed from drivers/mmc/host/Kconfig~sdhci-of-add-support-for-the-wii-sdhci-controller +12 -1
diff -puN drivers/mmc/host/Kconfig~sdhci-of-add-support-for-the-wii-sdhci-controller drivers/mmc/host/Kconfig
@@ -55,7 +55,7 @@ config MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_S
 	  has the effect of scrambling the addresses and formats of data
 	  accessed in sizes other than the datum size.
 
-	  This is the case for the Freescale eSDHC.
+	  This is the case for the Freescale eSDHC and Nintendo Wii SDHCI.
 
 config MMC_SDHCI_PCI
 	tristate "SDHCI support on PCI bus"
@@ -103,6 +103,17 @@ config MMC_SDHCI_OF_ESDHC
 
 	  If unsure, say N.
 
+config MMC_SDHCI_OF_HLWD
+	bool "SDHCI OF support for the Nintendo Wii SDHCI controllers"
+	depends on MMC_SDHCI_OF
+	select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
+	help
+	  This selects the Secure Digital Host Controller Interface (SDHCI)
+	  found in the "Hollywood" chipset of the Nintendo Wii video game
+	  console.
+
+	  If unsure, say N.
+
 config MMC_SDHCI_PLTFM
 	tristate "SDHCI support on the platform specific bus"
 	depends on MMC_SDHCI
drivers/mmc/host/Makefile renamed from drivers/mmc/host/Makefile~sdhci-of-add-support-for-the-wii-sdhci-controller +1 -0
diff -puN drivers/mmc/host/Makefile~sdhci-of-add-support-for-the-wii-sdhci-controller drivers/mmc/host/Makefile
@@ -39,6 +39,7 @@ obj-$(CONFIG_SDH_BFIN)		+= bfin_sdh.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
 
 ifeq ($(CONFIG_CB710_DEBUG),y)
 	CFLAGS-cb710-mmc	+= -DDEBUG
drivers/mmc/host/sdhci-of-core.c renamed from drivers/mmc/host/sdhci-of-core.c~sdhci-of-add-support-for-the-wii-sdhci-controller +3 -0
diff -puN drivers/mmc/host/sdhci-of-core.c~sdhci-of-add-support-for-the-wii-sdhci-controller drivers/mmc/host/sdhci-of-core.c
@@ -196,6 +196,9 @@ static const struct of_device_id sdhci_o
 	{ .compatible = "fsl,mpc8536-esdhc", .data = &sdhci_esdhc, },
 	{ .compatible = "fsl,esdhc", .data = &sdhci_esdhc, },
 #endif
+#ifdef CONFIG_MMC_SDHCI_OF_HLWD
+	{ .compatible = "nintendo,hollywood-sdhci", .data = &sdhci_hlwd, },
+#endif
 	{ .compatible = "generic-sdhci", },
 	{},
 };
drivers/mmc/host/sdhci-of-hlwd.c new file +65 -0

65 lines not on this page · raw message

drivers/mmc/host/sdhci-of.h renamed from drivers/mmc/host/sdhci-of.h~sdhci-of-add-support-for-the-wii-sdhci-controller +1 -0
diff -puN drivers/mmc/host/sdhci-of.h~sdhci-of-add-support-for-the-wii-sdhci-controller drivers/mmc/host/sdhci-of.h
@@ -37,5 +37,6 @@ extern void sdhci_be32bs_writew(struct s
 extern void sdhci_be32bs_writeb(struct sdhci_host *host, u8 val, int reg);
 
 extern struct sdhci_of_data sdhci_esdhc;
+extern struct sdhci_of_data sdhci_hlwd;
 
 #endif /* __SDHCI_OF_H */

_