Commit 2625b10d 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: (25 commits)
  atmel-mci: add MCI2 register definitions
  atmel-mci: Integrate AT91 specific definition in header file
  tmio_mmc: allow compilation for ASIC3
  mmc_block: do not DMA to stack
  sdhci: Print ADMA status and pointer on debug
  tmio_mmc: fix clock setup
  tmio_mmc: map SD control registers after enabling the MFD cell
  tmio_mmc: correct probe return value for num_resources != 3
  tmio_mmc: don't use set_irq_type
  tmio_mmc: add bus_shift support
  MFD,mmc: tmio_mmc: make HCLK configurable
  mmc_spi: don't use EINVAL for possible transmission errors
  cb710: more cleanup for the DEBUG case.
  sdhci: platform driver for SDHCI
  mxcmmc: remove frequency workaround
  cb710: handle DEBUG define in Makefile
  cb710: add missing parenthesis
  cb710: fix printk format string
  mmc: Driver for CB710/720 memory card reader (MMC part)
  pxamci: add regulator support.
  ...
parents 489f7ab6 7f72134c

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -2112,6 +2112,15 @@ W: http://sourceforge.net/projects/lpfcxxxx 
S:	Supported

F:	drivers/scsi/lpfc/



ENE CB710 FLASH CARD READER DRIVER

P:	Michał Mirosław

M:	mirq-linux@rere.qmqm.pl

L:	linux-kernel@vger.kernel.org

S:	Maintained

F:	drivers/misc/cb710/

F:	drivers/mmc/host/cb710-mmc.*

F:	include/linux/cb710.h



EPSON 1355 FRAMEBUFFER DRIVER

P:	Christopher Hoover

M:	ch@murgatroid.com

drivers/mfd/t7l66xb.c

+5 −0
Original line number Diff line number Diff line
@@ -108,6 +108,10 @@ static int t7l66xb_mmc_disable(struct platform_device *mmc) 


/*--------------------------------------------------------------------------*/



static const struct tmio_mmc_data t7166xb_mmc_data = {

	.hclk = 24000000,

};



static const struct resource t7l66xb_mmc_resources[] = {

	{

		.start = 0x800,
@@ -149,6 +153,7 @@ static struct mfd_cell t7l66xb_cells[] = { 
		.name = "tmio-mmc",

		.enable = t7l66xb_mmc_enable,

		.disable = t7l66xb_mmc_disable,

		.driver_data = &t7166xb_mmc_data,

		.num_resources = ARRAY_SIZE(t7l66xb_mmc_resources),

		.resources = t7l66xb_mmc_resources,

	},

drivers/mfd/tc6387xb.c

+5 −0
Original line number Diff line number Diff line
@@ -75,6 +75,10 @@ static int tc6387xb_mmc_disable(struct platform_device *mmc) 


/*--------------------------------------------------------------------------*/



const static struct tmio_mmc_data tc6387xb_mmc_data = {

	.hclk = 24000000,

};



static struct resource tc6387xb_mmc_resources[] = {

	{

		.start = 0x800,
@@ -98,6 +102,7 @@ static struct mfd_cell tc6387xb_cells[] = { 
		.name = "tmio-mmc",

		.enable = tc6387xb_mmc_enable,

		.disable = tc6387xb_mmc_disable,

		.driver_data = &tc6387xb_mmc_data,

		.num_resources = ARRAY_SIZE(tc6387xb_mmc_resources),

		.resources = tc6387xb_mmc_resources,

	},

drivers/mfd/tc6393xb.c

+5 −0
Original line number Diff line number Diff line
@@ -136,6 +136,10 @@ static int tc6393xb_nand_enable(struct platform_device *nand) 
	return 0;

}



const static struct tmio_mmc_data tc6393xb_mmc_data = {

	.hclk = 24000000,

};



static struct resource __devinitdata tc6393xb_nand_resources[] = {

	{

		.start	= 0x1000,
@@ -351,6 +355,7 @@ static struct mfd_cell __devinitdata tc6393xb_cells[] = { 
	},

	[TC6393XB_CELL_MMC] = {

		.name = "tmio-mmc",

		.driver_data = &tc6393xb_mmc_data,

		.num_resources = ARRAY_SIZE(tc6393xb_mmc_resources),

		.resources = tc6393xb_mmc_resources,

	},

drivers/misc/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -235,5 +235,6 @@ config ISL29003 


source "drivers/misc/c2port/Kconfig"

source "drivers/misc/eeprom/Kconfig"

source "drivers/misc/cb710/Kconfig"



endif # MISC_DEVICES

CRA Git | Maintained and supported by SUSTech CRA and CCSE