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

Commit 1144ab5d authored by Albert Herranz's avatar Albert Herranz Committed by Linus Torvalds
Browse files

sdhci-of: add support for the wii sdhci controller 



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

Signed-off-by: default avatarAlbert Herranz <albert_herranz@yahoo.es>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 7657c3a7

drivers/mmc/host/Kconfig

+12 −1
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ config MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER 
	  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

+1 −0
Original line number Diff line number Diff line
@@ -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

+3 −0
Original line number Diff line number Diff line
@@ -195,6 +195,9 @@ static const struct of_device_id sdhci_of_match[] = { 
	{ .compatible = "fsl,mpc8379-esdhc", .data = &sdhci_esdhc, },

	{ .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

0 → 100644
+65 −0
Original line number Diff line number Diff line 
/*

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

 *

 * Nintendo Wii Secure Digital Host Controller Interface.

 * Copyright (C) 2009 The GameCube Linux Team

 * Copyright (C) 2009 Albert Herranz

 *

 * Based on sdhci-of-esdhc.c

 *

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

 */



#include <linux/delay.h>

#include <linux/mmc/host.h>

#include "sdhci-of.h"

#include "sdhci.h"



/*

 * Ops and quirks for the Nintendo Wii SDHCI controllers.

 */



/*

 * We need a small delay after each write, or things go horribly wrong.

 */

#define SDHCI_HLWD_WRITE_DELAY	5 /* usecs */



static void sdhci_hlwd_writel(struct sdhci_host *host, u32 val, int reg)

{

	sdhci_be32bs_writel(host, val, reg);

	udelay(SDHCI_HLWD_WRITE_DELAY);

}



static void sdhci_hlwd_writew(struct sdhci_host *host, u16 val, int reg)

{

	sdhci_be32bs_writew(host, val, reg);

	udelay(SDHCI_HLWD_WRITE_DELAY);

}



static void sdhci_hlwd_writeb(struct sdhci_host *host, u8 val, int reg)

{

	sdhci_be32bs_writeb(host, val, reg);

	udelay(SDHCI_HLWD_WRITE_DELAY);

}



struct sdhci_of_data sdhci_hlwd = {

	.quirks = SDHCI_QUIRK_32BIT_DMA_ADDR |

		  SDHCI_QUIRK_32BIT_DMA_SIZE,

	.ops = {

		.readl = sdhci_be32bs_readl,

		.readw = sdhci_be32bs_readw,

		.readb = sdhci_be32bs_readb,

		.writel = sdhci_hlwd_writel,

		.writew = sdhci_hlwd_writew,

		.writeb = sdhci_hlwd_writeb,

	},

};

drivers/mmc/host/sdhci-of.h

+1 −0
Original line number Diff line number Diff line
@@ -37,5 +37,6 @@ 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_of_data sdhci_esdhc;

extern struct sdhci_of_data sdhci_hlwd;



#endif /* __SDHCI_OF_H */