Merge tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel...

Pull MMC update from Chris Ball:
 "MMC highlights for 3.9:

  Core:
   - Support for packed commands in eMMC 4.5.  (This requires a host
     capability to be turned on.  It increases write throughput by 20%+,
     but may also increase average write latency; more testing needed.)
   - Add DT bindings for capability flags.
   - Add mmc_of_parse() for shared DT parsing between drivers.

  Drivers:
   - android-goldfish: New MMC driver for the Android Goldfish emulator.
   - mvsdio: Add DT bindings, pinctrl, use slot-gpio for card detection.
   - omap_hsmmc: Fix boot hangs with RPMB partitions.
   - sdhci-bcm2835: New driver for controller used by Raspberry Pi.
   - sdhci-esdhc-imx: Add 8-bit data, auto CMD23 support, use slot-gpio.
   - sh_mmcif: Add support for eMMC DDR, bundled MMCIF IRQs.
   - tmio_mmc: Add DT bindings, support for vccq regulator"

* tag 'mmc-updates-for-3.9-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (92 commits)
  mmc: tegra: assume CONFIG_OF, remove platform data
  mmc: add DT bindings for more MMC capability flags
  mmc: tmio: add support for the VccQ regulator
  mmc: tmio: remove unused and deprecated symbols
  mmc: sh_mobile_sdhi: use managed resource allocations
  mmc: sh_mobile_sdhi: remove unused .pdata field
  mmc: tmio-mmc: parse device-tree bindings
  mmc: tmio-mmc: define device-tree bindings
  mmc: sh_mmcif: use mmc_of_parse() to parse standard MMC DT bindings
  mmc: (cosmetic) remove "extern" from function declarations
  mmc: provide a standard MMC device-tree binding parser centrally
  mmc: detailed definition of CD and WP MMC line polarities in DT
  mmc: sdhi, tmio: only check flags in tmio-mmc driver proper
  mmc: sdhci: Fix parameter of sdhci_do_start_signal_voltage_switch()
  mmc: sdhci: check voltage range only on regulators aware of voltage value
  mmc: bcm2835: set SDHCI_QUIRK_DATA_TIMEOUT_USES_SDCLK
  mmc: support packed write command for eMMC4.5 devices
  mmc: add packed command feature of eMMC4.5
  mmc: rtsx: remove driving adjustment
  mmc: use regulator_can_change_voltage() instead of regulator_count_voltages
  ...

diff --combined MAINTAINERS
index 870ba56207d74a9de026c530ea7d259af7f54b3e,5c88df7553527678f432cbe712f1a7a4cef2c1f7..ec9b7d2aa6abc931f38020a33c3c77cae50df0f8
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -465,14 -465,6 +465,14 @@@ S:       Maintaine
  F:    drivers/scsi/aic7xxx/
  F:    drivers/scsi/aic7xxx_old/
  
 +AIMSLAB FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-aimslab*
 +
  AIO
  M:    Benjamin LaHaise <[email protected]>
  L:    [email protected]
@@@ -567,18 -559,6 +567,18 @@@ L:       [email protected]
  S:    Maintained
  F:    drivers/infiniband/hw/amso1100/
  
 +ANALOG DEVICES INC AD9389B DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/ad9389b*
 +
 +ANALOG DEVICES INC ADV7604 DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/i2c/adv7604*
 +
  ANALOG DEVICES INC ASOC CODEC DRIVERS
  M:    Lars-Peter Clausen <[email protected]>
  L:    [email protected]
@@@ -690,16 -670,8 +690,16 @@@ F:       drivers/input/serio/ambakmi.
  F:    include/linux/amba/kmi.h
  
  ARM PRIMECELL MMCI PL180/1 DRIVER
 -S:    Orphan
 +M:    Russell King <[email protected]>
 +S:    Maintained
  F:    drivers/mmc/host/mmci.*
 +F:    include/linux/amba/mmci.h
 +
 +ARM PRIMECELL UART PL010 AND PL011 DRIVERS
 +M:    Russell King <[email protected]>
 +S:    Maintained
 +F:    drivers/tty/serial/amba-pl01*.c
 +F:    include/linux/amba/serial.h
  
  ARM PRIMECELL BUS SUPPORT
  M:    Russell King <[email protected]>
@@@ -1146,14 -1118,6 +1146,14 @@@ F:    arch/arm/mach-s5pv210/mach-goni.
  F:    arch/arm/mach-exynos/mach-universal_c210.c
  F:    arch/arm/mach-exynos/mach-nuri.c
  
 +ARM/SAMSUNG S5P SERIES 2D GRAPHICS ACCELERATION (G2D) SUPPORT
 +M:    Kyungmin Park <[email protected]>
 +M:    Kamil Debski <[email protected]>
 +L:    [email protected]
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/s5p-g2d/
 +
  ARM/SAMSUNG S5P SERIES FIMC SUPPORT
  M:    Kyungmin Park <[email protected]>
  M:    Sylwester Nawrocki <[email protected]>
