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

Commit 6b2a4f7a 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: (26 commits)
  mmc: SDHI should depend on SUPERH || ARCH_SHMOBILE
  mmc: tmio_mmc: Move some defines into a shared header
  mmc: tmio: support aggressive clock gating
  mmc: tmio: fix power-mode interpretation
  mmc: tmio: remove work-around for unmasked SDIO interrupts
  sh: fix SDHI IO address-range
  ARM: mach-shmobile: fix SDHI IO address-range
  mmc: tmio: only access registers above 0xff, if available
  mfd: remove now redundant sh_mobile_sdhi.h header
  sh: convert boards to use linux/mmc/sh_mobile_sdhi.h
  ARM: mach-shmobile: convert boards to use linux/mmc/sh_mobile_sdhi.h
  mmc: tmio: convert the SDHI MMC driver from MFD to a platform driver
  sh: ecovec: use the CONFIG_MMC_TMIO symbols instead of MFD
  mmc: tmio: split core functionality, DMA and MFD glue
  mmc: tmio: use PIO for short transfers
  mmc: tmio-mmc: Improve DMA stability on sh-mobile
  mmc: fix mmc_app_send_scr() for dma transfer
  mmc: sdhci-esdhc: enable esdhc on imx53
  mmc: sdhci-esdhc: use writel/readl as general APIs
  mmc: sdhci: add the abort CMDTYPE bits definition
  ...
parents eefbab59 022b4835

arch/arm/mach-shmobile/board-ap4evb.c

+3 −3
Original line number Diff line number Diff line
@@ -24,9 +24,9 @@ 
#include <linux/irq.h>

#include <linux/platform_device.h>

#include <linux/delay.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>
@@ -312,7 +312,7 @@ static struct resource sdhi0_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start  = 0xe6850000,

		.end    = 0xe68501ff,

		.end    = 0xe68500ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {
@@ -345,7 +345,7 @@ static struct resource sdhi1_resources[] = { 
	[0] = {

		.name	= "SDHI1",

		.start  = 0xe6860000,

		.end    = 0xe68601ff,

		.end    = 0xe68600ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

arch/arm/mach-shmobile/board-g4evm.c

+3 −3
Original line number Diff line number Diff line
@@ -31,7 +31,7 @@ 
#include <linux/input.h>

#include <linux/input/sh_keysc.h>

#include <linux/mmc/host.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/gpio.h>

#include <mach/sh7377.h>

#include <mach/common.h>
@@ -205,7 +205,7 @@ static struct resource sdhi0_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start  = 0xe6d50000,

		.end    = 0xe6d501ff,

		.end    = 0xe6d50nff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {
@@ -232,7 +232,7 @@ static struct resource sdhi1_resources[] = { 
	[0] = {

		.name	= "SDHI1",

		.start  = 0xe6d60000,

		.end    = 0xe6d601ff,

		.end    = 0xe6d600ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {

arch/arm/mach-shmobile/board-mackerel.c

+4 −4
Original line number Diff line number Diff line
@@ -32,10 +32,10 @@ 
#include <linux/io.h>

#include <linux/i2c.h>

#include <linux/leds.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mfd/tmio.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mtd/mtd.h>

#include <linux/mtd/partitions.h>

#include <linux/mtd/physmap.h>
@@ -690,7 +690,7 @@ static struct resource sdhi0_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start	= 0xe6850000,

		.end	= 0xe68501ff,

		.end	= 0xe68500ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -725,7 +725,7 @@ static struct resource sdhi1_resources[] = { 
	[0] = {

		.name	= "SDHI1",

		.start	= 0xe6860000,

		.end	= 0xe68601ff,

		.end	= 0xe68600ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -768,7 +768,7 @@ static struct resource sdhi2_resources[] = { 
	[0] = {

		.name	= "SDHI2",

		.start	= 0xe6870000,

		.end	= 0xe68701ff,

		.end	= 0xe68700ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

arch/sh/boards/mach-ap325rxa/setup.c

+3 −3
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 
#include <linux/device.h>

#include <linux/interrupt.h>

#include <linux/platform_device.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mtd/physmap.h>

#include <linux/mtd/sh_flctl.h>

#include <linux/delay.h>
@@ -423,7 +423,7 @@ static struct resource sdhi0_cn3_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start	= 0x04ce0000,

		.end	= 0x04ce01ff,

		.end	= 0x04ce00ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {
@@ -453,7 +453,7 @@ static struct resource sdhi1_cn7_resources[] = { 
	[0] = {

		.name	= "SDHI1",

		.start	= 0x04cf0000,

		.end	= 0x04cf01ff,

		.end	= 0x04cf00ff,

		.flags	= IORESOURCE_MEM,

	},

	[1] = {

arch/sh/boards/mach-ecovec24/setup.c

+6 −6
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ 
#include <linux/init.h>

#include <linux/device.h>

#include <linux/platform_device.h>

#include <linux/mfd/sh_mobile_sdhi.h>

#include <linux/mmc/host.h>

#include <linux/mmc/sh_mmcif.h>

#include <linux/mmc/sh_mobile_sdhi.h>

#include <linux/mtd/physmap.h>

#include <linux/gpio.h>

#include <linux/interrupt.h>
@@ -464,7 +464,7 @@ static struct i2c_board_info ts_i2c_clients = { 
	.irq		= IRQ0,

};



#ifdef CONFIG_MFD_SH_MOBILE_SDHI

#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

/* SDHI0 */

static void sdhi0_set_pwr(struct platform_device *pdev, int state)

{
@@ -482,7 +482,7 @@ static struct resource sdhi0_resources[] = { 
	[0] = {

		.name	= "SDHI0",

		.start  = 0x04ce0000,

		.end    = 0x04ce01ff,

		.end    = 0x04ce00ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {
@@ -522,7 +522,7 @@ static struct resource sdhi1_resources[] = { 
	[0] = {

		.name	= "SDHI1",

		.start  = 0x04cf0000,

		.end    = 0x04cf01ff,

		.end    = 0x04cf00ff,

		.flags  = IORESOURCE_MEM,

	},

	[1] = {
@@ -880,7 +880,7 @@ static struct platform_device *ecovec_devices[] __initdata = { 
	&ceu0_device,

	&ceu1_device,

	&keysc_device,

#ifdef CONFIG_MFD_SH_MOBILE_SDHI

#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

	&sdhi0_device,

#if !defined(CONFIG_MMC_SH_MMCIF)

	&sdhi1_device,
@@ -1162,7 +1162,7 @@ static int __init arch_setup(void) 
	gpio_direction_input(GPIO_PTR5);

	gpio_direction_input(GPIO_PTR6);



#ifdef CONFIG_MFD_SH_MOBILE_SDHI

#if defined(CONFIG_MMC_TMIO) || defined(CONFIG_MMC_TMIO_MODULE)

	/* enable SDHI0 on CN11 (needs DS2.4 set to ON) */

	gpio_request(GPIO_FN_SDHI0CD,  NULL);

	gpio_request(GPIO_FN_SDHI0WP,  NULL);