From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 13 Oct 2011 02:40:35 +0000 (+1100)
Subject: Merge remote-tracking branch 'mmc/mmc-next'
X-Git-Tag: next-20111013~45
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=30209d4763b11442585630634e24bcc962959278;p=karo-tx-linux.git

Merge remote-tracking branch 'mmc/mmc-next'

Conflicts:
	drivers/mmc/core/core.c
	drivers/mmc/core/sd.c
	drivers/mmc/host/au1xmmc.c
---

30209d4763b11442585630634e24bcc962959278
diff --cc arch/arm/mach-at91/at91sam9260_devices.c
index 7f570b5b2a09,c49e84a39a6f..6bfcd484d434
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@@ -327,10 -319,10 +327,10 @@@ void __init at91_add_device_mci(short m
  	if (!data)
  		return;
  
- 	for (i = 0; i < ATMEL_MCI_MAX_NR_SLOTS; i++) {
+ 	for (i = 0; i < ATMCI_MAX_NR_SLOTS; i++) {
  		if (data->slot[i].bus_width) {
  			/* input/irq */
 -			if (data->slot[i].detect_pin) {
 +			if (gpio_is_valid(data->slot[i].detect_pin)) {
  				at91_set_gpio_input(data->slot[i].detect_pin, 1);
  				at91_set_deglitch(data->slot[i].detect_pin, 1);
  			}
diff --cc drivers/mmc/host/au1xmmc.c
index 56e7834685d9,707bc7dddd22..b381c2f46527
--- a/drivers/mmc/host/au1xmmc.c
+++ b/drivers/mmc/host/au1xmmc.c
@@@ -1036,12 -1028,11 +1036,11 @@@ static int __devinit au1xmmc_probe(stru
  	tasklet_init(&host->finish_task, au1xmmc_tasklet_finish,
  			(unsigned long)host);
  
 -#ifdef CONFIG_SOC_AU1200
 -	ret = au1xmmc_dbdma_init(host);
 -	if (ret)
 -		pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
 -#endif
 +	if (has_dbdma()) {
 +		ret = au1xmmc_dbdma_init(host);
 +		if (ret)
- 			printk(KERN_INFO DRIVER_NAME ": DBDMA init failed; "
- 						     "using PIO\n");
++			pr_info(DRIVER_NAME ": DBDMA init failed; using PIO\n");
 +	}
  
  #ifdef CONFIG_LEDS_CLASS
  	if (host->platdata && host->platdata->led) {
@@@ -1189,15 -1181,15 +1188,15 @@@ static struct platform_driver au1xmmc_d
  
  static int __init au1xmmc_init(void)
  {
 -#ifdef CONFIG_SOC_AU1200
 -	/* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
 -	 * of 8 bits.  And since devices are shared, we need to create
 -	 * our own to avoid freaking out other devices.
 -	 */
 -	memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
 -	if (!memid)
 -		pr_err("au1xmmc: cannot add memory dbdma dev\n");
 -#endif
 +	if (has_dbdma()) {
 +		/* DSCR_CMD0_ALWAYS has a stride of 32 bits, we need a stride
 +		* of 8 bits.  And since devices are shared, we need to create
 +		* our own to avoid freaking out other devices.
 +		*/
 +		memid = au1xxx_ddma_add_device(&au1xmmc_mem_dbdev);
 +		if (!memid)
- 			printk(KERN_ERR "au1xmmc: cannot add memory dbdma\n");
++			pr_err("au1xmmc: cannot add memory dbdma dev\n");
 +	}
  	return platform_driver_register(&au1xmmc_driver);
  }
  
diff --cc drivers/mmc/host/sdhci-tegra.c
index 21b00cefae63,e9e061bf7d0c..067a4cded9cf
--- a/drivers/mmc/host/sdhci-tegra.c
+++ b/drivers/mmc/host/sdhci-tegra.c
@@@ -20,10 -22,9 +22,11 @@@
  #include <linux/gpio.h>
  #include <linux/mmc/card.h>
  #include <linux/mmc/host.h>
+ #include <linux/module.h>
  
 -#include <mach/gpio.h>
 +#include <asm/gpio.h>
 +
 +#include <mach/gpio-tegra.h>
  #include <mach/sdhci.h>
  
  #include "sdhci-pltfm.h"