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

Commit 00ebb638 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (66 commits)
  mmc: add new sdhci-pxa driver for Marvell SoCs
  mmc: make number of mmcblk minors configurable
  mmc_spi: Recover from CRC errors for r/w operation over SPI.
  mmc: sdhci-pltfm: add -pltfm driver for imx35/51
  mmc: sdhci-of-esdhc: factor out common stuff
  mmc: sdhci_pltfm: pass more data on custom init call
  mmc: sdhci: introduce get_ro private write-protect hook
  mmc: sdhci-pltfm: move .h file into appropriate subdir
  mmc: sdhci-pltfm: Add structure for host-specific data
  mmc: fix cb710 kconfig dependency warning
  mmc: cb710: remove debugging printk (info duplicated from mmc-core)
  mmc: cb710: clear irq handler on init() error path
  mmc: cb710: remove unnecessary msleep()
  mmc: cb710: implement get_cd() callback
  mmc: cb710: partially demystify clock selection
  mmc: add a file to debugfs for changing host clock at runtime
  mmc: sdhci: allow for eMMC 74 clock generation by controller
  mmc: sdhci: highspeed: check for mmc as well as sd cards
  mmc: sdhci: Add Moorestown device support
  mmc: sdhci: Intel Medfield support
  ...
parents 11cc21f5 536ac998

Documentation/devices.txt

+6 −0
Original line number Original line Diff line number Diff line
@@ -2520,6 +2520,12 @@ Your cooperation is appreciated. 
		  8 = /dev/mmcblk1      Second SD/MMC card

		  8 = /dev/mmcblk1      Second SD/MMC card

		    ...

		    ...





		The start of next SD/MMC card can be configured with

		CONFIG_MMC_BLOCK_MINORS, or overridden at boot/modprobe

		time using the mmcblk.perdev_minors option. That would

		bump the offset between each card to be the configured

		value instead of the default 8.



179 char	CCube DVXChip-based PCI products

179 char	CCube DVXChip-based PCI products

		  0 = /dev/dvxirq0	First DVX device

		  0 = /dev/dvxirq0	First DVX device

		  1 = /dev/dvxirq1	Second DVX device

		  1 = /dev/dvxirq1	Second DVX device

arch/arm/plat-pxa/include/plat/sdhci.h

0 → 100644
+32 −0
Original line number Original line Diff line number Diff line 
/* linux/arch/arm/plat-pxa/include/plat/sdhci.h

 *

 * Copyright 2010 Marvell

 *	Zhangfei Gao <zhangfei.gao@marvell.com>

 *

 * PXA Platform - SDHCI platform data definitions

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 */



#ifndef __PLAT_PXA_SDHCI_H

#define __PLAT_PXA_SDHCI_H



/* pxa specific flag */

/* Require clock free running */

#define PXA_FLAG_DISABLE_CLOCK_GATING (1<<0)



/*

 * struct pxa_sdhci_platdata() - Platform device data for PXA SDHCI

 * @max_speed: the maximum speed supported

 * @quirks: quirks of specific device

 * @flags: flags for platform requirement

 */

struct sdhci_pxa_platdata {

	unsigned int	max_speed;

	unsigned int	quirks;

	unsigned int	flags;

};



#endif /* __PLAT_PXA_SDHCI_H */

drivers/mmc/Makefile

+1 −3
Original line number Original line Diff line number Diff line
@@ -2,9 +2,7 @@ 
# Makefile for the kernel mmc device drivers.

# Makefile for the kernel mmc device drivers.

#

#





ifeq ($(CONFIG_MMC_DEBUG),y)

subdir-ccflags-$(CONFIG_MMC_DEBUG) := -DDEBUG

	EXTRA_CFLAGS		+= -DDEBUG

endif





obj-$(CONFIG_MMC)		+= core/

obj-$(CONFIG_MMC)		+= core/

obj-$(CONFIG_MMC)		+= card/

obj-$(CONFIG_MMC)		+= card/

drivers/mmc/card/Kconfig

+17 −0
Original line number Original line Diff line number Diff line
@@ -14,6 +14,23 @@ config MMC_BLOCK 
	  mount the filesystem. Almost everyone wishing MMC support

	  mount the filesystem. Almost everyone wishing MMC support

	  should say Y or M here.

	  should say Y or M here.





config MMC_BLOCK_MINORS

	int "Number of minors per block device"

	range 4 256

	default 8

	help

	  Number of minors per block device. One is needed for every

	  partition on the disk (plus one for the whole disk).



	  Number of total MMC minors available is 256, so your number

	  of supported block devices will be limited to 256 divided

	  by this number.



	  Default is 8 to be backwards compatible with previous

	  hardwired device numbering.



	  If unsure, say 8 here.



config MMC_BLOCK_BOUNCE

config MMC_BLOCK_BOUNCE

	bool "Use bounce buffer for simple hosts"

	bool "Use bounce buffer for simple hosts"

	depends on MMC_BLOCK

	depends on MMC_BLOCK

drivers/mmc/card/Makefile

+0 −4
Original line number Original line Diff line number Diff line
@@ -2,10 +2,6 @@ 
# Makefile for MMC/SD card drivers

# Makefile for MMC/SD card drivers

#

#





ifeq ($(CONFIG_MMC_DEBUG),y)

	EXTRA_CFLAGS		+= -DDEBUG

endif



obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

obj-$(CONFIG_MMC_BLOCK)		+= mmc_block.o

mmc_block-objs			:= block.o queue.o

mmc_block-objs			:= block.o queue.o

obj-$(CONFIG_MMC_TEST)		+= mmc_test.o

obj-$(CONFIG_MMC_TEST)		+= mmc_test.o