2007-02-11 18:57:36 +00:00
|
|
|
#
|
|
|
|
# MMC/SD host controller drivers
|
|
|
|
#
|
|
|
|
|
2008-09-07 11:16:58 +00:00
|
|
|
comment "MMC/SD/SDIO Host Controller Drivers"
|
2007-02-11 18:57:36 +00:00
|
|
|
|
|
|
|
config MMC_ARMMMCI
|
|
|
|
tristate "ARM AMBA Multimedia Card Interface support"
|
2007-05-08 20:30:32 +00:00
|
|
|
depends on ARM_AMBA
|
2007-02-11 18:57:36 +00:00
|
|
|
help
|
|
|
|
This selects the ARM(R) AMBA(R) PrimeCell Multimedia Card
|
|
|
|
Interface (PL180 and PL181) support. If you have an ARM(R)
|
|
|
|
platform with a Multimedia Card slot, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
config MMC_PXA
|
|
|
|
tristate "Intel PXA25x/26x/27x Multimedia Card Interface support"
|
2007-05-08 20:30:32 +00:00
|
|
|
depends on ARCH_PXA
|
2007-02-11 18:57:36 +00:00
|
|
|
help
|
|
|
|
This selects the Intel(R) PXA(R) Multimedia card Interface.
|
|
|
|
If you have a PXA(R) platform with a Multimedia Card slot,
|
|
|
|
say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
config MMC_SDHCI
|
2008-01-05 22:18:58 +00:00
|
|
|
tristate "Secure Digital Host Controller Interface support"
|
2008-03-18 16:35:49 +00:00
|
|
|
depends on HAS_DMA
|
2007-02-11 18:57:36 +00:00
|
|
|
help
|
2008-03-18 16:35:49 +00:00
|
|
|
This selects the generic Secure Digital Host Controller Interface.
|
2007-02-11 18:57:36 +00:00
|
|
|
It is used by manufacturers such as Texas Instruments(R), Ricoh(R)
|
|
|
|
and Toshiba(R). Most controllers found in laptops are of this type.
|
2008-03-18 16:35:49 +00:00
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here. You
|
|
|
|
also need to enable an appropriate bus interface.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2009-03-16 21:13:46 +00:00
|
|
|
config MMC_SDHCI_IO_ACCESSORS
|
|
|
|
bool
|
|
|
|
depends on MMC_SDHCI
|
|
|
|
help
|
|
|
|
This is silent Kconfig symbol that is selected by the drivers that
|
|
|
|
need to overwrite SDHCI IO memory accessors.
|
|
|
|
|
2009-12-17 23:27:20 +00:00
|
|
|
config MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
|
|
|
bool
|
|
|
|
select MMC_SDHCI_IO_ACCESSORS
|
|
|
|
help
|
|
|
|
This option is selected by drivers running on big endian hosts
|
|
|
|
and performing I/O to a SDHCI controller through a bus that
|
|
|
|
implements a hardware byte swapper using a 32-bit datum.
|
|
|
|
This endian mapping mode is called "data invariance" and
|
|
|
|
has the effect of scrambling the addresses and formats of data
|
|
|
|
accessed in sizes other than the datum size.
|
|
|
|
|
2009-12-17 23:27:20 +00:00
|
|
|
This is the case for the Freescale eSDHC and Nintendo Wii SDHCI.
|
2009-12-17 23:27:20 +00:00
|
|
|
|
2008-03-18 16:35:49 +00:00
|
|
|
config MMC_SDHCI_PCI
|
|
|
|
tristate "SDHCI support on PCI bus"
|
|
|
|
depends on MMC_SDHCI && PCI
|
|
|
|
help
|
|
|
|
This selects the PCI Secure Digital Host Controller Interface.
|
|
|
|
Most controllers found today are PCI devices.
|
|
|
|
|
2007-02-11 18:57:36 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2007-09-15 19:54:08 +00:00
|
|
|
config MMC_RICOH_MMC
|
2012-10-02 18:17:47 +00:00
|
|
|
bool "Ricoh MMC Controller Disabler"
|
2008-03-18 16:35:49 +00:00
|
|
|
depends on MMC_SDHCI_PCI
|
2007-09-15 19:54:08 +00:00
|
|
|
help
|
ricoh_mmc: port from driver to pci quirk
This patch solves nasty problem original driver has.
Original goal of the ricoh_mmc was to disable this device because then,
mmc cards can be read using standard SDHCI controller, thus avoiding
writing of yet another driver.
However, the act of disablement, makes other pci functions that belong to
this controller (xD and memstick) shift up one level, thus pci core has
now wrong idea about these devices.
To fix this issue, this patch moves the driver into the pci quirk section,
thus it is executes before the pci is enumerated, and therefore solving
that issue, also same sequence of commands is performed on resume for same
reasons.
Also regardless of the above, this way is cleaner. You still need to set
CONFIG_MMC_RICOH_MMC to enable this quirk
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Philip Langdale <philipl@overt.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-05 21:43:20 +00:00
|
|
|
This adds a pci quirk to disable Ricoh MMC Controller. This
|
2007-09-15 19:54:08 +00:00
|
|
|
proprietary controller is unnecessary because the SDHCI driver
|
|
|
|
supports MMC cards on the SD controller, but if it is not
|
|
|
|
disabled, it will steal the MMC cards away - rendering them
|
ricoh_mmc: port from driver to pci quirk
This patch solves nasty problem original driver has.
Original goal of the ricoh_mmc was to disable this device because then,
mmc cards can be read using standard SDHCI controller, thus avoiding
writing of yet another driver.
However, the act of disablement, makes other pci functions that belong to
this controller (xD and memstick) shift up one level, thus pci core has
now wrong idea about these devices.
To fix this issue, this patch moves the driver into the pci quirk section,
thus it is executes before the pci is enumerated, and therefore solving
that issue, also same sequence of commands is performed on resume for same
reasons.
Also regardless of the above, this way is cleaner. You still need to set
CONFIG_MMC_RICOH_MMC to enable this quirk
Signed-off-by: Maxim Levitsky <maximlevitsky@gmail.com>
Acked-by: Philip Langdale <philipl@overt.org>
Acked-by: Wolfram Sang <w.sang@pengutronix.de>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
2010-03-05 21:43:20 +00:00
|
|
|
useless. It is safe to select this even if you don't
|
2007-09-15 19:54:08 +00:00
|
|
|
have a Ricoh based card reader.
|
|
|
|
|
|
|
|
If unsure, say Y.
|
|
|
|
|
2012-11-23 20:17:34 +00:00
|
|
|
config MMC_SDHCI_ACPI
|
|
|
|
tristate "SDHCI support for ACPI enumerated SDHCI controllers"
|
|
|
|
depends on MMC_SDHCI && ACPI
|
|
|
|
help
|
|
|
|
This selects support for ACPI enumerated SDHCI controllers,
|
|
|
|
identified by ACPI Compatibility ID PNP0D40 or specific
|
|
|
|
ACPI Hardware IDs.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
config MMC_SDHCI_PLTFM
|
|
|
|
tristate "SDHCI platform and OF driver helper"
|
2011-05-27 15:48:14 +00:00
|
|
|
depends on MMC_SDHCI
|
2011-06-02 02:57:50 +00:00
|
|
|
help
|
|
|
|
This selects the common helper functions support for Secure Digital
|
|
|
|
Host Controller Interface based platform and OF drivers.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
config MMC_SDHCI_OF_ESDHC
|
|
|
|
tristate "SDHCI OF support for the Freescale eSDHC controller"
|
|
|
|
depends on MMC_SDHCI_PLTFM
|
2011-01-03 17:56:38 +00:00
|
|
|
depends on PPC_OF
|
2009-12-17 23:27:20 +00:00
|
|
|
select MMC_SDHCI_BIG_ENDIAN_32BIT_BYTE_SWAPPER
|
|
|
|
help
|
|
|
|
This selects the Freescale eSDHC controller support.
|
2009-03-16 21:14:05 +00:00
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2009-03-16 21:14:05 +00:00
|
|
|
If unsure, say N.
|
|
|
|
|
2009-12-17 23:27:20 +00:00
|
|
|
config MMC_SDHCI_OF_HLWD
|
2011-06-02 02:57:50 +00:00
|
|
|
tristate "SDHCI OF support for the Nintendo Wii SDHCI controllers"
|
|
|
|
depends on MMC_SDHCI_PLTFM
|
2011-01-03 17:56:38 +00:00
|
|
|
depends on PPC_OF
|
2009-12-17 23:27:20 +00:00
|
|
|
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.
|
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2009-12-17 23:27:20 +00:00
|
|
|
If unsure, say N.
|
|
|
|
|
2010-08-11 01:01:49 +00:00
|
|
|
config MMC_SDHCI_CNS3XXX
|
2011-05-27 15:48:12 +00:00
|
|
|
tristate "SDHCI support on the Cavium Networks CNS3xxx SoC"
|
2010-08-11 01:01:49 +00:00
|
|
|
depends on ARCH_CNS3XXX
|
2011-06-02 02:57:50 +00:00
|
|
|
depends on MMC_SDHCI_PLTFM
|
2010-08-11 01:01:49 +00:00
|
|
|
help
|
|
|
|
This selects the SDHCI support for CNS3xxx System-on-Chip devices.
|
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2010-08-11 01:01:49 +00:00
|
|
|
If unsure, say N.
|
|
|
|
|
2010-10-15 10:21:04 +00:00
|
|
|
config MMC_SDHCI_ESDHC_IMX
|
2011-09-19 09:32:21 +00:00
|
|
|
tristate "SDHCI support for the Freescale eSDHC/uSDHC i.MX controller"
|
2011-08-24 06:41:08 +00:00
|
|
|
depends on ARCH_MXC
|
2011-06-02 02:57:50 +00:00
|
|
|
depends on MMC_SDHCI_PLTFM
|
2010-10-15 10:21:04 +00:00
|
|
|
select MMC_SDHCI_IO_ACCESSORS
|
|
|
|
help
|
2011-09-19 09:32:21 +00:00
|
|
|
This selects the Freescale eSDHC/uSDHC controller support
|
|
|
|
found on i.MX25, i.MX35 i.MX5x and i.MX6x.
|
2010-10-15 10:21:04 +00:00
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2010-10-15 10:21:04 +00:00
|
|
|
If unsure, say N.
|
|
|
|
|
2010-11-07 21:57:12 +00:00
|
|
|
config MMC_SDHCI_DOVE
|
2011-05-27 15:48:12 +00:00
|
|
|
tristate "SDHCI support on Marvell's Dove SoC"
|
2010-11-07 21:57:12 +00:00
|
|
|
depends on ARCH_DOVE
|
2011-06-02 02:57:50 +00:00
|
|
|
depends on MMC_SDHCI_PLTFM
|
2010-11-07 21:57:12 +00:00
|
|
|
select MMC_SDHCI_IO_ACCESSORS
|
|
|
|
help
|
|
|
|
This selects the Secure Digital Host Controller Interface in
|
|
|
|
Marvell's Dove SoC.
|
|
|
|
|
2011-06-02 02:57:50 +00:00
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2010-11-07 21:57:12 +00:00
|
|
|
If unsure, say N.
|
|
|
|
|
2011-01-02 04:52:56 +00:00
|
|
|
config MMC_SDHCI_TEGRA
|
2011-05-27 15:48:12 +00:00
|
|
|
tristate "SDHCI platform support for the Tegra SD/MMC Controller"
|
|
|
|
depends on ARCH_TEGRA
|
2011-06-02 02:57:50 +00:00
|
|
|
depends on MMC_SDHCI_PLTFM
|
2011-01-02 04:52:56 +00:00
|
|
|
select MMC_SDHCI_IO_ACCESSORS
|
|
|
|
help
|
|
|
|
This selects the Tegra SD/MMC controller. If you have a Tegra
|
|
|
|
platform with SD or MMC devices, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2009-06-14 12:52:37 +00:00
|
|
|
config MMC_SDHCI_S3C
|
|
|
|
tristate "SDHCI support on Samsung S3C SoC"
|
2010-08-19 21:13:35 +00:00
|
|
|
depends on MMC_SDHCI && PLAT_SAMSUNG
|
2009-06-14 12:52:37 +00:00
|
|
|
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.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2013-03-21 08:27:19 +00:00
|
|
|
config MMC_SDHCI_SIRF
|
|
|
|
tristate "SDHCI support on CSR SiRFprimaII and SiRFmarco SoCs"
|
|
|
|
depends on ARCH_SIRF
|
|
|
|
depends on MMC_SDHCI_PLTFM
|
|
|
|
help
|
|
|
|
This selects the SDHCI support for SiRF System-on-Chip devices.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2011-06-08 09:41:57 +00:00
|
|
|
config MMC_SDHCI_PXAV3
|
|
|
|
tristate "Marvell MMP2 SD Host Controller support (PXAV3)"
|
|
|
|
depends on CLKDEV_LOOKUP
|
|
|
|
select MMC_SDHCI
|
|
|
|
select MMC_SDHCI_PLTFM
|
|
|
|
default CPU_MMP2
|
|
|
|
help
|
|
|
|
This selects the Marvell(R) PXAV3 SD Host Controller.
|
|
|
|
If you have a MMP2 platform with SD Host Controller
|
|
|
|
and a card slot, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2011-06-08 09:41:58 +00:00
|
|
|
config MMC_SDHCI_PXAV2
|
|
|
|
tristate "Marvell PXA9XX SD Host Controller support (PXAV2)"
|
|
|
|
depends on CLKDEV_LOOKUP
|
|
|
|
select MMC_SDHCI
|
|
|
|
select MMC_SDHCI_PLTFM
|
|
|
|
default CPU_PXA910
|
|
|
|
help
|
|
|
|
This selects the Marvell(R) PXAV2 SD Host Controller.
|
|
|
|
If you have a PXA9XX platform with SD Host Controller
|
|
|
|
and a card slot, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2010-05-26 21:42:10 +00:00
|
|
|
config MMC_SDHCI_SPEAR
|
|
|
|
tristate "SDHCI support on ST SPEAr platform"
|
|
|
|
depends on MMC_SDHCI && PLAT_SPEAR
|
|
|
|
help
|
|
|
|
This selects the Secure Digital Host Controller Interface (SDHCI)
|
|
|
|
often referrered to as the HSMMC block in some of the ST SPEAR range
|
|
|
|
of SoC
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2009-06-14 12:52:37 +00:00
|
|
|
config MMC_SDHCI_S3C_DMA
|
|
|
|
bool "DMA support on S3C SDHCI"
|
2012-10-02 18:17:47 +00:00
|
|
|
depends on MMC_SDHCI_S3C
|
2009-06-14 12:52:37 +00:00
|
|
|
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.
|
|
|
|
|
2013-06-20 21:26:37 +00:00
|
|
|
config MMC_SDHCI_BCM_KONA
|
|
|
|
tristate "SDHCI support on Broadcom KONA platform"
|
|
|
|
depends on ARCH_BCM
|
|
|
|
select MMC_SDHCI_PLTFM
|
|
|
|
help
|
|
|
|
This selects the Broadcom Kona Secure Digital Host Controller
|
|
|
|
Interface(SDHCI) support.
|
|
|
|
This is used in Broadcom mobile SoCs.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
2013-01-03 05:34:49 +00:00
|
|
|
config MMC_SDHCI_BCM2835
|
|
|
|
tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
|
|
|
|
depends on ARCH_BCM2835
|
|
|
|
depends on MMC_SDHCI_PLTFM
|
|
|
|
select MMC_SDHCI_IO_ACCESSORS
|
|
|
|
help
|
|
|
|
This selects the BCM2835 SD/MMC controller. If you have a BCM2835
|
|
|
|
platform with SD or MMC devices, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2007-02-11 18:57:36 +00:00
|
|
|
config MMC_OMAP
|
|
|
|
tristate "TI OMAP Multimedia Card Interface support"
|
2007-05-08 20:30:32 +00:00
|
|
|
depends on ARCH_OMAP
|
2007-02-11 18:57:36 +00:00
|
|
|
select TPS65010 if MACH_OMAP_H2
|
|
|
|
help
|
|
|
|
This selects the TI OMAP Multimedia card Interface.
|
|
|
|
If you have an OMAP board with a Multimedia Card slot,
|
|
|
|
say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2009-01-23 00:05:23 +00:00
|
|
|
config MMC_OMAP_HS
|
|
|
|
tristate "TI OMAP High Speed Multimedia Card Interface support"
|
2013-07-10 16:06:24 +00:00
|
|
|
depends on ARCH_OMAP2PLUS || COMPILE_TEST
|
2009-01-23 00:05:23 +00:00
|
|
|
help
|
|
|
|
This selects the TI OMAP High Speed Multimedia card Interface.
|
2013-07-10 16:06:24 +00:00
|
|
|
If you have an omap2plus board with a Multimedia Card slot,
|
|
|
|
say Y or M here.
|
2009-01-23 00:05:23 +00:00
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2007-02-11 18:57:36 +00:00
|
|
|
config MMC_WBSD
|
|
|
|
tristate "Winbond W83L51xD SD/MMC Card Interface support"
|
2007-05-08 20:30:32 +00:00
|
|
|
depends on ISA_DMA_API
|
2007-02-11 18:57:36 +00:00
|
|
|
help
|
|
|
|
This selects the Winbond(R) W83L51xD Secure digital and
|
|
|
|
Multimedia card Interface.
|
|
|
|
If you have a machine with a integrated W83L518D or W83L519D
|
|
|
|
SD/MMC card reader, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
config MMC_AU1X
|
|
|
|
tristate "Alchemy AU1XX0 MMC Card Interface support"
|
2011-08-12 09:39:45 +00:00
|
|
|
depends on MIPS_ALCHEMY
|
2007-02-11 18:57:36 +00:00
|
|
|
help
|
|
|
|
This selects the AMD Alchemy(R) Multimedia card interface.
|
|
|
|
If you have a Alchemy platform with a MMC slot, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
atmel-mci: Driver for Atmel on-chip MMC controllers
This is a driver for the MMC controller on the AP7000 chips from
Atmel. It should in theory work on AT91 systems too with some
tweaking, but since the DMA interface is quite different, it's not
entirely clear if it's worth merging this with the at91_mci driver.
This driver has been around for a while in BSPs and kernel sources
provided by Atmel, but this particular version uses the generic DMA
Engine framework (with the slave extensions) instead of an
avr32-only DMA controller framework.
This driver can also use PIO transfers when no DMA channels are
available, and for transfers where using DMA may be difficult or
impractical for some reason (e.g. the DMA setup overhead is usually
not worth it for very short transfers, and badly aligned buffers or
lengths are difficult to handle.)
Currently, the driver only support PIO transfers. DMA support has been
split out to a separate patch to hopefully make it easier to review.
The driver has been tested using mmc-block and ext3fs on several SD,
SDHC and MMC+ cards. Reads and writes work fine, with read transfer
rates up to 3.5 MiB/s on fast cards with debugging disabled.
The driver has also been tested using the mmc_test module on the same
cards. All tests except 7, 9, 15 and 17 succeed. The first two are
unsupported by all the cards I have, so I don't know if the driver
handles this correctly. The last two fail because the hardware flags a
Data CRC Error instead of a Data Timeout error. I'm not sure how to deal
with that.
Documentation for this controller can be found in many data sheets from
Atmel, including the AT32AP7000 data sheet which can be found here:
http://www.atmel.com/dyn/products/datasheets.asp?family_id=682
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
2008-06-30 16:35:03 +00:00
|
|
|
config MMC_ATMELMCI
|
2012-10-29 14:27:55 +00:00
|
|
|
tristate "Atmel SD/MMC Driver (Multimedia Card Interface)"
|
2009-09-22 23:45:19 +00:00
|
|
|
depends on AVR32 || ARCH_AT91
|
atmel-mci: Driver for Atmel on-chip MMC controllers
This is a driver for the MMC controller on the AP7000 chips from
Atmel. It should in theory work on AT91 systems too with some
tweaking, but since the DMA interface is quite different, it's not
entirely clear if it's worth merging this with the at91_mci driver.
This driver has been around for a while in BSPs and kernel sources
provided by Atmel, but this particular version uses the generic DMA
Engine framework (with the slave extensions) instead of an
avr32-only DMA controller framework.
This driver can also use PIO transfers when no DMA channels are
available, and for transfers where using DMA may be difficult or
impractical for some reason (e.g. the DMA setup overhead is usually
not worth it for very short transfers, and badly aligned buffers or
lengths are difficult to handle.)
Currently, the driver only support PIO transfers. DMA support has been
split out to a separate patch to hopefully make it easier to review.
The driver has been tested using mmc-block and ext3fs on several SD,
SDHC and MMC+ cards. Reads and writes work fine, with read transfer
rates up to 3.5 MiB/s on fast cards with debugging disabled.
The driver has also been tested using the mmc_test module on the same
cards. All tests except 7, 9, 15 and 17 succeed. The first two are
unsupported by all the cards I have, so I don't know if the driver
handles this correctly. The last two fail because the hardware flags a
Data CRC Error instead of a Data Timeout error. I'm not sure how to deal
with that.
Documentation for this controller can be found in many data sheets from
Atmel, including the AT32AP7000 data sheet which can be found here:
http://www.atmel.com/dyn/products/datasheets.asp?family_id=682
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
2008-06-30 16:35:03 +00:00
|
|
|
help
|
|
|
|
This selects the Atmel Multimedia Card Interface driver. If
|
2009-09-22 23:45:19 +00:00
|
|
|
you have an AT32 (AVR32) or AT91 platform with a Multimedia
|
|
|
|
Card slot, say Y or M here.
|
atmel-mci: Driver for Atmel on-chip MMC controllers
This is a driver for the MMC controller on the AP7000 chips from
Atmel. It should in theory work on AT91 systems too with some
tweaking, but since the DMA interface is quite different, it's not
entirely clear if it's worth merging this with the at91_mci driver.
This driver has been around for a while in BSPs and kernel sources
provided by Atmel, but this particular version uses the generic DMA
Engine framework (with the slave extensions) instead of an
avr32-only DMA controller framework.
This driver can also use PIO transfers when no DMA channels are
available, and for transfers where using DMA may be difficult or
impractical for some reason (e.g. the DMA setup overhead is usually
not worth it for very short transfers, and badly aligned buffers or
lengths are difficult to handle.)
Currently, the driver only support PIO transfers. DMA support has been
split out to a separate patch to hopefully make it easier to review.
The driver has been tested using mmc-block and ext3fs on several SD,
SDHC and MMC+ cards. Reads and writes work fine, with read transfer
rates up to 3.5 MiB/s on fast cards with debugging disabled.
The driver has also been tested using the mmc_test module on the same
cards. All tests except 7, 9, 15 and 17 succeed. The first two are
unsupported by all the cards I have, so I don't know if the driver
handles this correctly. The last two fail because the hardware flags a
Data CRC Error instead of a Data Timeout error. I'm not sure how to deal
with that.
Documentation for this controller can be found in many data sheets from
Atmel, including the AT32AP7000 data sheet which can be found here:
http://www.atmel.com/dyn/products/datasheets.asp?family_id=682
Signed-off-by: Haavard Skinnemoen <haavard.skinnemoen@atmel.com>
Signed-off-by: Pierre Ossman <drzeus@drzeus.cx>
2008-06-30 16:35:03 +00:00
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2010-07-29 11:28:01 +00:00
|
|
|
config MMC_MSM
|
|
|
|
tristate "Qualcomm SDCC Controller Support"
|
2010-07-29 11:27:41 +00:00
|
|
|
depends on MMC && ARCH_MSM
|
2009-09-22 23:44:22 +00:00
|
|
|
help
|
|
|
|
This provides support for the SD/MMC cell found in the
|
2010-07-29 11:28:01 +00:00
|
|
|
MSM and QSD SOCs from Qualcomm. The controller also has
|
|
|
|
support for SDIO devices.
|
2009-09-22 23:44:22 +00:00
|
|
|
|
2009-01-06 16:04:14 +00:00
|
|
|
config MMC_MXC
|
2013-04-08 21:28:06 +00:00
|
|
|
tristate "Freescale i.MX21/27/31 or MPC512x Multimedia Card support"
|
|
|
|
depends on ARCH_MXC || PPC_MPC512x
|
2009-01-06 16:04:14 +00:00
|
|
|
help
|
2013-04-08 21:28:06 +00:00
|
|
|
This selects the Freescale i.MX21, i.MX27, i.MX31 or MPC512x
|
|
|
|
Multimedia Card Interface. If you have an i.MX or MPC512x platform
|
|
|
|
with a Multimedia Card slot, say Y or M here.
|
2007-02-11 18:57:36 +00:00
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2011-02-21 10:35:28 +00:00
|
|
|
config MMC_MXS
|
|
|
|
tristate "Freescale MXS Multimedia Card Interface support"
|
|
|
|
depends on ARCH_MXS && MXS_DMA
|
|
|
|
help
|
|
|
|
This selects the Freescale SSP MMC controller found on MXS based
|
|
|
|
platforms like mx23/28.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2007-02-11 18:57:36 +00:00
|
|
|
config MMC_TIFM_SD
|
2012-10-02 18:17:47 +00:00
|
|
|
tristate "TI Flash Media MMC/SD Interface support"
|
|
|
|
depends on PCI
|
2007-02-11 18:57:36 +00:00
|
|
|
select TIFM_CORE
|
|
|
|
help
|
|
|
|
Say Y here if you want to be able to access MMC/SD cards with
|
|
|
|
the Texas Instruments(R) Flash Media card reader, found in many
|
|
|
|
laptops.
|
|
|
|
This option 'selects' (turns on, enables) 'TIFM_CORE', but you
|
|
|
|
probably also need appropriate card reader host adapter, such as
|
|
|
|
'Misc devices: TI Flash Media PCI74xx/PCI76xx host adapter support
|
|
|
|
(TIFM_7XX1)'.
|
|
|
|
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
|
module will be called tifm_sd.
|
|
|
|
|
2009-02-14 08:07:26 +00:00
|
|
|
config MMC_MVSDIO
|
|
|
|
tristate "Marvell MMC/SD/SDIO host driver"
|
|
|
|
depends on PLAT_ORION
|
|
|
|
---help---
|
|
|
|
This selects the Marvell SDIO host driver.
|
|
|
|
SDIO may currently be found on the Kirkwood 88F6281 and 88F6192
|
|
|
|
SoC controllers.
|
|
|
|
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
|
module will be called mvsdio.
|
|
|
|
|
2009-12-15 02:01:21 +00:00
|
|
|
config MMC_DAVINCI
|
|
|
|
tristate "TI DAVINCI Multimedia Card Interface support"
|
|
|
|
depends on ARCH_DAVINCI
|
|
|
|
help
|
|
|
|
This selects the TI DAVINCI Multimedia card Interface.
|
|
|
|
If you have an DAVINCI board with a Multimedia Card slot,
|
|
|
|
say Y or M here. If unsure, say N.
|
|
|
|
|
2013-01-21 23:43:46 +00:00
|
|
|
config MMC_GOLDFISH
|
|
|
|
tristate "goldfish qemu Multimedia Card Interface support"
|
|
|
|
depends on GOLDFISH
|
|
|
|
help
|
|
|
|
This selects the Goldfish Multimedia card Interface emulation
|
|
|
|
found on the Goldfish Android virtual device emulation.
|
|
|
|
|
2007-08-08 16:12:54 +00:00
|
|
|
config MMC_SPI
|
2008-09-07 11:16:58 +00:00
|
|
|
tristate "MMC/SD/SDIO over SPI"
|
2008-09-07 11:07:57 +00:00
|
|
|
depends on SPI_MASTER && !HIGHMEM && HAS_DMA
|
2007-08-08 16:12:54 +00:00
|
|
|
select CRC7
|
|
|
|
select CRC_ITU_T
|
|
|
|
help
|
2009-01-26 10:12:25 +00:00
|
|
|
Some systems access MMC/SD/SDIO cards using a SPI controller
|
2008-09-07 11:16:58 +00:00
|
|
|
instead of using a "native" MMC/SD/SDIO controller. This has a
|
|
|
|
disadvantage of being relatively high overhead, but a compensating
|
|
|
|
advantage of working on many systems without dedicated MMC/SD/SDIO
|
|
|
|
controllers.
|
2007-08-08 16:12:54 +00:00
|
|
|
|
|
|
|
If unsure, or if your system has no SPI master driver, say N.
|
|
|
|
|
2008-06-30 21:40:24 +00:00
|
|
|
config MMC_S3C
|
|
|
|
tristate "Samsung S3C SD/MMC Card Interface support"
|
2012-02-03 05:29:23 +00:00
|
|
|
depends on ARCH_S3C24XX
|
2008-06-30 21:40:24 +00:00
|
|
|
help
|
|
|
|
This selects a driver for the MCI interface found in
|
|
|
|
Samsung's S3C2410, S3C2412, S3C2440, S3C2442 CPUs.
|
|
|
|
If you have a board based on one of those and a MMC/SD
|
|
|
|
slot, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2009-10-01 22:44:20 +00:00
|
|
|
config MMC_S3C_HW_SDIO_IRQ
|
|
|
|
bool "Hardware support for SDIO IRQ"
|
|
|
|
depends on MMC_S3C
|
|
|
|
help
|
|
|
|
Enable the hardware support for SDIO interrupts instead of using
|
|
|
|
the generic polling code.
|
|
|
|
|
2009-10-01 22:44:18 +00:00
|
|
|
choice
|
|
|
|
prompt "Samsung S3C SD/MMC transfer code"
|
|
|
|
depends on MMC_S3C
|
|
|
|
|
|
|
|
config MMC_S3C_PIO
|
|
|
|
bool "Use PIO transfers only"
|
|
|
|
help
|
|
|
|
Use PIO to transfer data between memory and the hardware.
|
|
|
|
|
|
|
|
PIO is slower than DMA as it requires CPU instructions to
|
|
|
|
move the data. This has been the traditional default for
|
|
|
|
the S3C MCI driver.
|
|
|
|
|
|
|
|
config MMC_S3C_DMA
|
2012-10-02 18:17:47 +00:00
|
|
|
bool "Use DMA transfers only"
|
2009-10-01 22:44:18 +00:00
|
|
|
help
|
|
|
|
Use DMA to transfer data between memory and the hardare.
|
|
|
|
|
|
|
|
Currently, the DMA support in this driver seems to not be
|
|
|
|
working properly and needs to be debugged before this
|
|
|
|
option is useful.
|
|
|
|
|
|
|
|
config MMC_S3C_PIODMA
|
2012-10-02 18:17:47 +00:00
|
|
|
bool "Support for both PIO and DMA"
|
2009-10-01 22:44:18 +00:00
|
|
|
help
|
|
|
|
Compile both the PIO and DMA transfer routines into the
|
|
|
|
driver and let the platform select at run-time which one
|
|
|
|
is best.
|
|
|
|
|
|
|
|
See notes for the DMA option.
|
|
|
|
|
|
|
|
endchoice
|
|
|
|
|
2008-07-15 12:21:29 +00:00
|
|
|
config MMC_SDRICOH_CS
|
2012-10-02 18:17:47 +00:00
|
|
|
tristate "MMC/SD driver for Ricoh Bay1Controllers"
|
|
|
|
depends on PCI && PCMCIA
|
2008-07-15 12:21:29 +00:00
|
|
|
help
|
|
|
|
Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
|
|
|
|
card whenever you insert a MMC or SD card into the card slot.
|
|
|
|
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
|
module will be called sdricoh_cs.
|
|
|
|
|
2011-03-23 11:42:44 +00:00
|
|
|
config MMC_TMIO_CORE
|
|
|
|
tristate
|
|
|
|
|
2008-07-15 15:02:21 +00:00
|
|
|
config MMC_TMIO
|
|
|
|
tristate "Toshiba Mobile IO Controller (TMIO) MMC/SD function support"
|
2011-03-14 08:52:33 +00:00
|
|
|
depends on MFD_TMIO || MFD_ASIC3
|
2011-03-23 11:42:44 +00:00
|
|
|
select MMC_TMIO_CORE
|
2008-07-15 15:02:21 +00:00
|
|
|
help
|
|
|
|
This provides support for the SD/MMC cell found in TC6393XB,
|
2009-06-04 18:12:37 +00:00
|
|
|
T7L66XB and also HTC ASIC3
|
2009-05-22 18:33:59 +00:00
|
|
|
|
2011-03-14 08:52:33 +00:00
|
|
|
config MMC_SDHI
|
|
|
|
tristate "SH-Mobile SDHI SD/SDIO controller support"
|
2011-03-28 07:16:33 +00:00
|
|
|
depends on SUPERH || ARCH_SHMOBILE
|
2011-03-14 08:52:33 +00:00
|
|
|
select MMC_TMIO_CORE
|
|
|
|
help
|
|
|
|
This provides support for the SDHI SD/SDIO controller found in
|
|
|
|
SuperH and ARM SH-Mobile SoCs
|
|
|
|
|
2009-05-22 18:33:59 +00:00
|
|
|
config MMC_CB710
|
|
|
|
tristate "ENE CB710 MMC/SD Interface support"
|
2013-02-06 16:23:56 +00:00
|
|
|
depends on PCI && GENERIC_HARDIRQS
|
2009-05-22 18:33:59 +00:00
|
|
|
select CB710_CORE
|
|
|
|
help
|
|
|
|
This option enables support for MMC/SD part of ENE CB710/720 Flash
|
|
|
|
memory card reader found in some laptops (ie. some versions of
|
|
|
|
HP Compaq nx9500).
|
|
|
|
|
|
|
|
This driver can also be built as a module. If so, the module
|
|
|
|
will be called cb710-mmc.
|
|
|
|
|
2009-06-17 18:22:39 +00:00
|
|
|
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.
|
2009-12-15 02:01:32 +00:00
|
|
|
|
|
|
|
config SDH_BFIN
|
|
|
|
tristate "Blackfin Secure Digital Host support"
|
2010-03-05 21:43:24 +00:00
|
|
|
depends on (BF54x && !BF544) || (BF51x && !BF512)
|
2009-12-15 02:01:32 +00:00
|
|
|
help
|
|
|
|
If you say yes here you will get support for the Blackfin on-chip
|
|
|
|
Secure Digital Host interface. This includes support for MMC and
|
|
|
|
SD cards.
|
|
|
|
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
|
module will be called bfin_sdh.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
|
|
|
config SDH_BFIN_MISSING_CMD_PULLUP_WORKAROUND
|
|
|
|
bool "Blackfin EZkit Missing SDH_CMD Pull Up Resistor Workaround"
|
|
|
|
depends on SDH_BFIN
|
|
|
|
help
|
|
|
|
If you say yes here SD-Cards may work on the EZkit.
|
2010-05-26 21:41:59 +00:00
|
|
|
|
2011-01-02 06:11:59 +00:00
|
|
|
config MMC_DW
|
|
|
|
tristate "Synopsys DesignWare Memory Card Interface"
|
|
|
|
depends on ARM
|
|
|
|
help
|
|
|
|
This selects support for the Synopsys DesignWare Mobile Storage IP
|
|
|
|
block, this provides host support for SD and MMC interfaces, in both
|
|
|
|
PIO and external DMA modes.
|
|
|
|
|
|
|
|
config MMC_DW_IDMAC
|
|
|
|
bool "Internal DMAC interface"
|
|
|
|
depends on MMC_DW
|
|
|
|
help
|
|
|
|
This selects support for the internal DMAC block within the Synopsys
|
|
|
|
Designware Mobile Storage IP block. This disables the external DMA
|
|
|
|
interface.
|
|
|
|
|
2012-01-13 10:34:57 +00:00
|
|
|
config MMC_DW_PLTFM
|
|
|
|
tristate "Synopsys Designware MCI Support as platform device"
|
|
|
|
depends on MMC_DW
|
|
|
|
default y
|
|
|
|
help
|
|
|
|
This selects the common helper functions support for Host Controller
|
|
|
|
Interface based platform driver. Please select this option if the IP
|
|
|
|
is present as a platform device. This is the common interface for the
|
|
|
|
Synopsys Designware IP.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say Y.
|
|
|
|
|
2012-09-17 18:16:43 +00:00
|
|
|
config MMC_DW_EXYNOS
|
2012-11-30 07:44:39 +00:00
|
|
|
tristate "Exynos specific extensions for Synopsys DW Memory Card Interface"
|
2012-09-17 18:16:43 +00:00
|
|
|
depends on MMC_DW
|
|
|
|
select MMC_DW_PLTFM
|
|
|
|
help
|
|
|
|
This selects support for Samsung Exynos SoC specific extensions to the
|
|
|
|
Synopsys DesignWare Memory Card Interface driver. Select this option
|
|
|
|
for platforms based on Exynos4 and Exynos5 SoC's.
|
|
|
|
|
2013-06-12 15:18:51 +00:00
|
|
|
config MMC_DW_SOCFPGA
|
|
|
|
tristate "SOCFPGA specific extensions for Synopsys DW Memory Card Interface"
|
2013-08-01 00:28:13 +00:00
|
|
|
depends on MMC_DW && MFD_SYSCON
|
2013-06-12 15:18:51 +00:00
|
|
|
select MMC_DW_PLTFM
|
|
|
|
help
|
|
|
|
This selects support for Altera SoCFPGA specific extensions to the
|
|
|
|
Synopsys DesignWare Memory Card Interface driver.
|
|
|
|
|
2012-01-13 10:34:57 +00:00
|
|
|
config MMC_DW_PCI
|
|
|
|
tristate "Synopsys Designware MCI support on PCI bus"
|
|
|
|
depends on MMC_DW && PCI
|
|
|
|
help
|
|
|
|
This selects the PCI bus for the Synopsys Designware Mobile Storage IP.
|
|
|
|
Select this option if the IP is present on PCI platform.
|
|
|
|
|
|
|
|
If you have a controller with this interface, say Y or M here.
|
|
|
|
|
|
|
|
If unsure, say N.
|
|
|
|
|
2010-05-26 21:41:59 +00:00
|
|
|
config MMC_SH_MMCIF
|
|
|
|
tristate "SuperH Internal MMCIF support"
|
|
|
|
depends on MMC_BLOCK && (SUPERH || ARCH_SHMOBILE)
|
|
|
|
help
|
tree-wide: fix comment/printk typos
"gadget", "through", "command", "maintain", "maintain", "controller", "address",
"between", "initiali[zs]e", "instead", "function", "select", "already",
"equal", "access", "management", "hierarchy", "registration", "interest",
"relative", "memory", "offset", "already",
Signed-off-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Jiri Kosina <jkosina@suse.cz>
2010-11-01 19:38:34 +00:00
|
|
|
This selects the MMC Host Interface controller (MMCIF).
|
2010-05-26 21:41:59 +00:00
|
|
|
|
|
|
|
This driver supports MMCIF in sh7724/sh7757/sh7372.
|
2010-07-15 20:06:04 +00:00
|
|
|
|
|
|
|
config MMC_JZ4740
|
|
|
|
tristate "JZ4740 SD/Multimedia Card Interface support"
|
|
|
|
depends on MACH_JZ4740
|
|
|
|
help
|
|
|
|
This selects support for the SD/MMC controller on Ingenic JZ4740
|
|
|
|
SoCs.
|
|
|
|
If you have a board based on such a SoC and with a SD/MMC slot,
|
|
|
|
say Y or M here.
|
2010-09-02 14:15:08 +00:00
|
|
|
|
2011-05-14 20:48:13 +00:00
|
|
|
config MMC_VUB300
|
|
|
|
tristate "VUB300 USB to SDIO/SD/MMC Host Controller support"
|
|
|
|
depends on USB
|
|
|
|
help
|
|
|
|
This selects support for Elan Digital Systems' VUB300 chip.
|
|
|
|
|
|
|
|
The VUB300 is a USB-SDIO Host Controller Interface chip
|
|
|
|
that enables the host computer to use SDIO/SD/MMC cards
|
|
|
|
via a USB 2.0 or USB 1.1 host.
|
|
|
|
|
|
|
|
The VUB300 chip will be found in both physically separate
|
|
|
|
USB to SDIO/SD/MMC adapters and embedded on some motherboards.
|
|
|
|
|
|
|
|
The VUB300 chip supports SD and MMC memory cards in addition
|
|
|
|
to single and multifunction SDIO cards.
|
|
|
|
|
|
|
|
Some SDIO cards will need a firmware file to be loaded and
|
|
|
|
sent to VUB300 chip in order to achieve better data throughput.
|
|
|
|
Download these "Offload Pseudocode" from Elan Digital Systems'
|
|
|
|
web-site http://www.elandigitalsystems.com/support/downloads.php
|
|
|
|
and put them in /lib/firmware. Note that without these additional
|
|
|
|
firmware files the VUB300 chip will still function, but not at
|
|
|
|
the best obtainable data rate.
|
|
|
|
|
|
|
|
To compile this mmc host controller driver as a module,
|
|
|
|
choose M here: the module will be called vub300.
|
|
|
|
|
|
|
|
If you have a computer with an embedded VUB300 chip
|
|
|
|
or if you intend connecting a USB adapter based on a
|
|
|
|
VUB300 chip say Y or M here.
|
|
|
|
|
2010-09-02 14:15:08 +00:00
|
|
|
config MMC_USHC
|
|
|
|
tristate "USB SD Host Controller (USHC) support"
|
|
|
|
depends on USB
|
|
|
|
help
|
|
|
|
This selects support for USB SD Host Controllers based on
|
|
|
|
the Cypress Astoria chip with firmware compliant with CSR's
|
|
|
|
USB SD Host Controller specification (CS-118793-SP).
|
|
|
|
|
|
|
|
CSR boards with this device include: USB<>SDIO (M1985v2),
|
|
|
|
and Ultrasira.
|
|
|
|
|
|
|
|
Note: These controllers only support SDIO cards and do not
|
|
|
|
support MMC or SD memory cards.
|
2012-11-18 02:33:06 +00:00
|
|
|
|
|
|
|
config MMC_WMT
|
|
|
|
tristate "Wondermedia SD/MMC Host Controller support"
|
|
|
|
depends on ARCH_VT8500
|
|
|
|
default y
|
|
|
|
help
|
|
|
|
This selects support for the SD/MMC Host Controller on
|
|
|
|
Wondermedia WM8505/WM8650 based SoCs.
|
|
|
|
|
|
|
|
To compile this driver as a module, choose M here: the
|
|
|
|
module will be called wmt-sdmmc.
|
Char/Misc driver merge for 3.8-rc1
Here is the "big" char/misc driver patches for 3.8-rc1. I'm starting to
put random driver subsystems that I had previously sent you through the
driver-core tree in this tree, as it makes more sense to do so.
Nothing major here, the various __dev* removals, some mei driver
updates, and other random driver-specific things from the different
maintainers and developers.
Note, some MFD drivers got added through this tree, and they are also
coming in through the "real" MFD tree as well, due to some major
mis-communication between me and the different developers. If you have
any merge conflicts, take the ones from the MFD tree, not these ones,
sorry about that.
All of this has been in linux-next for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
iEYEABECAAYFAlDHj7AACgkQMUfUDdst+ym7pQCgxhFDGQRJimG+Ddag+ghfLhQh
Ql0AoJsWVFvQjb7q1NO7OvOABaxjEJdu
=na5b
-----END PGP SIGNATURE-----
Merge tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc
Pull Char/Misc driver merge from Greg Kroah-Hartman:
"Here is the "big" char/misc driver patches for 3.8-rc1. I'm starting
to put random driver subsystems that I had previously sent you through
the driver-core tree in this tree, as it makes more sense to do so.
Nothing major here, the various __dev* removals, some mei driver
updates, and other random driver-specific things from the different
maintainers and developers.
Note, some MFD drivers got added through this tree, and they are also
coming in through the "real" MFD tree as well, due to some major
mis-communication between me and the different developers. If you
have any merge conflicts, take the ones from the MFD tree, not these
ones, sorry about that.
All of this has been in linux-next for a while.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>"
Fix up trivial conflict in drivers/mmc/host/Kconfig due to new drivers
having been added (both at the end, as usual..)
* tag 'char-misc-3.8-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc: (84 commits)
MAINTAINERS: remove drivers/staging/hv/
misc/st_kim: Free resources in the error path of probe()
drivers/char: for hpet, add count checking, and ~0UL instead of -1
w1-gpio: Simplify & get rid of defines
w1-gpio: Pinctrl-fy
extcon: remove use of __devexit_p
extcon: remove use of __devinit
extcon: remove use of __devexit
drivers: uio: Only allocate new private data when probing device tree node
drivers: uio_dmem_genirq: Allow partial success when opening device
drivers: uio_dmem_genirq: Don't use DMA_ERROR_CODE to indicate unmapped regions
drivers: uio_dmem_genirq: Don't mix address spaces for dynamic region vaddr
uio: remove use of __devexit
uio: remove use of __devinitdata
uio: remove use of __devinit
uio: remove use of __devexit_p
char: remove use of __devexit
char: remove use of __devinitconst
char: remove use of __devinitdata
char: remove use of __devinit
...
2012-12-11 21:56:38 +00:00
|
|
|
|
2012-11-09 12:53:34 +00:00
|
|
|
config MMC_REALTEK_PCI
|
|
|
|
tristate "Realtek PCI-E SD/MMC Card Interface Driver"
|
|
|
|
depends on MFD_RTSX_PCI
|
|
|
|
help
|
|
|
|
Say Y here to include driver code to support SD/MMC card interface
|
|
|
|
of Realtek PCI-E card reader
|