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

Commit edb2877f 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: (39 commits)
  mmc: davinci: add support for SDIO irq handling
  mmc: fix division by zero in MMC core
  mmc: tmio_mmc: fix CMD irq handling
  mmc: tmio_mmc: handle missing HW interrupts
  mfd: sh_mobile_sdhi: activate SDIO IRQ for tmio_mmc
  mmc: tmio_mmc: implement SDIO IRQ support
  mfd: sdhi: require the tmio-mmc driver to bounce unaligned buffers
  mmc: tmio_mmc: silence compiler warnings
  mmc: tmio_mmc: implement a bounce buffer for unaligned DMA
  mmc: tmio_mmc: merge the private header into the driver
  mmc: tmio_mmc: fix PIO fallback on DMA descriptor allocation failure
  mmc: tmio_mmc: allow multi-element scatter-gather lists
  mmc: Register debugfs dir before calling card probe function.
  mmc: MMC_BLOCK_MINORS should depend on MMC_BLOCK.
  mmc: Explain why we make adjacent mmc_bus_{put,get} calls during rescan.
  mmc: Fix sd/sdio/mmc initialization frequency retries
  mmc: fix mmc_set_bus_width_ddr() call without bus-width-test cap
  mmc: dw_mmc: Add Synopsys DesignWare mmc host driver.
  mmc: add sdhci-tegra driver for Tegra SoCs
  mmc: sdhci: add quirk for max len ADMA descriptors
  ...
parents 5b2eef96 f9db92cb

arch/arm/mach-dove/common.c

+2 −2
Original line number Diff line number Diff line
@@ -770,7 +770,7 @@ static struct resource dove_sdio0_resources[] = { 
};



static struct platform_device dove_sdio0 = {

	.name		= "sdhci-mv",

	.name		= "sdhci-dove",

	.id		= 0,

	.dev		= {

		.dma_mask		= &sdio_dmamask,
@@ -798,7 +798,7 @@ static struct resource dove_sdio1_resources[] = { 
};



static struct platform_device dove_sdio1 = {

	.name		= "sdhci-mv",

	.name		= "sdhci-dove",

	.id		= 1,

	.dev		= {

		.dma_mask		= &sdio_dmamask,

arch/arm/mach-tegra/include/mach/sdhci.h

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

 * include/asm-arm/arch-tegra/include/mach/sdhci.h

 *

 * Copyright (C) 2009 Palm, Inc.

 * Author: Yvonne Yip <y@palm.com>

 *

 * This software is licensed under the terms of the GNU General Public

 * License version 2, as published by the Free Software Foundation, and

 * may be copied, distributed, and modified under those terms.

 *

 * This program is distributed in the hope that it will be useful,

 * but WITHOUT ANY WARRANTY; without even the implied warranty of

 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 * GNU General Public License for more details.

 *

 */

#ifndef __ASM_ARM_ARCH_TEGRA_SDHCI_H

#define __ASM_ARM_ARCH_TEGRA_SDHCI_H



#include <linux/mmc/host.h>



struct tegra_sdhci_platform_data {

	int cd_gpio;

	int wp_gpio;

	int power_gpio;

	int is_8bit;

};



#endif

drivers/mfd/sh_mobile_sdhi.c

+6 −0
Original line number Diff line number Diff line
@@ -131,11 +131,17 @@ static int __devinit sh_mobile_sdhi_probe(struct platform_device *pdev) 
	 */

	mmc_data->flags |= TMIO_MMC_BLKSZ_2BYTES;



	/*

	 * All SDHI blocks support SDIO IRQ signalling.

	 */

	mmc_data->flags |= TMIO_MMC_SDIO_IRQ;



	if (p && p->dma_slave_tx >= 0 && p->dma_slave_rx >= 0) {

		priv->param_tx.slave_id = p->dma_slave_tx;

		priv->param_rx.slave_id = p->dma_slave_rx;

		priv->dma_priv.chan_priv_tx = &priv->param_tx;

		priv->dma_priv.chan_priv_rx = &priv->param_rx;

		priv->dma_priv.alignment_shift = 1; /* 2-byte alignment */

		mmc_data->dma = &priv->dma_priv;

	}

drivers/mmc/card/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ config MMC_BLOCK 


config MMC_BLOCK_MINORS

	int "Number of minors per block device"

	depends on MMC_BLOCK

	range 4 256

	default 8

	help

drivers/mmc/core/Kconfig

+11 −0
Original line number Diff line number Diff line
@@ -16,3 +16,14 @@ config MMC_UNSAFE_RESUME 


	  This option sets a default which can be overridden by the

	  module parameter "removable=0" or "removable=1".



config MMC_CLKGATE

	bool "MMC host clock gating (EXPERIMENTAL)"

	depends on EXPERIMENTAL

	help

	  This will attempt to aggressively gate the clock to the MMC card.

	  This is done to save power due to gating off the logic and bus

	  noise when the MMC card is not in use. Your host driver has to

	  support handling this in order for it to be of any use.



	  If unsure, say N.