@@@ -1284,17 -1248,12 +1284,17 @@@ M:   Tony Prisk <[email protected]
  L:    [email protected] (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-vt8500/
 +F:    drivers/clocksource/vt8500_timer.c
 +F:    drivers/gpio/gpio-vt8500.c
 +F:    drivers/mmc/host/wmt-sdmmc.c
 +F:    drivers/pwm/pwm-vt8500.c
 +F:    drivers/rtc/rtc-vt8500.c
 +F:    drivers/tty/serial/vt8500_serial.c
 +F:    drivers/usb/host/ehci-vt8500.c
 +F:    drivers/usb/host/uhci-platform.c
  F:    drivers/video/vt8500lcdfb.*
  F:    drivers/video/wm8505fb*
  F:    drivers/video/wmt_ge_rops.*
 -F:    drivers/tty/serial/vt8500_serial.c
 -F:    drivers/rtc/rtc-vt8500.c
 -F:    drivers/mmc/host/wmt-sdmmc.c
  
  ARM/ZIPIT Z2 SUPPORT
  M:    Marek Vasut <[email protected]>
@@@ -1303,14 -1262,6 +1303,14 @@@ S:    Maintaine
  F:    arch/arm/mach-pxa/z2.c
  F:    arch/arm/mach-pxa/include/mach/z2.h
  
 +ARM/ZYNQ ARCHITECTURE
 +M:    Michal Simek <[email protected]>
 +L:    [email protected] (moderated for non-subscribers)
 +W:    http://wiki.xilinx.com
 +T:    git git://git.xilinx.com/linux-xlnx.git
 +S:    Supported
 +F:    arch/arm/mach-zynq/
 +
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <[email protected]>
  M:    Will Deacon <[email protected]>
@@@ -1319,14 -1270,6 +1319,14 @@@ S:    Maintaine
  F:    arch/arm64/
  F:    Documentation/arm64/
  
 +AS3645A LED FLASH CONTROLLER DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/as3645a.c
 +F:    include/media/as3645a.h
 +
  ASC7621 HARDWARE MONITOR DRIVER
  M:    George Joseph <[email protected]>
  L:    [email protected]
@@@ -1360,7 -1303,7 +1360,7 @@@ F:      include/linux/dmaengine.
  F:    include/linux/async_tx.h
  
  AT24 EEPROM DRIVER
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  L:    [email protected]
  S:    Maintained
  F:    drivers/misc/eeprom/at24.c
@@@ -1546,7 -1489,7 +1546,7 @@@ AVR32 ARCHITECTUR
  M:    Haavard Skinnemoen <[email protected]>
  M:    Hans-Christian Egtvedt <[email protected]>
  W:    http://www.atmel.com/products/AVR32/
 -W:    http://avr32linux.org/
 +W:    http://mirror.egtvedt.no/avr32linux.org/
  W:    http://avrfreaks.net/
  S:    Maintained
  F:    arch/avr32/
@@@ -1574,14 -1517,6 +1574,14 @@@ T:    git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/usb/dvb-usb-v2/az6007.c
  
 +AZTECH FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-aztech*
 +
  B43 WIRELESS DRIVER
  M:    Stefano Brivio <[email protected]>
  L:    [email protected]
@@@ -1681,15 -1616,6 +1681,15 @@@ W:    http://blackfin.uclinux.org
  S:    Supported
  F:    drivers/i2c/busses/i2c-bfin-twi.c
  
 +BLACKFIN MEDIA DRIVER
 +M:    Scott Jiang <[email protected]>
 +L:    [email protected]
 +W:    http://blackfin.uclinux.org/
 +S:    Supported
 +F:    drivers/media/platform/blackfin/
 +F:    drivers/media/i2c/adv7183*
 +F:    drivers/media/i2c/vs6624*
 +
  BLINKM RGB LED DRIVER
  M:    Jan-Simon Moeller <[email protected]>
  S:    Maintained
@@@ -1873,14 -1799,6 +1873,14 @@@ S:    Supporte
  F:    Documentation/filesystems/caching/cachefiles.txt
  F:    fs/cachefiles/
  
 +CADET FM/AM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-cadet*
 +
  CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
  M:    Jonathan Corbet <[email protected]>
  L:    [email protected]
@@@ -2017,8 -1935,7 +2017,8 @@@ F:      drivers/misc/
  
  CHECKPATCH
  M:    Andy Whitcroft <[email protected]>
 -S:    Supported
 +M:    Joe Perches <[email protected]>
 +S:    Maintained
  F:    scripts/checkpatch.pl
  
  CHINESE DOCUMENTATION
@@@ -2223,10 -2140,10 +2223,10 @@@ S:   Maintaine
  F:    tools/power/cpupower
  
  CPUSETS
 -M:    Paul Menage <[email protected]>
 +M:    Li Zefan <[email protected]>
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
 -S:    Supported
 +S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
  F:    kernel/cpuset.c
@@@ -2282,15 -2199,6 +2282,15 @@@ F:    Documentation/video4linux/cx18.tx
  F:    drivers/media/pci/cx18/
  F:    include/uapi/linux/ivtv*
  
 +CX2341X MPEG ENCODER HELPER MODULE
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/cx2341x*
 +F:    include/media/cx2341x*
 +
  CX88 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -2668,13 -2576,6 +2668,13 @@@ S:    Maintaine
  F:    drivers/gpu/drm/tegra/
  F:    Documentation/devicetree/bindings/gpu/nvidia,tegra20-host1x.txt
  
 +DSBR100 USB FM RADIO DRIVER
 +M:    Alexey Klimov <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/radio/dsbr100.c
 +
  DSCC4 DRIVER
  M:    Francois Romieu <[email protected]>
  L:    [email protected]
@@@ -3073,6 -2974,11 +3073,6 @@@ S:     Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
 -ETHERTEAM 16I DRIVER
 -M:    Mika Kuoppala <[email protected]>
 -S:    Maintained
 -F:    drivers/net/ethernet/fujitsu/eth16i.c
 -
  EXT2 FILE SYSTEM
  M:    Jan Kara <[email protected]>
  L:    [email protected]
@@@ -3441,14 -3347,6 +3441,14 @@@ W:    http://www.icp-vortex.com
  S:    Supported
  F:    drivers/scsi/gdt*
  
 +GEMTEK FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-gemtek*
 +
  GENERIC GPIO I2C DRIVER
  M:    Haavard Skinnemoen <[email protected]>
  S:    Supported
@@@ -3859,11 -3757,12 +3859,11 @@@ S:   Maintaine
  F:    drivers/i2c/i2c-stub.c
  
  I2C SUBSYSTEM
 -M:    Wolfram Sang <w.sang@pengutronix.de>
 +M:    Wolfram Sang <wsa@the-dreams.de>
  M:    "Ben Dooks (embedded platforms)" <[email protected]>
  L:    [email protected]
  W:    http://i2c.wiki.kernel.org/
 -T:    quilt kernel.org/pub/linux/kernel/people/jdelvare/linux-2.6/jdelvare-i2c/
 -T:    git git://git.pengutronix.de/git/wsa/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git
  S:    Maintained
  F:    Documentation/i2c/
  F:    drivers/i2c/
@@@ -4317,7 -4216,6 +4317,7 @@@ M:      Thomas Gleixner <[email protected]
  S:    Maintained
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
  F:    kernel/irq/
 +F:    drivers/irqchip/
  
  IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
  M:    Benjamin Herrenschmidt <[email protected]>
@@@ -4335,14 -4233,6 +4335,14 @@@ F:    Documentation/isapnp.tx
  F:    drivers/pnp/isapnp/
  F:    include/linux/isapnp.h
  
 +ISA RADIO MODULE
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-isa*
 +
  iSCSI BOOT FIRMWARE TABLE (iBFT) DRIVER
  M:    Peter Jones <[email protected]>
  M:    Konrad Rzeszutek Wilk <[email protected]>
@@@ -4501,14 -4391,6 +4501,14 @@@ W:    http://lse.sourceforge.net/kdump
  S:    Maintained
  F:    Documentation/kdump/
  
 +KEENE FM RADIO TRANSMITTER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-keene*
 +
  KERNEL AUTOMOUNTER v4 (AUTOFS4)
  M:    Ian Kent <[email protected]>
  L:    [email protected]
@@@ -4599,15 -4481,6 +4599,15 @@@ F:    arch/s390/include/asm/kvm
  F:    arch/s390/kvm/
  F:    drivers/s390/kvm/
  
 +KERNEL VIRTUAL MACHINE (KVM) FOR ARM
 +M:    Christoffer Dall <[email protected]>
 +L:    [email protected]
 +W:    http://systems.cs.columbia.edu/projects/kvm-arm
 +S:    Maintained
 +F:    arch/arm/include/uapi/asm/kvm*
 +F:    arch/arm/include/asm/kvm*
 +F:    arch/arm/kvm/
 +
  KEXEC
  M:    Eric Biederman <[email protected]>
  W:    http://kernel.org/pub/linux/utils/kernel/kexec/
@@@ -4996,13 -4869,6 +4996,13 @@@ Q:    http://patchwork.linuxtv.org/project
  S:    Maintained
  F:    drivers/media/dvb-frontends/m88rs2000*
  
 +MA901 MASTERKIT USB FM RADIO DRIVER
 +M:      Alexey Klimov <[email protected]>
 +L:      [email protected]
 +T:      git git://linuxtv.org/media_tree.git
 +S:      Maintained
 +F:      drivers/media/radio/radio-ma901.c
 +
  MAC80211
  M:    Johannes Berg <[email protected]>
  L:    [email protected]
@@@ -5100,14 -4966,6 +5100,14 @@@ S:    Maintaine
  F:    Documentation/hwmon/max6650
  F:    drivers/hwmon/max6650.c
  
 +MAXIRADIO FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/radio-maxiradio*
 +
  MEDIA INPUT INFRASTRUCTURE (V4L/DVB)
  M:    Mauro Carvalho Chehab <[email protected]>
  P:    LinuxTV.org Project
@@@ -5130,14 -4988,6 +5130,14 @@@ F:    include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 +MEDIAVISION PRO MOVIE STUDIO DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/parport/pms*
 +
  MEGARAID SCSI DRIVERS
  M:    Neela Syam Kolli <[email protected]>
  L:    [email protected]
@@@ -5160,10 -5010,6 +5160,10 @@@ L:    [email protected]
  W:    http://www.linux-mm.org
  S:    Maintained
  F:    include/linux/mm.h
 +F:    include/linux/gfp.h
 +F:    include/linux/mmzone.h
 +F:    include/linux/memory_hotplug.h
 +F:    include/linux/vmalloc.h
  F:    mm/
  
  MEMORY RESOURCE CONTROLLER
@@@ -5211,14 -5057,6 +5211,14 @@@ S:    Supporte
  F:    Documentation/mips/
  F:    arch/mips/
  
 +MIROSOUND PCM20 FM RADIO RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/radio-miropcm20*
 +
  MODULE SUPPORT
  M:    Rusty Russell <[email protected]>
  S:    Maintained
@@@ -5257,38 -5095,6 +5257,38 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 +MT9M032 SENSOR DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9m032.c
 +F:    include/media/mt9m032.h
 +
 +MT9P031 SENSOR DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9p031.c
 +F:    include/media/mt9p031.h
 +
 +MT9T001 SENSOR DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9t001.c
 +F:    include/media/mt9t001.h
 +
 +MT9V032 SENSOR DRIVER
 +M:    Laurent Pinchart <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/i2c/mt9v032.c
 +F:    include/media/mt9v032.h
 +
  MULTIFUNCTION DEVICES (MFD)
  M:    Samuel Ortiz <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
@@@ -5563,6 -5369,13 +5563,6 @@@ F:     include/linux/sunrpc
  F:    include/uapi/linux/nfs*
  F:    include/uapi/linux/sunrpc/
  
 -NI5010 NETWORK DRIVER
 -M:    Jan-Pascal van Best <[email protected]>
 -M:    Andreas Mohr <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/net/ethernet/racal/ni5010.*
 -
  NILFS2 FILESYSTEM
  M:    KONISHI Ryusuke <[email protected]>
  L:    [email protected]
@@@ -5588,13 -5401,6 +5588,13 @@@ S:    Maintaine
  F:    Documentation/scsi/NinjaSCSI.txt
  F:    drivers/scsi/nsp32*
  
 +NTB DRIVER
 +M:    Jon Mason <[email protected]>
 +S:    Supported
 +F:    drivers/ntb/
 +F:    drivers/net/ntb_netdev.c
 +F:    include/linux/ntb.h
 +
  NTFS FILESYSTEM
  M:    Anton Altaparmakov <[email protected]>
  L:    [email protected]
@@@ -5692,7 -5498,7 +5692,7 @@@ S:      Maintaine
  F:    drivers/mmc/host/omap.c
  
  OMAP HS MMC SUPPORT
- M:    Venkatraman S <svenkatr@ti.com>
+ M:    Balaji T K <balajitk@ti.com>
  L:    [email protected]
  L:    [email protected]
  S:    Maintained
@@@ -5972,6 -5778,15 +5972,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/i2c/muxes/i2c-mux-pca9541.c
  
 -PCA9564/PCA9665 I2C BUS DRIVER
 -M:    Wolfram Sang <[email protected]>
 -L:    [email protected]
 -S:    Maintained
 -F:    drivers/i2c/algos/i2c-algo-pca.c
 -F:    drivers/i2c/busses/i2c-pca-*
 -F:    include/linux/i2c-algo-pca.h
 -F:    include/linux/i2c-pca-platform.h
 -
  PCDP - PRIMARY CONSOLE AND DEBUG PORT
  M:    Khalid Aziz <[email protected]>
  S:    Maintained
@@@ -6440,14 -6255,6 +6440,14 @@@ L:    [email protected]
  S:    Supported
  F:    arch/hexagon/
  
 +QUICKCAM PARALLEL PORT WEBCAMS
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/parport/*-qcam*
 +
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <[email protected]>
  M:    Sage Weil <[email protected]>
@@@ -6691,7 -6498,7 +6691,7 @@@ S:      Supporte
  F:    drivers/s390/net/
  
  S390 ZCRYPT DRIVER
 -M:    Holger Dengler <[email protected].ibm.com>
 +M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
  M:    [email protected]
  L:    [email protected]
  W:    http://www.ibm.com/developerworks/linux/linux390/
@@@ -6722,14 -6529,6 +6722,14 @@@ L:    [email protected]
  S:    Supported
  F:    drivers/mmc/host/s3cmci.*
  
 +SAA6588 RDS RECEIVER DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/i2c/saa6588*
 +
  SAA7134 VIDEO4LINUX DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -6740,9 -6539,10 +6740,9 @@@ F:     Documentation/video4linux/saa7134
  F:    drivers/media/pci/saa7134/
  
  SAA7146 VIDEO4LINUX-2 DRIVER
 -M:    Michael Hunold <[email protected]>
 +M:    Hans Verkuil <[email protected]>
  L:    [email protected]
  T:    git git://linuxtv.org/media_tree.git
 -W:    http://www.mihu.de/linux/saa7146
  S:    Maintained
  F:    drivers/media/common/saa7146/
  F:    drivers/media/pci/saa7146/
@@@ -6784,13 -6584,6 +6784,13 @@@ S:    Maintaine
  F:    drivers/media/platform/s3c-camif/
  F:    include/media/s3c_camif.h
  
 +SAMSUNG S5C73M3 CAMERA DRIVER
 +M:    Kyungmin Park <[email protected]>
 +M:    Andrzej Hajda <[email protected]>
 +L:    [email protected]
 +S:    Supported
 +F:    drivers/media/i2c/s5c73m3/*
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <[email protected]>
  L:    [email protected]
@@@ -6804,8 -6597,16 +6804,16 @@@ F:    include/linux/dw_dmac.
  F:    drivers/dma/dw_dmac_regs.h
  F:    drivers/dma/dw_dmac.c
  
+ SYNOPSYS DESIGNWARE MMC/SD/SDIO DRIVER
+ M:    Seungwon Jeon <[email protected]>
+ M:    Jaehoon Chung <[email protected]>
+ L:    [email protected]
+ S:    Maintained
+ F:    include/linux/mmc/dw_mmc.h
+ F:    drivers/mmc/host/dw_mmc*
+ 
  TIMEKEEPING, NTP
 -M:    John Stultz <john[email protected]>
 +M:    John Stultz <john[email protected]>
  M:    Thomas Gleixner <[email protected]>
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git timers/core
  S:    Supported
@@@ -7027,8 -6828,7 +7035,8 @@@ S:      Supporte
  F:    drivers/net/ethernet/sfc/
  
  SGI GRU DRIVER
 -M:    Jack Steiner <[email protected]>
 +M:    Dimitri Sivanich <[email protected]>
 +M:    Robin Holt <[email protected]>
  S:    Maintained
  F:    drivers/misc/sgi-gru/
  
@@@ -7052,38 -6852,6 +7060,38 @@@ M:    Robin Holt <[email protected]
  S:    Maintained
  F:    drivers/misc/sgi-xp/
  
 +SI470X FM RADIO RECEIVER I2C DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/radio/si470x/radio-si470x-i2c.c
 +
 +SI470X FM RADIO RECEIVER USB DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/radio/si470x/radio-si470x-common.c
 +F:    drivers/media/radio/si470x/radio-si470x.h
 +F:    drivers/media/radio/si470x/radio-si470x-usb.c
 +
 +SH_VEU V4L2 MEM2MEM DRIVER
 +M:    Guennadi Liakhovetski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/sh_veu.c
 +F:    include/media/sh_veu.h
 +
 +SH_VOU V4L2 OUTPUT DRIVER
 +M:    Guennadi Liakhovetski <[email protected]>
 +L:    [email protected]
 +S:    Maintained
 +F:    drivers/media/platform/sh_vou.c
 +F:    include/media/sh_vou.h
 +
  SIMPLE FIRMWARE INTERFACE (SFI)
  M:    Len Brown <[email protected]>
  L:    [email protected]
@@@ -7255,6 -7023,14 +7263,6 @@@ L:     [email protected]
  S:    Maintained
  F:    drivers/video/smscufx.c
  
 -SN-IA64 (Itanium) SUB-PLATFORM
 -M:    Jes Sorensen <[email protected]>
 -L:    [email protected]
 -L:    [email protected]
 -W:    http://www.sgi.com/altix
 -S:    Maintained
 -F:    arch/ia64/sn/
 -
  SOC-CAMERA V4L2 SUBSYSTEM
  M:    Guennadi Liakhovetski <[email protected]>
  L:    [email protected]
@@@ -7410,7 -7186,6 +7418,7 @@@ F:      drivers/clk/spear
  
  SPI SUBSYSTEM
  M:    Grant Likely <[email protected]>
 +M:    Mark Brown <[email protected]>
  L:    [email protected]
  Q:    http://patchwork.kernel.org/project/spi-devel-general/list/
  T:    git git://git.secretlab.ca/git/linux-2.6.git
@@@ -7536,7 -7311,8 +7544,7 @@@ S:      Odd Fixe
  F:    drivers/staging/olpc_dcon/
  
  STAGING - OZMO DEVICES USB OVER WIFI DRIVER
 -M:    Rupesh Gujare <[email protected]>
 -M:    Chris Kelly <[email protected]>
 +M:    Rupesh Gujare <[email protected]>
  S:    Maintained
  F:    drivers/staging/ozwpan/
  
@@@ -7751,14 -7527,6 +7759,14 @@@ T:    git git://linuxtv.org/mkrufky/tuners
  S:    Maintained
  F:    drivers/media/tuners/tda8290.*
  
 +TDA9840 MEDIA DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tda9840*
 +
  TEA5761 TUNER DRIVER
  M:    Mauro Carvalho Chehab <[email protected]>
  L:    [email protected]
@@@ -7775,35 -7543,14 +7783,35 @@@ T:   git git://linuxtv.org/media_tree.gi
  S:    Maintained
  F:    drivers/media/tuners/tea5767.*
  
 +TEA6415C MEDIA DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tea6415c*
 +
 +TEA6420 MEDIA DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/i2c/tea6420*
 +
  TEAM DRIVER
 -M:    Jiri Pirko <j[email protected]>
 +M:    Jiri Pirko <j[email protected]>
  L:    [email protected]
  S:    Supported
  F:    drivers/net/team/
  F:    include/linux/if_team.h
  F:    include/uapi/linux/if_team.h
  
 +TECHNOLOGIC SYSTEMS TS-5500 PLATFORM SUPPORT
 +M:    Savoir-faire Linux Inc. <[email protected]>
 +S:    Maintained
 +F:    arch/x86/platform/ts5500/
 +
  TECHNOTREND USB IR RECEIVER
  M:    Sean Young <[email protected]>
  L:    [email protected]
@@@ -7846,11 -7593,6 +7854,11 @@@ S:      Supporte
  F:      drivers/thermal/
  F:      include/linux/thermal.h
  
 +THINGM BLINK(1) USB RGB LED DRIVER
 +M:    Vivien Didelot <[email protected]>
 +S:    Maintained
 +F:    drivers/hid/hid-thingm.c
 +
  THINKPAD ACPI EXTRAS DRIVER
  M:    Henrique de Moraes Holschuh <[email protected]>
  L:    [email protected]
@@@ -7883,22 -7625,6 +7891,22 @@@ F:    Documentation/backlight/lp855x-drive
  F:    drivers/video/backlight/lp855x_bl.c
  F:    include/linux/platform_data/lp855x.h
  
 +TI LP8727 CHARGER DRIVER
 +M:    Milo Kim <[email protected]>
 +S:    Maintained
 +F:    drivers/power/lp8727_charger.c
 +F:    include/linux/platform_data/lp8727.h
 +
 +TI LP8788 MFD DRIVER
 +M:    Milo Kim <[email protected]>
 +S:    Maintained
 +F:    drivers/iio/adc/lp8788_adc.c
 +F:    drivers/leds/leds-lp8788.c
 +F:    drivers/mfd/lp8788*.c
 +F:    drivers/power/lp8788-charger.c
 +F:    drivers/regulator/lp8788-*.c
 +F:    include/linux/mfd/lp8788*.h
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <[email protected]>
  L:    [email protected] (moderated for non-subscribers)
@@@ -8193,10 -7919,9 +8201,10 @@@ F:    drivers/net/wireless/ath/ar5523
  USB ATTACHED SCSI
  M:    Matthew Wilcox <[email protected]>
  M:    Sarah Sharp <[email protected]>
 +M:    Gerd Hoffmann <[email protected]>
  L:    [email protected]
  L:    [email protected]
 -S:    Supported
 +S:    Maintained
  F:    drivers/usb/storage/uas.c
  
  USB CDC ETHERNET DRIVER
@@@ -8440,14 -8165,6 +8448,14 @@@ S:    Maintaine
  F:    drivers/media/usb/uvc/
  F:    include/uapi/linux/uvcvideo.h
  
 +USB VISION DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Odd Fixes
 +F:    drivers/media/usb/usbvision/
 +
  USB WEBCAM GADGET
  M:    Laurent Pinchart <[email protected]>
  L:    [email protected]
@@@ -8597,14 -8314,6 +8605,14 @@@ L:    [email protected]
  S:    Maintained
  F:    drivers/net/ethernet/via/via-velocity.*
  
 +VIVI VIRTUAL VIDEO DRIVER
 +M:    Hans Verkuil <[email protected]>
 +L:    [email protected]
 +T:    git git://linuxtv.org/media_tree.git
 +W:    http://linuxtv.org
 +S:    Maintained
 +F:    drivers/media/platform/vivi*
 +
  VLAN (802.1Q)
  M:    Patrick McHardy <[email protected]>
  L:    [email protected]

diff --combined arch/arm/boot/dts/exynos5250-smdk5250.dts
index 4db9db0a844333fb6db6da2bd0de80d4811949f6,a37e89ddb198ad2873fc5e7aa705b7cf3d5447cf..1b8d4106d33859c5f8e61ce94fc6d1c1f543f829
--- 1/arch/arm/boot/dts/exynos5250-smdk5250.dts
--- 2/arch/arm/boot/dts/exynos5250-smdk5250.dts
+++ b/arch/arm/boot/dts/exynos5250-smdk5250.dts
@@@ -49,11 -49,6 +49,11 @@@
                        compatible = "samsung,s524ad0xd1";
                        reg = <0x51>;
                };
 +
 +              wm8994: wm8994@1a {
 +                       compatible = "wlf,wm8994";
 +                       reg = <0x1a>;
 +              };
        };
  
        i2c@121D0000 {
@@@ -151,6 -146,7 +151,7 @@@
                        reg = <0>;
                        bus-width = <4>;
                        samsung,cd-pinmux-gpio = <&gpc3 2 2 3 3>;
+                       disable-wp;
                        gpios = <&gpc3 0 2 0 3>, <&gpc3 1 2 0 3>,
                                <&gpc3 3 2 3 3>, <&gpc3 4 2 3 3>,
                                <&gpc3 5 2 3 3>, <&gpc3 6 2 3 3>,
@@@ -209,25 -205,4 +210,25 @@@
                samsung,mfc-r = <0x43000000 0x800000>;
                samsung,mfc-l = <0x51000000 0x800000>;
        };
 +
 +      i2s0: i2s@03830000 {
 +              gpios = <&gpz 0 2 0 0>, <&gpz 1 2 0 0>, <&gpz 2 2 0 0>,
 +                      <&gpz 3 2 0 0>, <&gpz 4 2 0 0>, <&gpz 5 2 0 0>,
 +                      <&gpz 6 2 0 0>;
 +      };
 +
 +      i2s1: i2s@12D60000 {
 +              status = "disabled";
 +      };
 +
 +      i2s2: i2s@12D70000 {
 +              status = "disabled";
 +      };
 +
 +      sound {
 +              compatible = "samsung,smdk-wm8994";
 +
 +              samsung,i2s-controller = <&i2s0>;
 +              samsung,audio-codec = <&wm8994>;
 +      };
  };

diff --combined drivers/mmc/host/Kconfig
index 3be8b94d79141b1a1cfb73212d3f14fa23ae8f62,961891fe61bbf76c0732ba429c7ce71a124cb47f..d88219e1d86e551cda21b16559a8cdff910e1ac3
--- 1/drivers/mmc/host/Kconfig
--- 2/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -69,7 -69,7 +69,7 @@@ config MMC_SDHCI_PC
          If unsure, say N.
  
  config MMC_RICOH_MMC
 -      bool "Ricoh MMC Controller Disabler  (EXPERIMENTAL)"
 +      bool "Ricoh MMC Controller Disabler"
        depends on MMC_SDHCI_PCI
        help
          This adds a pci quirk to disable Ricoh MMC Controller. This
@@@ -186,6 -186,9 +186,6 @@@ config MMC_SDHCI_S3
          often referrered to as the HSMMC block in some of the Samsung S3C
          range of SoC.
  
 -        Note, due to the problems with DMA, the DMA support is only
 -        available with CONFIG_EXPERIMENTAL is selected.
 -
          If you have a controller with this interface, say Y or M here.
  
          If unsure, say N.
@@@ -230,7 -233,7 +230,7 @@@ config MMC_SDHCI_SPEA
  
  config MMC_SDHCI_S3C_DMA
        bool "DMA support on S3C SDHCI"
 -      depends on MMC_SDHCI_S3C && EXPERIMENTAL
 +      depends on MMC_SDHCI_S3C
        help
          Enable DMA support on the Samsung S3C SDHCI glue. The DMA
          has proved to be problematic if the controller encounters
@@@ -238,6 -241,17 +238,17 @@@
  
          YMMV.
  
+ config MMC_SDHCI_BCM2835
+       tristate "SDHCI platform support for the BCM2835 SD/MMC Controller"
+       depends on ARCH_BCM2835
+       depends on MMC_SDHCI_PLTFM
+       select MMC_SDHCI_IO_ACCESSORS
+       help
+         This selects the BCM2835 SD/MMC controller. If you have a BCM2835
+         platform with SD or MMC devices, say Y or M here.
+ 
+         If unsure, say N.
+ 
  config MMC_OMAP
        tristate "TI OMAP Multimedia Card Interface support"
        depends on ARCH_OMAP
@@@ -327,8 -341,8 +338,8 @@@ config MMC_MX
          If unsure, say N.
  
  config MMC_TIFM_SD
 -      tristate "TI Flash Media MMC/SD Interface support  (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL && PCI
 +      tristate "TI Flash Media MMC/SD Interface support"
 +      depends on PCI
        select TIFM_CORE
        help
          Say Y here if you want to be able to access MMC/SD cards with
@@@ -361,6 -375,13 +372,13 @@@ config MMC_DAVINC
            If you have an DAVINCI board with a Multimedia Card slot,
            say Y or M here.  If unsure, say N.
  
+ config MMC_GOLDFISH
+       tristate "goldfish qemu Multimedia Card Interface support"
+       depends on GOLDFISH
+       help
+         This selects the Goldfish Multimedia card Interface emulation
+         found on the Goldfish Android virtual device emulation.
+ 
  config MMC_SPI
        tristate "MMC/SD/SDIO over SPI"
        depends on SPI_MASTER && !HIGHMEM && HAS_DMA
@@@ -407,7 -428,8 +425,7 @@@ config MMC_S3C_PI
          the S3C MCI driver.
  
  config MMC_S3C_DMA
 -      bool "Use DMA transfers only (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL
 +      bool "Use DMA transfers only"
        help
          Use DMA to transfer data between memory and the hardare.
  
@@@ -416,7 -438,7 +434,7 @@@
          option is useful.
  
  config MMC_S3C_PIODMA
 -      bool "Support for both PIO and DMA (EXPERIMENTAL)"
 +      bool "Support for both PIO and DMA"
        help
          Compile both the PIO and DMA transfer routines into the
          driver and let the platform select at run-time which one
@@@ -427,8 -449,8 +445,8 @@@
  endchoice
  
  config MMC_SDRICOH_CS
 -      tristate "MMC/SD driver for Ricoh Bay1Controllers (EXPERIMENTAL)"
 -      depends on EXPERIMENTAL && PCI && PCMCIA
 +      tristate "MMC/SD driver for Ricoh Bay1Controllers"
 +      depends on PCI && PCMCIA
        help
          Say Y here if your Notebook reports a Ricoh Bay1Controller PCMCIA
          card whenever you insert a MMC or SD card into the card slot.
@@@ -457,7 -479,7 +475,7 @@@ config MMC_SDH
  
  config MMC_CB710
        tristate "ENE CB710 MMC/SD Interface support"
 -      depends on PCI
 +      depends on PCI && GENERIC_HARDIRQS
        select CB710_CORE
        help
          This option enables support for MMC/SD part of ENE CB710/720 Flash

diff --combined drivers/mmc/host/mxs-mmc.c
index 5b665551a6f3a6b47add5a939ab1c93959038222,493cd9eb8aa8bd3eda9be5ed53e3e185ed1c684d..4efe3021b21766cf0c247cb1b8217e6d2c68267a
--- 1/drivers/mmc/host/mxs-mmc.c
--- 2/drivers/mmc/host/mxs-mmc.c
+++ b/drivers/mmc/host/mxs-mmc.c
@@@ -354,7 -354,7 +354,7 @@@ static void mxs_mmc_adtc(struct mxs_mmc
        struct dma_async_tx_descriptor *desc;
        struct scatterlist *sgl = data->sg, *sg;
        unsigned int sg_len = data->sg_len;
-       int i;
+       unsigned int i;
  
        unsigned short dma_data_dir, timeout;
        enum dma_transfer_direction slave_dirn;
@@@ -614,9 -614,9 +614,9 @@@ static int mxs_mmc_probe(struct platfor
        host = mmc_priv(mmc);
        ssp = &host->ssp;
        ssp->dev = &pdev->dev;
 -      ssp->base = devm_request_and_ioremap(&pdev->dev, iores);
 -      if (!ssp->base) {
 -              ret = -EADDRNOTAVAIL;
 +      ssp->base = devm_ioremap_resource(&pdev->dev, iores);
 +      if (IS_ERR(ssp->base)) {
 +              ret = PTR_ERR(ssp->base);
                goto out_mmc_free;
        }
  
@@@ -804,3 -804,4 +804,4 @@@ module_platform_driver(mxs_mmc_driver)
  MODULE_DESCRIPTION("FREESCALE MXS MMC peripheral");
  MODULE_AUTHOR("Freescale Semiconductor");
  MODULE_LICENSE("GPL");
+ MODULE_ALIAS("platform:" DRIVER_NAME);

diff --combined drivers/mmc/host/rtsx_pci_sdmmc.c
index 468c92303167acdeb37b77e1010b79a19d51c096,f93f100e81e560c06274c9fe2681b69b51be0eba..f981f7d1f6e3484a0f2deca262720027948e2e57
--- 1/drivers/mmc/host/rtsx_pci_sdmmc.c
--- 2/drivers/mmc/host/rtsx_pci_sdmmc.c
+++ b/drivers/mmc/host/rtsx_pci_sdmmc.c
@@@ -678,19 -678,12 +678,19 @@@ static void sdmmc_request(struct mmc_ho
        struct mmc_command *cmd = mrq->cmd;
        struct mmc_data *data = mrq->data;
        unsigned int data_size = 0;
 +      int err;
  
        if (host->eject) {
                cmd->error = -ENOMEDIUM;
                goto finish;
        }
  
 +      err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
 +      if (err) {
 +              cmd->error = err;
 +              goto finish;
 +      }
 +
        mutex_lock(&pcr->pcr_mutex);
  
        rtsx_pci_start_run(pcr);
@@@ -908,9 -901,6 +908,9 @@@ static void sdmmc_set_ios(struct mmc_ho
        if (host->eject)
                return;
  
 +      if (rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD))
 +              return;
 +
        mutex_lock(&pcr->pcr_mutex);
  
        rtsx_pci_start_run(pcr);
@@@ -1083,10 -1073,6 +1083,10 @@@ static int sdmmc_switch_voltage(struct 
        if (host->eject)
                return -ENOMEDIUM;
  
 +      err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
 +      if (err)
 +              return err;
 +
        mutex_lock(&pcr->pcr_mutex);
  
        rtsx_pci_start_run(pcr);
@@@ -1097,11 -1083,6 +1097,6 @@@
                voltage = OUTPUT_1V8;
  
        if (voltage == OUTPUT_1V8) {
-               err = rtsx_pci_write_register(pcr,
-                               SD30_DRIVE_SEL, 0x07, DRIVER_TYPE_B);
-               if (err < 0)
-                       goto out;
- 
                err = sd_wait_voltage_stable_1(host);
                if (err < 0)
                        goto out;
@@@ -1136,10 -1117,6 +1131,10 @@@ static int sdmmc_execute_tuning(struct 
        if (host->eject)
                return -ENOMEDIUM;
  
 +      err = rtsx_pci_card_exclusive_check(host->pcr, RTSX_SD_CARD);
 +      if (err)
 +              return err;
 +
        mutex_lock(&pcr->pcr_mutex);
  
        rtsx_pci_start_run(pcr);

diff --combined drivers/mmc/host/sdhci-s3c.c
index a0c621421ee8bbecbf84d8b7499dc3a65950d750,b16dae00cfd42887af0ab158f412d3c8bd3f6fd1..7363efe72287482def2cf32f4e4e515788c33d80
--- 1/drivers/mmc/host/sdhci-s3c.c
--- 2/drivers/mmc/host/sdhci-s3c.c
+++ b/drivers/mmc/host/sdhci-s3c.c
@@@ -332,14 -332,14 +332,14 @@@ static void sdhci_cmu_set_clock(struct 
  }
  
  /**
-  * sdhci_s3c_platform_8bit_width - support 8bit buswidth
+  * sdhci_s3c_platform_bus_width - support 8bit buswidth
   * @host: The SDHCI host being queried
   * @width: MMC_BUS_WIDTH_ macro for the bus width being requested
   *
   * We have 8-bit width support but is not a v3 controller.
-  * So we add platform_8bit_width() and support 8bit width.
+  * So we add platform_bus_width() and support 8bit width.
   */
- static int sdhci_s3c_platform_8bit_width(struct sdhci_host *host, int width)
+ static int sdhci_s3c_platform_bus_width(struct sdhci_host *host, int width)
  {
        u8 ctrl;
  
@@@ -369,7 -369,7 +369,7 @@@ static struct sdhci_ops sdhci_s3c_ops 
        .get_max_clock          = sdhci_s3c_get_max_clk,
        .set_clock              = sdhci_s3c_set_clock,
        .get_min_clock          = sdhci_s3c_get_min_clock,
-       .platform_8bit_width    = sdhci_s3c_platform_8bit_width,
+       .platform_bus_width     = sdhci_s3c_platform_bus_width,
  };
  
  static void sdhci_s3c_notify_change(struct platform_device *dev, int state)
@@@ -651,9 -651,10 +651,9 @@@ static int sdhci_s3c_probe(struct platf
  #endif
  
        res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
 -      host->ioaddr = devm_request_and_ioremap(&pdev->dev, res);
 -      if (!host->ioaddr) {
 -              dev_err(dev, "failed to map registers\n");
 -              ret = -ENXIO;
 +      host->ioaddr = devm_ioremap_resource(&pdev->dev, res);
 +      if (IS_ERR(host->ioaddr)) {
 +              ret = PTR_ERR(host->ioaddr);
                goto err_req_regs;
        }