Commit f234012f authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc 

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/drzeus/mmc:
  sdhci: remove needless double parenthesis
  sdhci: Specific quirk vor VIA SDHCI controller in VX855ES
  s3cmci: fix dma configuration call
  mmc: Add new via-sdmmc host controller driver
  sdhci: Add support for hosts that are only capable of 1-bit transfers
  MAINTAINERS: add myself as atmel-mci maintainer (sd/mmc interface)
  sdhci: Add SDHCI_QUIRK_NO_MULTIBLOCK quirk
  sdhci: Add better ADMA error reporting
  sdhci-s3c: Samsung S3C based SDHCI controller glue
parents 00d94a6a 11a2f1b7

Documentation/powerpc/dts-bindings/fsl/esdhc.txt

+2 −0
Original line number Diff line number Diff line
@@ -10,6 +10,8 @@ Required properties: 
  - interrupts : should contain eSDHC interrupt.

  - interrupt-parent : interrupt source phandle.

  - clock-frequency : specifies eSDHC base clock frequency.

  - sdhci,1-bit-only : (optional) specifies that a controller can

    only handle 1-bit data transfers.



Example:

MAINTAINERS

+22 −0
Original line number Diff line number Diff line
@@ -1010,6 +1010,13 @@ W: http://www.at91.com/ 
S:	Maintained

F:	drivers/mmc/host/at91_mci.c



ATMEL AT91 / AT32 MCI DRIVER

P:	Nicolas Ferre

M:	nicolas.ferre@atmel.com

S:	Maintained

F:	drivers/mmc/host/atmel-mci.c

F:	drivers/mmc/host/atmel-mci-regs.h



ATMEL AT91 / AT32 SERIAL DRIVER

P:	Haavard Skinnemoen

M:	hskinnemoen@atmel.com
@@ -5094,6 +5101,13 @@ L: sdhci-devel@lists.ossman.eu 
S:	Maintained

F:	drivers/mmc/host/sdhci.*



SECURE DIGITAL HOST CONTROLLER INTERFACE (SDHCI) SAMSUNG DRIVER

P:	Ben Dooks

M:	ben-linux@fluff.org

L:	sdhci-devel@lists.ossman.eu

S:	Maintained

F:	drivers/mmc/host/sdhci-s3c.c



SECURITY SUBSYSTEM

P:	James Morris

M:	jmorris@namei.org
@@ -6216,6 +6230,14 @@ S: Maintained 
F:	Documentation/i2c/busses/i2c-viapro

F:	drivers/i2c/busses/i2c-viapro.c



VIA SD/MMC CARD CONTROLLER DRIVER

P:	Joseph Chan

M:	JosephChan@via.com.tw

P:	Harald Welte

M:	HaraldWelte@viatech.com

S:	Maintained

F:	drivers/mmc/host/via-sdmmc.c



VIA UNICHROME(PRO)/CHROME9 FRAMEBUFFER DRIVER

P:	Joseph Chan

M:	JosephChan@via.com.tw

drivers/mmc/host/Kconfig

+36 −0
Original line number Diff line number Diff line
@@ -94,6 +94,31 @@ config MMC_SDHCI_PLTFM 


	  If unsure, say N.



config MMC_SDHCI_S3C

	tristate "SDHCI support on Samsung S3C SoC"

	depends on MMC_SDHCI && (PLAT_S3C24XX || PLAT_S3C64XX)

	help

	  This selects the Secure Digital Host Controller Interface (SDHCI)

	  often referrered to as the HSMMC block in some of the Samsung S3C

	  range of SoC.



	  Note, due to the problems with DMA, the DMA support is only

	  available with CONFIG_EXPERIMENTAL is selected.



	  If you have a controller with this interface, say Y or M here.



	  If unsure, say N.



config MMC_SDHCI_S3C_DMA

	bool "DMA support on S3C SDHCI"

	depends on MMC_SDHCI_S3C && EXPERIMENTAL

	help

	  Enable DMA support on the Samsung S3C SDHCI glue. The DMA

	  has proved to be problematic if the controller encounters

	  certain errors, and thus should be treated with care.



	  YMMV.



config MMC_OMAP

	tristate "TI OMAP Multimedia Card Interface support"

	depends on ARCH_OMAP
@@ -265,3 +290,14 @@ config MMC_CB710 
	  This driver can also be built as a module. If so, the module

	  will be called cb710-mmc.



config MMC_VIA_SDMMC

	tristate "VIA SD/MMC Card Reader Driver"

	depends on PCI

	help

	  This selects the VIA SD/MMC Card Reader driver, say Y or M here.

	  VIA provides one multi-functional card reader which integrated into

	  some motherboards manufactured by VIA. This card reader supports

	  SD/MMC/SDHC.

	  If you have a controller with this interface, say Y or M here.



	  If unsure, say N.

drivers/mmc/host/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ obj-$(CONFIG_MMC_SDHCI_PCI) += sdhci-pci.o 
obj-$(CONFIG_MMC_RICOH_MMC)	+= ricoh_mmc.o

obj-$(CONFIG_MMC_SDHCI_OF)	+= sdhci-of.o

obj-$(CONFIG_MMC_SDHCI_PLTFM)	+= sdhci-pltfm.o

obj-$(CONFIG_MMC_SDHCI_S3C)	+= sdhci-s3c.o

obj-$(CONFIG_MMC_WBSD)		+= wbsd.o

obj-$(CONFIG_MMC_AU1X)		+= au1xmmc.o

obj-$(CONFIG_MMC_OMAP)		+= omap.o
@@ -31,6 +32,7 @@ obj-$(CONFIG_MMC_S3C) += s3cmci.o 
obj-$(CONFIG_MMC_SDRICOH_CS)	+= sdricoh_cs.o

obj-$(CONFIG_MMC_TMIO)		+= tmio_mmc.o

obj-$(CONFIG_MMC_CB710)	+= cb710-mmc.o

obj-$(CONFIG_MMC_VIA_SDMMC)	+= via-sdmmc.o



ifeq ($(CONFIG_CB710_DEBUG),y)

	CFLAGS-cb710-mmc	+= -DDEBUG

drivers/mmc/host/s3cmci.c

+1 −1
Original line number Diff line number Diff line
@@ -794,7 +794,7 @@ static void s3cmci_dma_setup(struct s3cmci_host *host, 
			      host->mem->start + host->sdidata);



	if (!setup_ok) {

		s3c2410_dma_config(host->dma, 4, 0);

		s3c2410_dma_config(host->dma, 4);

		s3c2410_dma_set_buffdone_fn(host->dma,

					    s3cmci_dma_done_callback);

		s3c2410_dma_setflags(host->dma, S3C2410_DMAF_AUTOSTART);

CRA Git | Maintained and supported by SUSTech CRA and CCSE