Merge tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel...
authorLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Apr 2014 15:39:39 +0000 (08:39 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Wed, 9 Apr 2014 15:39:39 +0000 (08:39 -0700)
Pull MMC updates from Chris Ball:
 "MMC highlights for 3.15:

  Core:
   - CONFIG_MMC_UNSAFE_RESUME=y is now default behavior
   - DT bindings for SDHCI UHS, eMMC HS200, high-speed DDR, at 1.8/1.2V
   - Add GPIO descriptor based slot-gpio card detect API

  Drivers:
   - dw_mmc: Refactor SOCFPGA support as a variant inside dw_mmc-pltfm.c
   - mmci: Support HW busy detection on ux500
   - omap: Support MMC_ERASE
   - omap_hsmmc: Support MMC_PM_KEEP_POWER, MMC_PM_WAKE_SDIO_IRQ, (a)cmd23
   - rtsx: Support pre-req/post-req async
   - sdhci: Add support for Realtek RTS5250 controllers
   - sdhci-acpi: Add support for 80860F16, fix 80860F14/SDIO card detect
   - sdhci-msm: Add new driver for Qualcomm SDHCI chipset support
   - sdhci-pxav3: Add support for Marvell Armada 380 and 385 SoCs"

* tag 'mmc-updates-for-3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc: (102 commits)
  mmc: sdhci-acpi: Intel SDIO has broken card detect
  mmc: sdhci-pxav3: add support for the Armada 38x SDHCI controller
  mmc: sdhci-msm: Add platform_execute_tuning implementation
  mmc: sdhci-msm: Initial support for Qualcomm chipsets
  mmc: sdhci-msm: Qualcomm SDHCI binding documentation
  sdhci: only reprogram retuning timer when flag is set
  mmc: rename ARCH_BCM to ARCH_BCM_MOBILE
  mmc: sdhci: Allow for irq being shared
  mmc: sdhci-acpi: Add device id 80860F16
  mmc: sdhci-acpi: Fix broken card detect for ACPI HID 80860F14
  mmc: slot-gpio: Add GPIO descriptor based CD GPIO API
  mmc: slot-gpio: Split out CD IRQ request into a separate function
  mmc: slot-gpio: Record GPIO descriptors instead of GPIO numbers
  Revert "dts: socfpga: Add support for SD/MMC on the SOCFPGA platform"
  mmc: sdhci-spear: use generic card detection gpio support
  mmc: sdhci-spear: remove support for power gpio
  mmc: sdhci-spear: simplify resource handling
  mmc: sdhci-spear: fix platform_data usage
  mmc: sdhci-spear: fix error handling paths for DT
  mmc: sdhci-bcm-kona: fix build errors when built-in
  ...

12 files changed:
1  2 
MAINTAINERS
arch/arm/boot/dts/dra7.dtsi
arch/arm/boot/dts/omap2430.dtsi
arch/arm/boot/dts/omap3.dtsi
arch/arm/boot/dts/omap4.dtsi
arch/arm/boot/dts/omap5.dtsi
arch/arm/configs/omap2plus_defconfig
drivers/mmc/core/host.c
drivers/mmc/host/dw_mmc.c
drivers/mmc/host/mmci.h
drivers/regulator/Kconfig
drivers/regulator/Makefile

diff --combined MAINTAINERS
index 7faf310014373593fe25ecc44f5d218eb75d1c5d,37d58a04f5986ee9bf79993f7f2c86c97b177577..a769432bddbed4be6ce16fed58f4fb0822816b0c
@@@ -73,8 -73,7 +73,8 @@@ Descriptions of section entries
        L: Mailing list that is relevant to this area
        W: Web-page with status/info
        Q: Patchwork web based patch tracking system site
 -      T: SCM tree type and location.  Type is one of: git, hg, quilt, stgit, topgit.
 +      T: SCM tree type and location.
 +         Type is one of: git, hg, quilt, stgit, topgit
        S: Status, one of the following:
           Supported:   Someone is actually paid to look after this.
           Maintained:  Someone actually looks after it.
@@@ -242,8 -241,8 +242,8 @@@ S: Maintaine
  F:    drivers/platform/x86/acer-wmi.c
  
  ACPI
 -M:    Len Brown <lenb@kernel.org>
  M:    Rafael J. Wysocki <rjw@rjwysocki.net>
 +M:    Len Brown <lenb@kernel.org>
  L:    linux-acpi@vger.kernel.org
  W:    https://01.org/linux-acpi
  Q:    https://patchwork.kernel.org/project/linux-acpi/list/
@@@ -474,7 -473,7 +474,7 @@@ F: net/rxrpc/af_rxrpc.
  
  AGPGART DRIVER
  M:    David Airlie <airlied@linux.ie>
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 +T:    git git://people.freedesktop.org/~airlied/linux (part of drm maint)
  S:    Maintained
  F:    drivers/char/agp/
  F:    include/linux/agp*
@@@ -536,17 -535,10 +536,17 @@@ S:      Odd Fixe
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
 +ALTERA TRIPLE SPEED ETHERNET DRIVER
 +M:    Vince Bridgers <vbridgers2013@gmail.com
 +L:    netdev@vger.kernel.org
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/net/ethernet/altera/
 +
  ALTERA UART/JTAG UART SERIAL DRIVERS
  M:    Tobias Klauser <tklauser@distanz.ch>
  L:    linux-serial@vger.kernel.org
 -L:    nios2-dev@sopc.et.ntust.edu.tw (moderated for non-subscribers)
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/tty/serial/altera_uart.c
  F:    drivers/tty/serial/altera_jtaguart.c
@@@ -824,7 -816,7 +824,7 @@@ ARM/CIRRUS LOGIC CLPS711X ARM ARCHITECT
  M:    Alexander Shiyan <shc_work@mail.ru>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Odd Fixes
 -F:    arch/arm/mach-clps711x/
 +N:    clps711x
  
  ARM/CIRRUS LOGIC EP93XX ARM ARCHITECTURE
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -918,11 -910,11 +918,11 @@@ F:      arch/arm/include/asm/hardware/dec212
  F:    arch/arm/mach-footbridge/
  
  ARM/FREESCALE IMX / MXC ARM ARCHITECTURE
 -M:    Shawn Guo <shawn.guo@linaro.org>
 +M:    Shawn Guo <shawn.guo@freescale.com>
  M:    Sascha Hauer <kernel@pengutronix.de>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
 -T:    git git://git.linaro.org/people/shawnguo/linux-2.6.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git
  F:    arch/arm/mach-imx/
  F:    arch/arm/boot/dts/imx*
  F:    arch/arm/configs/imx*_defconfig
@@@ -1175,14 -1167,6 +1175,14 @@@ L:    linux-arm-kernel@lists.infradead.or
  W:    http://www.arm.linux.org.uk/
  S:    Maintained
  
 +ARM/QUALCOMM SUPPORT
 +M:    Kumar Gala <galak@codeaurora.org>
 +M:    David Brown <davidb@codeaurora.org>
 +L:    linux-arm-msm@vger.kernel.org
 +S:    Maintained
 +F:    arch/arm/mach-qcom/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/galak/linux-qcom.git
 +
  ARM/RADISYS ENP2611 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -1291,21 -1275,13 +1291,21 @@@ S:   Maintaine
  F:    drivers/clk/socfpga/
  
  ARM/STI ARCHITECTURE
 -M:    Srinivas Kandagatla <srinivas.kandagatla@st.com>
 -M:    Stuart Menefy <stuart.menefy@st.com>
 +M:    Srinivas Kandagatla <srinivas.kandagatla@gmail.com>
 +M:    Maxime Coquelin <maxime.coquelin@st.com>
 +M:    Patrice Chotard <patrice.chotard@st.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    kernel@stlinux.com
  W:    http://www.stlinux.com
  S:    Maintained
  F:    arch/arm/mach-sti/
 +F:    arch/arm/boot/dts/sti*
 +F:    drivers/clocksource/arm_global_timer.c
 +F:    drivers/reset/sti/
 +F:    drivers/pinctrl/pinctrl-st.c
 +F:    drivers/media/rc/st_rc.c
 +F:    drivers/i2c/busses/i2c-st.c
 +F:    drivers/tty/serial/st-asc.c
  
  ARM/TECHNOLOGIC SYSTEMS TS7250 MACHINE SUPPORT
  M:    Lennert Buytenhek <kernel@wantstofly.org>
@@@ -1343,7 -1319,6 +1343,7 @@@ M:      Linus Walleij <linus.walleij@linaro.
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Supported
  F:    arch/arm/mach-u300/
 +F:    drivers/clocksource/timer-u300.c
  F:    drivers/i2c/busses/i2c-stu300.c
  F:    drivers/rtc/rtc-coh901331.c
  F:    drivers/watchdog/coh901327_wdt.c
@@@ -1637,11 -1612,11 +1637,11 @@@ S:   Maintaine
  F:    drivers/net/wireless/atmel*
  
  ATTO EXPRESSSAS SAS/SATA RAID SCSI DRIVER
 -M:      Bradley Grove <linuxdrivers@attotech.com>
 -L:      linux-scsi@vger.kernel.org
 -W:      http://www.attotech.com
 -S:      Supported
 -F:      drivers/scsi/esas2r
 +M:    Bradley Grove <linuxdrivers@attotech.com>
 +L:    linux-scsi@vger.kernel.org
 +W:    http://www.attotech.com
 +S:    Supported
 +F:    drivers/scsi/esas2r
  
  AUDIT SUBSYSTEM
  M:    Eric Paris <eparis@redhat.com>
@@@ -1720,8 -1695,6 +1720,8 @@@ F:      drivers/net/wireless/b43legacy
  
  BACKLIGHT CLASS/SUBSYSTEM
  M:    Jingoo Han <jg1.han@samsung.com>
 +M:    Bryan Wu <cooloney@gmail.com>
 +M:    Lee Jones <lee.jones@linaro.org>
  S:    Maintained
  F:    drivers/video/backlight/
  F:    include/linux/backlight.h
@@@ -1764,7 -1737,6 +1764,7 @@@ F:      include/uapi/linux/bfs_fs.
  BLACKFIN ARCHITECTURE
  M:    Steven Miao <realmz6@gmail.com>
  L:    adi-buildroot-devel@lists.sourceforge.net
 +T:    git git://git.code.sf.net/p/adi-linux/code
  W:    http://blackfin.uclinux.org
  S:    Supported
  F:    arch/blackfin/
@@@ -1858,8 -1830,8 +1858,8 @@@ F:      net/bluetooth
  F:    include/net/bluetooth/
  
  BONDING DRIVER
 -M:    Jay Vosburgh <fubar@us.ibm.com>
 -M:    Veaceslav Falico <vfalico@redhat.com>
 +M:    Jay Vosburgh <j.vosburgh@gmail.com>
 +M:    Veaceslav Falico <vfalico@gmail.com>
  M:    Andy Gospodarek <andy@greyhouse.net>
  L:    netdev@vger.kernel.org
  W:    http://sourceforge.net/projects/bonding/
@@@ -1873,12 -1845,6 +1873,12 @@@ L:    netdev@vger.kernel.or
  S:    Supported
  F:    drivers/net/ethernet/broadcom/b44.*
  
 +BROADCOM GENET ETHERNET DRIVER
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Supported
 +F:    drivers/net/ethernet/broadcom/genet/
 +
  BROADCOM BNX2 GIGABIT ETHERNET DRIVER
  M:    Michael Chan <mchan@broadcom.com>
  L:    netdev@vger.kernel.org
@@@ -1894,7 -1860,6 +1894,7 @@@ F:      drivers/net/ethernet/broadcom/bnx2x
  
  BROADCOM BCM281XX/BCM11XXX ARM ARCHITECTURE
  M:    Christian Daudt <bcm@fixthebug.org>
 +M:    Matt Porter <mporter@linaro.org>
  L:    bcm-kernel-feedback-list@broadcom.com
  T:    git git://git.github.com/broadcom/bcm11351
  S:    Maintained
@@@ -1910,19 -1875,11 +1910,19 @@@ M:   Stephen Warren <swarren@wwwdotorg.or
  L:    linux-rpi-kernel@lists.infradead.org (moderated for non-subscribers)
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/swarren/linux-rpi.git
  S:    Maintained
 -F:    arch/arm/mach-bcm2835/
 +F:    arch/arm/mach-bcm/board_bcm2835.c
  F:    arch/arm/boot/dts/bcm2835*
  F:    arch/arm/configs/bcm2835_defconfig
  F:    drivers/*/*bcm2835*
  
 +BROADCOM BCM5301X ARM ARCHICTURE
 +M:    Hauke Mehrtens <hauke@hauke-m.de>
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    arch/arm/mach-bcm/bcm_5301x.c
 +F:    arch/arm/boot/dts/bcm5301x.dtsi
 +F:    arch/arm/boot/dts/bcm470*
 +
  BROADCOM TG3 GIGABIT ETHERNET DRIVER
  M:    Nithin Nayak Sujir <nsujir@broadcom.com>
  M:    Michael Chan <mchan@broadcom.com>
@@@ -1952,13 -1909,6 +1952,13 @@@ L:    linux-scsi@vger.kernel.or
  S:    Supported
  F:    drivers/scsi/bnx2i/
  
 +BROADCOM KONA GPIO DRIVER
 +M:    Markus Mayer <markus.mayer@linaro.org>
 +L:    bcm-kernel-feedback-list@broadcom.com
 +S:    Supported
 +F:    drivers/gpio/gpio-bcm-kona.c
 +F:    Documentation/devicetree/bindings/gpio/gpio-bcm-kona.txt
 +
  BROADCOM SPECIFIC AMBA DRIVER (BCMA)
  M:    Rafał Miłecki <zajec5@gmail.com>
  L:    linux-wireless@vger.kernel.org
@@@ -1967,8 -1917,8 +1967,8 @@@ F:      drivers/bcma
  F:    include/linux/bcma/
  
  BROCADE BFA FC SCSI DRIVER
 -M:    Anil Gurumurthy <agurumur@brocade.com>
 -M:    Vijaya Mohan Guvva <vmohan@brocade.com>
 +M:    Anil Gurumurthy <anil.gurumurthy@qlogic.com>
 +M:    Sudarsana Kalluru <sudarsana.kalluru@qlogic.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/bfa/
@@@ -2208,7 -2158,7 +2208,7 @@@ F:      Documentation/zh_CN
  
  CHIPIDEA USB HIGH SPEED DUAL ROLE CONTROLLER
  M:    Peter Chen <Peter.Chen@freescale.com>
 -T:    git://github.com/hzpeterchen/linux-usb.git
 +T:    git git://github.com/hzpeterchen/linux-usb.git
  L:    linux-usb@vger.kernel.org
  S:    Maintained
  F:    drivers/usb/chipidea/
@@@ -2228,9 -2178,9 +2228,9 @@@ S:      Supporte
  F:    drivers/net/ethernet/cisco/enic/
  
  CISCO VIC LOW LATENCY NIC DRIVER
 -M:      Upinder Malhi <umalhi@cisco.com>
 -S:      Supported
 -F:      drivers/infiniband/hw/usnic
 +M:    Upinder Malhi <umalhi@cisco.com>
 +S:    Supported
 +F:    drivers/infiniband/hw/usnic
  
  CIRRUS LOGIC EP93XX ETHERNET DRIVER
  M:    Hartley Sweeten <hsweeten@visionengravers.com>
@@@ -2250,13 -2200,6 +2250,13 @@@ L:    alsa-devel@alsa-project.org (moderat
  S:    Odd Fixes
  F:    sound/soc/codecs/cs4270*
  
 +CIRRUS LOGIC AUDIO CODEC DRIVERS
 +M:    Brian Austin <brian.austin@cirrus.com>
 +M:    Paul Handrigan <Paul.Handrigan@cirrus.com>
 +L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    sound/soc/codecs/cs*
 +
  CLEANCACHE API
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
  L:    linux-kernel@vger.kernel.org
@@@ -2318,7 -2261,7 +2318,7 @@@ F:      include/uapi/linux/coda*.
  
  COMMON CLK FRAMEWORK
  M:    Mike Turquette <mturquette@linaro.org>
 -L:    linux-arm-kernel@lists.infradead.org (same as CLK API & CLKDEV)
 +L:    linux-kernel@vger.kernel.org
  T:    git git://git.linaro.org/people/mturquette/linux.git
  S:    Maintained
  F:    drivers/clk/
@@@ -2424,7 -2367,7 +2424,7 @@@ F:      include/linux/cpufreq.
  
  CPU FREQUENCY DRIVERS - ARM BIG LITTLE
  M:    Viresh Kumar <viresh.kumar@linaro.org>
 -M:    Sudeep KarkadaNagesha <sudeep.karkadanagesha@arm.com>
 +M:    Sudeep Holla <sudeep.holla@arm.com>
  L:    cpufreq@vger.kernel.org
  L:    linux-pm@vger.kernel.org
  W:    http://www.arm.com/products/processors/technologies/biglittleprocessing.php
@@@ -2434,20 -2377,20 +2434,20 @@@ F:   drivers/cpufreq/arm_big_little.
  F:    drivers/cpufreq/arm_big_little_dt.c
  
  CPUIDLE DRIVER - ARM BIG LITTLE
 -M:      Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 -M:      Daniel Lezcano <daniel.lezcano@linaro.org>
 -L:      linux-pm@vger.kernel.org
 -L:      linux-arm-kernel@lists.infradead.org
 -T:      git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 -S:      Maintained
 -F:      drivers/cpuidle/cpuidle-big_little.c
 +M:    Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
 +M:    Daniel Lezcano <daniel.lezcano@linaro.org>
 +L:    linux-pm@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +S:    Maintained
 +F:    drivers/cpuidle/cpuidle-big_little.c
  
  CPUIDLE DRIVERS
  M:    Rafael J. Wysocki <rjw@rjwysocki.net>
  M:    Daniel Lezcano <daniel.lezcano@linaro.org>
  L:    linux-pm@vger.kernel.org
  S:    Maintained
 -T:    git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git
  F:    drivers/cpuidle/*
  F:    include/linux/cpuidle.h
  
@@@ -2465,10 -2408,8 +2465,10 @@@ F:    tools/power/cpupower
  
  CPUSETS
  M:    Li Zefan <lizefan@huawei.com>
 +L:    cgroups@vger.kernel.org
  W:    http://www.bullopensource.org/cpuset/
  W:    http://oss.sgi.com/projects/cpusets/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git
  S:    Maintained
  F:    Documentation/cgroups/cpusets.txt
  F:    include/linux/cpuset.h
@@@ -2514,9 -2455,9 +2514,9 @@@ S:      Maintaine
  F:    sound/pci/cs5535audio/
  
  CW1200 WLAN driver
 -M:     Solomon Peachy <pizza@shaftnet.org>
 -S:     Maintained
 -F:     drivers/net/wireless/cw1200/
 +M:    Solomon Peachy <pizza@shaftnet.org>
 +S:    Maintained
 +F:    drivers/net/wireless/cw1200/
  
  CX18 VIDEO4LINUX DRIVER
  M:    Andy Walls <awalls@md.metrocast.net>
@@@ -2667,9 -2608,9 +2667,9 @@@ DC395x SCSI drive
  M:    Oliver Neukum <oliver@neukum.org>
  M:    Ali Akcaagac <aliakc@web.de>
  M:    Jamie Lenehan <lenehan@twibble.org>
 -W:    http://twibble.org/dist/dc395x/
  L:    dc395x@twibble.org
 -L:    http://lists.twibble.org/mailman/listinfo/dc395x/
 +W:    http://twibble.org/dist/dc395x/
 +W:    http://lists.twibble.org/mailman/listinfo/dc395x/
  S:    Maintained
  F:    Documentation/scsi/dc395x.txt
  F:    drivers/scsi/dc395x.*
@@@ -2761,31 -2702,6 +2761,31 @@@ F:    include/linux/device-mapper.
  F:    include/linux/dm-*.h
  F:    include/uapi/linux/dm-*.h
  
 +DIALOG SEMICONDUCTOR DRIVERS
 +M:    Support Opensource <support.opensource@diasemi.com>
 +W:    http://www.dialog-semiconductor.com/products
 +S:    Supported
 +F:    Documentation/hwmon/da90??
 +F:    drivers/gpio/gpio-da90??.c
 +F:    drivers/hwmon/da90??-hwmon.c
 +F:    drivers/input/misc/da90??_onkey.c
 +F:    drivers/input/touchscreen/da9052_tsi.c
 +F:    drivers/leds/leds-da90??.c
 +F:    drivers/mfd/da903x.c
 +F:    drivers/mfd/da90??-*.c
 +F:    drivers/power/da9052-battery.c
 +F:    drivers/regulator/da903x.c
 +F:    drivers/regulator/da9???-regulator.[ch]
 +F:    drivers/rtc/rtc-da90??.c
 +F:    drivers/video/backlight/da90??_bl.c
 +F:    drivers/watchdog/da90??_wdt.c
 +F:    include/linux/mfd/da903x.h
 +F:    include/linux/mfd/da9052/
 +F:    include/linux/mfd/da9055/
 +F:    include/linux/mfd/da9063/
 +F:    include/sound/da[79]*.h
 +F:    sound/soc/codecs/da[79]*.[ch]
 +
  DIGI NEO AND CLASSIC PCI PRODUCTS
  M:    Lidza Louina <lidza.louina@gmail.com>
  L:    driverdev-devel@linuxdriverproject.org
@@@ -2880,9 -2796,9 +2880,9 @@@ S:      Supporte
  F:    drivers/acpi/dock.c
  
  DOCUMENTATION
 -M:    Rob Landley <rob@landley.net>
 +M:    Randy Dunlap <rdunlap@infradead.org>
  L:    linux-doc@vger.kernel.org
 -T:    TBD
 +T:    quilt http://www.infradead.org/~rdunlap/Doc/patches/
  S:    Maintained
  F:    Documentation/
  
@@@ -2929,39 -2845,19 +2929,39 @@@ F:   lib/kobj
  DRM DRIVERS
  M:    David Airlie <airlied@linux.ie>
  L:    dri-devel@lists.freedesktop.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/airlied/drm-2.6.git
 +T:    git git://people.freedesktop.org/~airlied/linux
  S:    Maintained
  F:    drivers/gpu/drm/
  F:    include/drm/
  F:    include/uapi/drm/
  
 +RADEON DRM DRIVERS
 +M:    Alex Deucher <alexander.deucher@amd.com>
 +M:    Christian König <christian.koenig@amd.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git git://people.freedesktop.org/~agd5f/linux
 +S:    Supported
 +F:    drivers/gpu/drm/radeon/
 +F:    include/drm/radeon*
 +F:    include/uapi/drm/radeon*
 +
 +DRM PANEL DRIVERS
 +M:    Thierry Reding <thierry.reding@gmail.com>
 +L:    dri-devel@lists.freedesktop.org
 +T:    git git://anongit.freedesktop.org/tegra/linux.git
 +S:    Maintained
 +F:    drivers/gpu/drm/drm_panel.c
 +F:    drivers/gpu/drm/panel/
 +F:    include/drm/drm_panel.h
 +F:    Documentation/devicetree/bindings/panel/
 +
  INTEL DRM DRIVERS (excluding Poulsbo, Moorestown and derivative chipsets)
  M:    Daniel Vetter <daniel.vetter@ffwll.ch>
  M:    Jani Nikula <jani.nikula@linux.intel.com>
  L:    intel-gfx@lists.freedesktop.org
  L:    dri-devel@lists.freedesktop.org
  Q:    http://patchwork.freedesktop.org/project/intel-gfx/
 -T:    git git://people.freedesktop.org/~danvet/drm-intel
 +T:    git git://anongit.freedesktop.org/drm-intel
  S:    Supported
  F:    drivers/gpu/drm/i915/
  F:    include/drm/i915*
@@@ -3186,8 -3082,6 +3186,8 @@@ F:      fs/ecryptfs
  
  EDAC-CORE
  M:    Doug Thompson <dougthompson@xmission.com>
 +M:    Borislav Petkov <bp@alien8.de>
 +M:    Mauro Carvalho Chehab <m.chehab@samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
  S:    Supported
@@@ -3430,17 -3324,6 +3430,17 @@@ S:    Maintaine
  F:    include/linux/netfilter_bridge/
  F:    net/bridge/
  
 +ETHERNET PHY LIBRARY
 +M:    Florian Fainelli <f.fainelli@gmail.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    include/linux/phy.h
 +F:    include/linux/phy_fixed.h
 +F:    drivers/net/phy/
 +F:    Documentation/networking/phy.txt
 +F:    drivers/of/of_mdio.c
 +F:    drivers/of/of_net.c
 +
  EXT2 FILE SYSTEM
  M:    Jan Kara <jack@suse.cz>
  L:    linux-ext4@vger.kernel.org
@@@ -3469,9 -3352,7 +3469,9 @@@ F:      Documentation/filesystems/ext4.tx
  F:    fs/ext4/
  
  Extended Verification Module (EVM)
 -M:    Mimi Zohar <zohar@us.ibm.com>
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +L:    linux-ima-devel@lists.sourceforge.net
 +L:    linux-security-module@vger.kernel.org
  S:    Supported
  F:    security/integrity/evm/
  
@@@ -3484,6 -3365,12 +3484,6 @@@ S:     Maintaine
  F:    drivers/extcon/
  F:    Documentation/extcon/
  
 -EXYNOS DP DRIVER
 -M:    Jingoo Han <jg1.han@samsung.com>
 -L:    linux-fbdev@vger.kernel.org
 -S:    Maintained
 -F:    drivers/video/exynos/exynos_dp*
 -
  EXYNOS MIPI DISPLAY DRIVERS
  M:    Inki Dae <inki.dae@samsung.com>
  M:    Donghwa Lee <dh09.lee@samsung.com>
@@@ -3549,8 -3436,7 +3549,8 @@@ F:      include/scsi/libfcoe.
  F:    include/uapi/scsi/fc/
  
  FILE LOCKING (flock() and fcntl()/lockf())
 -M:    Matthew Wilcox <matthew@wil.cx>
 +M:    Jeff Layton <jlayton@redhat.com>
 +M:    J. Bruce Fields <bfields@fieldses.org>
  L:    linux-fsdevel@vger.kernel.org
  S:    Maintained
  F:    include/linux/fcntl.h
@@@ -3743,8 -3629,8 +3743,8 @@@ S:      Maintaine
  F:    fs/freevxfs/
  
  FREEZER
 -M:    Pavel Machek <pavel@ucw.cz>
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    Pavel Machek <pavel@ucw.cz>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    Documentation/power/freezing-of-tasks.txt
@@@ -4108,8 -3994,8 +4108,8 @@@ S:      Maintaine
  F:    drivers/video/hgafb.c
  
  HIBERNATION (aka Software Suspend, aka swsusp)
 -M:    Pavel Machek <pavel@ucw.cz>
  M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
 +M:    Pavel Machek <pavel@ucw.cz>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    arch/x86/power/
@@@ -4191,7 -4077,8 +4191,7 @@@ F:      include/linux/hpet.
  F:    include/uapi/linux/hpet.h
  
  HPET: x86
 -M:    "Venkatesh Pallipadi (Venki)" <venki@google.com>
 -S:    Maintained
 +S:    Orphan
  F:    arch/x86/kernel/hpet.c
  F:    arch/x86/include/asm/hpet.h
  
@@@ -4487,11 -4374,8 +4487,11 @@@ S:    Maintaine
  F:    drivers/ipack/
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 -M:    Mimi Zohar <zohar@us.ibm.com>
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
  M:    Dmitry Kasatkin <d.kasatkin@samsung.com>
 +L:    linux-ima-devel@lists.sourceforge.net
 +L:    linux-ima-user@lists.sourceforge.net
 +L:    linux-security-module@vger.kernel.org
  S:    Supported
  F:    security/integrity/ima/
  
@@@ -4546,7 -4430,8 +4546,7 @@@ K:      \b(ABS|SYN)_MT
  
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@intel.com>
 -M:    Lukasz Dorau <lukasz.dorau@intel.com>
 -M:    Maciej Patelczyk <maciej.patelczyk@intel.com>
 +M:    Artur Paszkiewicz <artur.paszkiewicz@intel.com>
  M:    Dave Jiang <dave.jiang@intel.com>
  L:    linux-scsi@vger.kernel.org
  T:    git git://git.code.sf.net/p/intel-sas/isci
@@@ -4632,7 -4517,6 +4632,7 @@@ M:      Greg Rose <gregory.v.rose@intel.com
  M:    Alex Duyck <alexander.h.duyck@intel.com>
  M:    John Ronciak <john.ronciak@intel.com>
  M:    Mitch Williams <mitch.a.williams@intel.com>
 +M:    Linux NICS <linux.nics@intel.com>
  L:    e1000-devel@lists.sourceforge.net
  W:    http://www.intel.com/support/feedback.htm
  W:    http://e1000.sourceforge.net/
@@@ -4650,7 -4534,6 +4650,7 @@@ F:      Documentation/networking/ixgbevf.tx
  F:    Documentation/networking/i40e.txt
  F:    Documentation/networking/i40evf.txt
  F:    drivers/net/ethernet/intel/
 +F:    drivers/net/ethernet/intel/*/
  
  INTEL-MID GPIO DRIVER
  M:    David Cohen <david.a.cohen@linux.intel.com>
@@@ -4681,7 -4564,7 +4681,7 @@@ F:      arch/x86/kernel/tboot.
  INTEL WIRELESS WIMAX CONNECTION 2400
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com
 -L:    wimax@linuxwimax.org
 +L:     wimax@linuxwimax.org (subscribers-only)
  S:    Supported
  W:    http://linuxwimax.org
  F:    Documentation/wimax/README.i2400m
@@@ -4887,6 -4770,22 +4887,6 @@@ S:     Maintaine
  F:    Documentation/hwmon/it87
  F:    drivers/hwmon/it87.c
  
 -IT913X MEDIA DRIVER
 -M:    Malcolm Priestley <tvboxspy@gmail.com>
 -L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Maintained
 -F:    drivers/media/usb/dvb-usb-v2/it913x*
 -
 -IT913X FE MEDIA DRIVER
 -M:    Malcolm Priestley <tvboxspy@gmail.com>
 -L:    linux-media@vger.kernel.org
 -W:    http://linuxtv.org/
 -Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 -S:    Maintained
 -F:    drivers/media/dvb-frontends/it913x-fe*
 -
  IT913X MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -4991,7 -4890,7 +4991,7 @@@ F:      drivers/staging/ktap
  KCONFIG
  M:    "Yann E. MORIN" <yann.morin.1998@free.fr>
  L:    linux-kbuild@vger.kernel.org
 -T:    git://gitorious.org/linux-kconfig/linux-kconfig
 +T:    git git://gitorious.org/linux-kconfig/linux-kconfig
  S:    Maintained
  F:    Documentation/kbuild/kconfig-language.txt
  F:    scripts/kconfig/
@@@ -5142,8 -5041,8 +5142,8 @@@ F:      include/keys
  F:    security/keys/
  
  KEYS-TRUSTED
 -M:    David Safford <safford@watson.ibm.com>
 -M:    Mimi Zohar <zohar@us.ibm.com>
 +M:    David Safford <safford@us.ibm.com>
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
@@@ -5153,8 -5052,8 +5153,8 @@@ F:      security/keys/trusted.
  F:    security/keys/trusted.h
  
  KEYS-ENCRYPTED
 -M:    Mimi Zohar <zohar@us.ibm.com>
 -M:    David Safford <safford@watson.ibm.com>
 +M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 +M:    David Safford <safford@us.ibm.com>
  L:    linux-security-module@vger.kernel.org
  L:    keyrings@linux-nfs.org
  S:    Supported
@@@ -5317,10 -5216,11 +5317,10 @@@ F:   arch/powerpc/platforms/512x
  F:    arch/powerpc/platforms/52xx/
  
  LINUX FOR POWERPC EMBEDDED PPC4XX
 -M:    Josh Boyer <jwboyer@gmail.com>
 +M:  Alistair Popple <alistair@popple.id.au>
  M:    Matt Porter <mporter@kernel.crashing.org>
  W:    http://www.penguinppc.org/
  L:    linuxppc-dev@lists.ozlabs.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx.git
  S:    Maintained
  F:    arch/powerpc/platforms/40x/
  F:    arch/powerpc/platforms/44x/
@@@ -5547,11 -5447,11 +5547,11 @@@ S:   Maintaine
  F:    drivers/media/tuners/m88ts2022*
  
  MA901 MASTERKIT USB FM RADIO DRIVER
 -M:      Alexey Klimov <klimov.linux@gmail.com>
 -L:      linux-media@vger.kernel.org
 -T:      git git://linuxtv.org/media_tree.git
 -S:      Maintained
 -F:      drivers/media/radio/radio-ma901.c
 +M:    Alexey Klimov <klimov.linux@gmail.com>
 +L:    linux-media@vger.kernel.org
 +T:    git git://linuxtv.org/media_tree.git
 +S:    Maintained
 +F:    drivers/media/radio/radio-ma901.c
  
  MAC80211
  M:    Johannes Berg <johannes@sipsolutions.net>
@@@ -5587,11 -5487,6 +5587,11 @@@ W:    http://www.kernel.org/doc/man-page
  L:    linux-man@vger.kernel.org
  S:    Maintained
  
 +MARVELL ARMADA DRM SUPPORT
 +M:    Russell King <rmk+kernel@arm.linux.org.uk>
 +S:    Maintained
 +F:    drivers/gpu/drm/armada/
 +
  MARVELL GIGABIT ETHERNET DRIVERS (skge/sky2)
  M:    Mirko Lindner <mlindner@marvell.com>
  M:    Stephen Hemminger <stephen@networkplumber.org>
@@@ -5712,7 -5607,7 +5712,7 @@@ F:      drivers/scsi/megaraid
  
  MELLANOX ETHERNET DRIVER (mlx4_en)
  M:    Amir Vadai <amirv@mellanox.com>
 -L:    netdev@vger.kernel.org
 +L:    netdev@vger.kernel.org
  S:    Supported
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
@@@ -5753,17 -5648,11 +5753,17 @@@ F:   include/linux/mtd
  F:    include/uapi/mtd/
  
  MEN A21 WATCHDOG DRIVER
 -M:    Johannes Thumshirn <johannes.thumshirn@men.de>
 +M:    Johannes Thumshirn <johannes.thumshirn@men.de>
  L:    linux-watchdog@vger.kernel.org
  S:    Supported
  F:    drivers/watchdog/mena21_wdt.c
  
 +MEN CHAMELEON BUS (mcb)
 +M:    Johannes Thumshirn <johannes.thumshirn@men.de>
 +S:    Supported
 +F:    drivers/mcb/
 +F:    include/linux/mcb.h
 +
  METAG ARCHITECTURE
  M:    James Hogan <james.hogan@imgtec.com>
  L:    linux-metag@vger.kernel.org
@@@ -5779,6 -5668,7 +5779,6 @@@ F:      fs/imgdafs
  
  MICROBLAZE ARCHITECTURE
  M:    Michal Simek <monstr@monstr.eu>
 -L:    microblaze-uclinux@itee.uq.edu.au (moderated for non-subscribers)
  W:    http://www.monstr.eu/fdt/
  T:    git git://git.monstr.eu/linux-2.6-microblaze.git
  S:    Supported
@@@ -5814,20 -5704,20 +5814,20 @@@ L:   linux-rdma@vger.kernel.or
  W:    http://www.mellanox.com
  Q:    http://patchwork.ozlabs.org/project/netdev/list/
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 -T:    git://openfabrics.org/~eli/connect-ib.git
 +T:    git git://openfabrics.org/~eli/connect-ib.git
  S:    Supported
  F:    drivers/net/ethernet/mellanox/mlx5/core/
  F:    include/linux/mlx5/
  
  Mellanox MLX5 IB driver
 -M:      Eli Cohen <eli@mellanox.com>
 -L:      linux-rdma@vger.kernel.org
 -W:      http://www.mellanox.com
 -Q:      http://patchwork.kernel.org/project/linux-rdma/list/
 -T:      git://openfabrics.org/~eli/connect-ib.git
 -S:      Supported
 -F:      include/linux/mlx5/
 -F:      drivers/infiniband/hw/mlx5/
 +M:    Eli Cohen <eli@mellanox.com>
 +L:    linux-rdma@vger.kernel.org
 +W:    http://www.mellanox.com
 +Q:    http://patchwork.kernel.org/project/linux-rdma/list/
 +T:    git git://openfabrics.org/~eli/connect-ib.git
 +S:    Supported
 +F:    include/linux/mlx5/
 +F:    drivers/infiniband/hw/mlx5/
  
  MODULE SUPPORT
  M:    Rusty Russell <rusty@rustcorp.com.au>
@@@ -5867,26 -5757,6 +5867,26 @@@ L:    platform-driver-x86@vger.kernel.or
  S:    Supported
  F:    drivers/platform/x86/msi-wmi.c
  
 +MSI001 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/staging/media/msi3101/msi001*
 +
 +MSI3101 MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/staging/media/msi3101/sdr-msi3101*
 +
  MT9M032 APTINA SENSOR DRIVER
  M:    Laurent Pinchart <laurent.pinchart@ideasonboard.com>
  L:    linux-media@vger.kernel.org
@@@ -5930,6 -5800,7 +5930,7 @@@ F:      include/linux/mfd
  
  MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
  M:    Chris Ball <chris@printf.net>
+ M:    Ulf Hansson <ulf.hansson@linaro.org>
  L:    linux-mmc@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/cjb/mmc.git
  S:    Maintained
@@@ -6099,9 -5970,6 +6100,9 @@@ F:      include/linux/netdevice.
  F:    include/uapi/linux/in.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/netdevice.h
 +F:    tools/net/
 +F:    tools/testing/selftests/net/
 +F:    lib/random32.c
  
  NETWORKING [IPv4/IPv6]
  M:    "David S. Miller" <davem@davemloft.net>
@@@ -6125,7 -5993,6 +6126,7 @@@ L:      netdev@vger.kernel.or
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git
  S:    Maintained
 +F:    net/core/flow.c
  F:    net/xfrm/
  F:    net/key/
  F:    net/ipv4/xfrm*
@@@ -6201,7 -6068,6 +6202,7 @@@ F:      include/net/nfc
  F:    include/uapi/linux/nfc.h
  F:    drivers/nfc/
  F:    include/linux/platform_data/pn544.h
 +F:    Documentation/devicetree/bindings/net/nfc/
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@primarydata.com>
@@@ -6220,10 -6086,10 +6221,10 @@@ F:   include/uapi/linux/nfs
  F:    include/uapi/linux/sunrpc/
  
  NILFS2 FILESYSTEM
 -M:    KONISHI Ryusuke <konishi.ryusuke@lab.ntt.co.jp>
 +M:    Ryusuke Konishi <konishi.ryusuke@lab.ntt.co.jp>
  L:    linux-nilfs@vger.kernel.org
 -W:    http://www.nilfs.org/en/
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/ryusuke/nilfs2.git
 +W:    http://nilfs.sourceforge.net/
 +T:    git git://github.com/konis/nilfs2.git
  S:    Supported
  F:    Documentation/filesystems/nilfs2.txt
  F:    fs/nilfs2/
@@@ -6277,12 -6143,6 +6278,12 @@@ S:    Supporte
  F:    drivers/block/nvme*
  F:    include/linux/nvme.h
  
 +NXP TDA998X DRM DRIVER
 +M:    Russell King <rmk+kernel@arm.linux.org.uk>
 +S:    Supported
 +F:    drivers/gpu/drm/i2c/tda998x_drv.c
 +F:    include/drm/i2c/tda998x.h
 +
  OMAP SUPPORT
  M:    Tony Lindgren <tony@atomide.com>
  L:    linux-omap@vger.kernel.org
@@@ -7161,8 -7021,13 +7162,8 @@@ F:     Documentation/networking/LICENSE.qla
  F:    drivers/net/ethernet/qlogic/qla3xxx.*
  
  QLOGIC QLCNIC (1/10)Gb ETHERNET DRIVER
 -M:    Himanshu Madhani <himanshu.madhani@qlogic.com>
 -M:    Rajesh Borundia <rajesh.borundia@qlogic.com>
  M:    Shahed Shaikh <shahed.shaikh@qlogic.com>
 -M:    Jitendra Kalsaria <jitendra.kalsaria@qlogic.com>
 -M:    Sony Chacko <sony.chacko@qlogic.com>
 -M:    Sucheta Chakraborty <sucheta.chakraborty@qlogic.com>
 -M:    linux-driver@qlogic.com
 +M:    Dept-HSGLinuxNICDev@qlogic.com
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/qlogic/qlcnic/
@@@ -7332,7 -7197,7 +7333,7 @@@ S:      Maintaine
  F:    drivers/net/ethernet/rdc/r6040.c
  
  RDS - RELIABLE DATAGRAM SOCKETS
 -M:    Venkat Venkatsubra <venkat.x.venkatsubra@oracle.com>
 +M:    Chien Yen <chien.yen@oracle.com>
  L:    rds-devel@oss.oracle.com (moderated for non-subscribers)
  S:    Supported
  F:    net/rds/
@@@ -7454,16 -7319,6 +7455,16 @@@ T:    git git://linuxtv.org/anttip/media_t
  S:    Maintained
  F:    drivers/media/dvb-frontends/rtl2832*
  
 +RTL2832_SDR MEDIA DRIVER
 +M:    Antti Palosaari <crope@iki.fi>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +W:    http://palosaari.fi/linux/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/anttip/media_tree.git
 +S:    Maintained
 +F:    drivers/staging/media/rtl2832u_sdr/rtl2832_sdr*
 +
  RTL8180 WIRELESS DRIVER
  M:    "John W. Linville" <linville@tuxdriver.com>
  L:    linux-wireless@vger.kernel.org
@@@ -7507,26 -7362,10 +7508,26 @@@ W:   http://www.ibm.com/developerworks/li
  S:    Supported
  F:    arch/s390/
  F:    drivers/s390/
 -F:    block/partitions/ibm.c
  F:    Documentation/s390/
  F:    Documentation/DocBook/s390*
  
 +S390 COMMON I/O LAYER
 +M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 +M:    Peter Oberparleiter <oberpar@linux.vnet.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/s390/cio/
 +
 +S390 DASD DRIVER
 +M:    Stefan Weinhuber <wein@de.ibm.com>
 +M:    Stefan Haberland <stefan.haberland@de.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    drivers/s390/block/dasd*
 +F:    block/partitions/ibm.c
 +
  S390 NETWORK DRIVERS
  M:    Ursula Braun <ursula.braun@de.ibm.com>
  M:    Frank Blaschka <blaschka@linux.vnet.ibm.com>
@@@ -7536,15 -7375,6 +7537,15 @@@ W:    http://www.ibm.com/developerworks/li
  S:    Supported
  F:    drivers/s390/net/
  
 +S390 PCI SUBSYSTEM
 +M:    Sebastian Ott <sebott@linux.vnet.ibm.com>
 +M:    Gerald Schaefer <gerald.schaefer@de.ibm.com>
 +L:    linux-s390@vger.kernel.org
 +W:    http://www.ibm.com/developerworks/linux/linux390/
 +S:    Supported
 +F:    arch/s390/pci/
 +F:    drivers/pci/hotplug/s390_pci_hpc.c
 +
  S390 ZCRYPT DRIVER
  M:    Ingo Tuchscherer <ingo.tuchscherer@de.ibm.com>
  M:    linux390@de.ibm.com
@@@ -7668,15 -7498,6 +7669,15 @@@ S:    Supporte
  L:    linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
  F:    drivers/clk/samsung/
  
 +SAMSUNG SXGBE DRIVERS
 +M:    Byungho An <bh74.an@samsung.com>
 +M:    Girish K S <ks.giri@samsung.com>
 +M:    Siva Reddy Kallam <siva.kallam@samsung.com>
 +M:    Vipul Pandya <vipul.pandya@samsung.com>
 +S:    Supported
 +L:    netdev@vger.kernel.org
 +F:    drivers/net/ethernet/samsung/sxgbe/
 +
  SERIAL DRIVERS
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  L:    linux-serial@vger.kernel.org
@@@ -7866,10 -7687,11 +7867,10 @@@ M:   Security Officers <security@kernel.o
  S:    Supported
  
  SELINUX SECURITY MODULE
 +M:    Paul Moore <paul@paul-moore.com>
  M:    Stephen Smalley <sds@tycho.nsa.gov>
 -M:    James Morris <james.l.morris@oracle.com>
  M:    Eric Paris <eparis@parisplace.org>
 -M:    Paul Moore <paul@paul-moore.com>
 -L:    selinux@tycho.nsa.gov (subscribers-only, general discussion)
 +L:    selinux@tycho.nsa.gov (moderated for non-subscribers)
  W:    http://selinuxproject.org
  T:    git git://git.infradead.org/users/pcmoore/selinux
  S:    Supported
@@@ -7936,6 -7758,13 +7937,6 @@@ F:     Documentation/ia64/serial.tx
  F:    drivers/tty/serial/ioc?_serial.c
  F:    include/linux/ioc?.h
  
 -SGI VISUAL WORKSTATION 320 AND 540
 -M:    Andrey Panin <pazke@donpac.ru>
 -L:    linux-visws-devel@lists.sf.net
 -W:    http://linux-visws.sf.net
 -S:    Maintained for 2.6.
 -F:    Documentation/sgi-visws.txt
 -
  SGI XP/XPC/XPNET DRIVER
  M:    Cliff Whickman <cpw@sgi.com>
  M:    Robin Holt <robinmholt@gmail.com>
@@@ -7996,13 -7825,15 +7997,13 @@@ F:   drivers/media/usb/siano
  F:    drivers/media/mmc/siano/
  
  SH_VEU V4L2 MEM2MEM DRIVER
 -M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -S:    Maintained
 +S:    Orphan
  F:    drivers/media/platform/sh_veu.c
  
  SH_VOU V4L2 OUTPUT DRIVER
 -M:    Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  L:    linux-media@vger.kernel.org
 -S:    Odd Fixes
 +S:    Orphan
  F:    drivers/media/platform/sh_vou.c
  F:    include/media/sh_vou.h
  
@@@ -8481,12 -8312,6 +8482,12 @@@ M:    Teddy Wang <teddy.wang@siliconmotion
  S:    Odd Fixes
  F:    drivers/staging/sm7xxfb/
  
 +STAGING - SLICOSS
 +M:    Lior Dotan <liodot@gmail.com>
 +M:    Christopher Harrer <charrer@alacritech.com>
 +S:    Odd Fixes
 +F:    drivers/staging/slicoss/
 +
  STAGING - SOFTLOGIC 6x10 MPEG CODEC
  M:    Ismael Luceno <ismael.luceno@corp.bluecherry.net>
  S:    Supported
@@@ -8548,18 -8373,20 +8549,18 @@@ S:   Maintaine
  F:    drivers/net/ethernet/dlink/sundance.c
  
  SUPERH
 -M:    Paul Mundt <lethal@linux-sh.org>
  L:    linux-sh@vger.kernel.org
  W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
 -T:    git git://github.com/pmundt/linux-sh.git sh-latest
 -S:    Supported
 +S:    Orphan
  F:    Documentation/sh/
  F:    arch/sh/
  F:    drivers/sh/
  
  SUSPEND TO RAM
 +M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  M:    Len Brown <len.brown@intel.com>
  M:    Pavel Machek <pavel@ucw.cz>
 -M:    "Rafael J. Wysocki" <rjw@rjwysocki.net>
  L:    linux-pm@vger.kernel.org
  S:    Supported
  F:    Documentation/power/
@@@ -8603,8 -8430,8 +8604,8 @@@ TARGET SUBSYSTE
  M:    Nicholas A. Bellinger <nab@linux-iscsi.org>
  L:    linux-scsi@vger.kernel.org
  L:    target-devel@vger.kernel.org
 -L:    http://groups.google.com/group/linux-iscsi-target-dev
  W:    http://www.linux-iscsi.org
 +W:    http://groups.google.com/group/linux-iscsi-target-dev
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
  S:    Supported
  F:    drivers/target/
@@@ -8835,7 -8662,6 +8836,7 @@@ M:      Max Filippov <jcmvbkbc@gmail.com
  L:    linux-xtensa@linux-xtensa.org
  S:    Maintained
  F:    arch/xtensa/
 +F:    drivers/irqchip/irq-xtensa-*
  
  THANKO'S RAREMONO AM/FM/SW RADIO RECEIVER USB DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
@@@ -8846,17 -8672,17 +8847,17 @@@ S:   Maintaine
  F:    drivers/media/radio/radio-raremono.c
  
  THERMAL
 -M:      Zhang Rui <rui.zhang@intel.com>
 -M:      Eduardo Valentin <eduardo.valentin@ti.com>
 -L:      linux-pm@vger.kernel.org
 -T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 -T:      git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
 -Q:      https://patchwork.kernel.org/project/linux-pm/list/
 -S:      Supported
 -F:      drivers/thermal/
 -F:      include/linux/thermal.h
 -F:      include/linux/cpu_cooling.h
 -F:      Documentation/devicetree/bindings/thermal/
 +M:    Zhang Rui <rui.zhang@intel.com>
 +M:    Eduardo Valentin <eduardo.valentin@ti.com>
 +L:    linux-pm@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/rzhang/linux.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/evalenti/linux-soc-thermal.git
 +Q:    https://patchwork.kernel.org/project/linux-pm/list/
 +S:    Supported
 +F:    drivers/thermal/
 +F:    include/linux/thermal.h
 +F:    include/linux/cpu_cooling.h
 +F:    Documentation/devicetree/bindings/thermal/
  
  THINGM BLINK(1) USB RGB LED DRIVER
  M:    Vivien Didelot <vivien.didelot@savoirfairelinux.com>
@@@ -9171,13 -8997,6 +9172,13 @@@ F:    drivers/cdrom/cdrom.
  F:    include/linux/cdrom.h
  F:    include/uapi/linux/cdrom.h
  
 +UNISYS S-PAR DRIVERS
 +M:     Benjamin Romer <benjamin.romer@unisys.com>
 +M:     David Kershner <david.kershner@unisys.com>
 +L:     sparmaintainer@unisys.com (Unisys internal)
 +S:     Supported
 +F:     drivers/staging/unisys/
 +
  UNIVERSAL FLASH STORAGE HOST CONTROLLER DRIVER
  M:    Vinayak Holikatti <vinholikatti@gmail.com>
  M:    Santosh Y <santoshsy@gmail.com>
@@@ -9216,7 -9035,8 +9217,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/ath/ar5523/
  
  USB ATTACHED SCSI
 -M:    Matthew Wilcox <willy@linux.intel.com>
 -M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
 +M:    Hans de Goede <hdegoede@redhat.com>
  M:    Gerd Hoffmann <kraxel@redhat.com>
  L:    linux-usb@vger.kernel.org
  L:    linux-scsi@vger.kernel.org
@@@ -9442,7 -9262,7 +9443,7 @@@ S:      Maintaine
  F:    drivers/net/wireless/rndis_wlan.c
  
  USB XHCI DRIVER
 -M:    Sarah Sharp <sarah.a.sharp@linux.intel.com>
 +M:    Mathias Nyman <mathias.nyman@intel.com>
  L:    linux-usb@vger.kernel.org
  S:    Supported
  F:    drivers/usb/host/xhci*
@@@ -9526,6 -9346,7 +9527,6 @@@ F:      include/media/videobuf2-
  
  VIRTIO CONSOLE DRIVER
  M:    Amit Shah <amit.shah@redhat.com>
 -L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/char/virtio_console.c
@@@ -9535,6 -9356,7 +9536,6 @@@ F:      include/uapi/linux/virtio_console.
  VIRTIO CORE, NET AND BLOCK DRIVERS
  M:    Rusty Russell <rusty@rustcorp.com.au>
  M:    "Michael S. Tsirkin" <mst@redhat.com>
 -L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  S:    Maintained
  F:    drivers/virtio/
@@@ -9547,6 -9369,7 +9548,6 @@@ F:      include/uapi/linux/virtio_*.
  VIRTIO HOST (VHOST)
  M:    "Michael S. Tsirkin" <mst@redhat.com>
  L:    kvm@vger.kernel.org
 -L:    virtio-dev@lists.oasis-open.org
  L:    virtualization@lists.linux-foundation.org
  L:    netdev@vger.kernel.org
  S:    Maintained
@@@ -9727,7 -9550,7 +9728,7 @@@ F:      drivers/media/rc/winbond-cir.
  WIMAX STACK
  M:    Inaky Perez-Gonzalez <inaky.perez-gonzalez@intel.com>
  M:    linux-wimax@intel.com
 -L:    wimax@linuxwimax.org
 +L:     wimax@linuxwimax.org (subscribers-only)
  S:    Supported
  W:    http://linuxwimax.org
  F:    Documentation/wimax/README.wimax
@@@ -9893,6 -9716,7 +9894,6 @@@ F:      drivers/xen/*swiotlb
  XFS FILESYSTEM
  P:    Silicon Graphics Inc
  M:    Dave Chinner <david@fromorbit.com>
 -M:    Ben Myers <bpm@sgi.com>
  M:    xfs@oss.sgi.com
  L:    xfs@oss.sgi.com
  W:    http://oss.sgi.com/projects/xfs
@@@ -9917,12 -9741,6 +9918,12 @@@ L:    linux-serial@vger.kernel.or
  S:    Maintained
  F:    drivers/tty/serial/uartlite.c
  
 +XTENSA XTFPGA PLATFORM SUPPORT
 +M:    Max Filippov <jcmvbkbc@gmail.com>
 +L:    linux-xtensa@linux-xtensa.org
 +S:    Maintained
 +F:    drivers/spi/spi-xtensa-xtfpga.c
 +
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <jpr@f6fbb.org>
  L:    linux-hams@vger.kernel.org
@@@ -9967,7 -9785,7 +9968,7 @@@ ZR36067 VIDEO FOR LINUX DRIVE
  L:    mjpeg-users@lists.sourceforge.net
  L:    linux-media@vger.kernel.org
  W:    http://mjpeg.sourceforge.net/driver-zoran/
 -T:    Mercurial http://linuxtv.org/hg/v4l-dvb
 +T:    hg http://linuxtv.org/hg/v4l-dvb
  S:    Odd Fixes
  F:    drivers/media/pci/zoran/
  
index 9e3caf3d19fbcf34187495a14eda3daf17aade4a,881e49262d09bddff50182c9762433681284d992..1c0f8e1893aed11eb3dfb8ca43360cbed2e961f6
                                1000000 1060000
                                1176000 1160000
                                >;
 +
 +                      clocks = <&dpll_mpu_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
                };
                cpu@1 {
                        device_type = "cpu";
                        ti,hwmods = "counter_32k";
                };
  
+               dra7_ctrl_general: tisyscon@4a002e00 {
+                       compatible = "syscon";
+                       reg = <0x4a002e00 0x7c>;
+               };
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0 0x4>;
+                       syscon = <&dra7_ctrl_general>;
+                       pbias_mmc_reg: pbias_mmc_omap5 {
+                               regulator-name = "pbias_mmc_omap5";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
                dra7_pmx_core: pinmux@4a003400 {
                        compatible = "pinctrl-single";
                        reg = <0x4a003400 0x0464>;
                        ti,hwmods = "wd_timer2";
                };
  
 +              hwspinlock: spinlock@4a0f6000 {
 +                      compatible = "ti,omap4-hwspinlock";
 +                      reg = <0x4a0f6000 0x1000>;
 +                      ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
 +              };
 +
 +              dmm@4e000000 {
 +                      compatible = "ti,omap5-dmm";
 +                      reg = <0x4e000000 0x800>;
 +                      interrupts = <0 113 0x4>;
 +                      ti,hwmods = "dmm";
 +              };
 +
                i2c1: i2c@48070000 {
                        compatible = "ti,omap4-i2c";
                        reg = <0x48070000 0x100>;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
                        status = "disabled";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
                        status = "disabled";
                };
  
 +              abb_mpu: regulator-abb-mpu {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_mpu";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07ddc 0x4>, <0x4ae07de0 0x4>,
 +                            <0x4ae06014 0x4>, <0x4a003b20 0x8>,
 +                            <0x4ae0c158 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x80>;
 +                      /* LDOVBBMPU_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBMPU_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1060000         0       0x0     0 0x02000000 0x01F00000
 +                      1160000         0       0x4     0 0x02000000 0x01F00000
 +                      1210000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_ivahd: regulator-abb-ivahd {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_ivahd";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07e34 0x4>, <0x4ae07e24 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a0025cc 0x8>,
 +                            <0x4a002470 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x40000000>;
 +                      /* LDOVBBIVA_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBIVA_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1055000         0       0x0     0 0x02000000 0x01F00000
 +                      1150000         0       0x4     0 0x02000000 0x01F00000
 +                      1250000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_dspeve: regulator-abb-dspeve {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_dspeve";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07e30 0x4>, <0x4ae07e20 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a0025e0 0x8>,
 +                            <0x4a00246c 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x20000000>;
 +                      /* LDOVBBDSPEVE_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBDSPEVE_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1055000         0       0x0     0 0x02000000 0x01F00000
 +                      1150000         0       0x4     0 0x02000000 0x01F00000
 +                      1250000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
 +              abb_gpu: regulator-abb-gpu {
 +                      compatible = "ti,abb-v3";
 +                      regulator-name = "abb_gpu";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      clocks = <&sys_clkin1>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      reg = <0x4ae07de4 0x4>, <0x4ae07de8 0x4>,
 +                            <0x4ae06010 0x4>, <0x4a003b08 0x8>,
 +                            <0x4ae0c154 0x4>;
 +                      reg-names = "setup-address", "control-address",
 +                                  "int-address", "efuse-address",
 +                                  "ldo-address";
 +                      ti,tranxdone-status-mask = <0x10000000>;
 +                      /* LDOVBBGPU_FBB_MUX_CTRL */
 +                      ti,ldovbb-override-mask = <0x400>;
 +                      /* LDOVBBGPU_FBB_VSET_OUT */
 +                      ti,ldovbb-vset-mask = <0x1F>;
 +
 +                      /*
 +                       * NOTE: only FBB mode used but actual vset will
 +                       * determine final biasing
 +                       */
 +                      ti,abb_info = <
 +                      /*uV            ABB     efuse   rbb_m fbb_m     vset_m*/
 +                      1090000         0       0x0     0 0x02000000 0x01F00000
 +                      1210000         0       0x4     0 0x02000000 0x01F00000
 +                      1280000         0       0x8     0 0x02000000 0x01F00000
 +                      >;
 +              };
 +
                mcspi1: spi@48098000 {
                        compatible = "ti,omap4-mcspi";
                        reg = <0x48098000 0x200>;
index 9d2f028fd6872fd139a3855b4bf051411dbd9c23,a5837b37c5e2772bc07c066f34a5313db5701890..d09697dab55e80063a737361c65138822bbdf828
                        pinctrl-single,function-mask = <0x3f>;
                };
  
+               omap2_scm_general: tisyscon@49002270 {
+                       compatible = "syscon";
+                       reg = <0x49002270 0x240>;
+               };
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0x230 0x4>;
+                       syscon = <&omap2_scm_general>;
+                       pbias_mmc_reg: pbias_mmc_omap2430 {
+                               regulator-name = "pbias_mmc_omap2430";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
                gpio1: gpio@4900c000 {
                        compatible = "ti,omap2-gpio";
                        reg = <0x4900c000 0x200>;
                        dmas = <&sdma 31>,
                               <&sdma 32>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp2: mcbsp@48076000 {
                        dmas = <&sdma 33>,
                               <&sdma 34>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp3: mcbsp@4808c000 {
                        dmas = <&sdma 17>,
                               <&sdma 18>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp4: mcbsp@4808e000 {
                        dmas = <&sdma 19>,
                               <&sdma 20>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp5: mcbsp@48096000 {
                        dmas = <&sdma 21>,
                               <&sdma 22>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mmc1: mmc@4809c000 {
                        ti,dual-volt;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
index 3d05eff67e25ea501410a3505788f513d20991f6,c42514a8e18b8e1682398771d404576b6d6ebbb8..5e5790f631eba4b5b1085ac64a1c4d5a0f6062c9
                        compatible = "arm,cortex-a8";
                        device_type = "cpu";
                        reg = <0x0>;
 +
 +                      clocks = <&dpll1_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
                };
        };
  
                        pinctrl-single,function-mask = <0xff1f>;
                };
  
+               omap3_scm_general: tisyscon@48002270 {
+                       compatible = "syscon";
+                       reg = <0x48002270 0x2f0>;
+               };
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0x2b0 0x4>;
+                       syscon = <&omap3_scm_general>;
+                       pbias_mmc_reg: pbias_mmc_omap2430 {
+                               regulator-name = "pbias_mmc_omap2430";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
                gpio1: gpio@48310000 {
                        compatible = "ti,omap3-gpio";
                        reg = <0x48310000 0x200>;
                        ti,dual-volt;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
                };
  
                mmu_isp: mmu@480bd400 {
 -                      compatible = "ti,omap3-mmu-isp";
 -                      ti,hwmods = "mmu_isp";
 +                      compatible = "ti,omap2-iommu";
                        reg = <0x480bd400 0x80>;
 -                      interrupts = <8>;
 +                      interrupts = <24>;
 +                      ti,hwmods = "mmu_isp";
 +                      ti,#tlb-entries = <8>;
 +              };
 +
 +              mmu_iva: mmu@5d000000 {
 +                      compatible = "ti,omap2-iommu";
 +                      reg = <0x5d000000 0x80>;
 +                      interrupts = <28>;
 +                      ti,hwmods = "mmu_iva";
 +                      status = "disabled";
                };
  
                wdt2: wdt@48314000 {
                        dmas = <&sdma 31>,
                               <&sdma 32>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp2: mcbsp@49022000 {
                        dmas = <&sdma 33>,
                               <&sdma 34>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp3: mcbsp@49024000 {
                        dmas = <&sdma 17>,
                               <&sdma 18>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp4: mcbsp@49026000 {
                        dmas = <&sdma 19>,
                               <&sdma 20>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp5: mcbsp@48096000 {
                        dmas = <&sdma 21>,
                               <&sdma 22>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                sham: sham@480c3000 {
                        ranges;
  
                        usbhsohci: ohci@48064400 {
 -                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              compatible = "ti,ohci-omap3";
                                reg = <0x48064400 0x400>;
                                interrupt-parent = <&intc>;
                                interrupts = <76>;
                        };
  
                        usbhsehci: ehci@48064800 {
 -                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              compatible = "ti,ehci-omap";
                                reg = <0x48064800 0x400>;
                                interrupt-parent = <&intc>;
                                interrupts = <77>;
                        num-eps = <16>;
                        ram-bits = <12>;
                };
 +
 +              dss: dss@48050000 {
 +                      compatible = "ti,omap3-dss";
 +                      reg = <0x48050000 0x200>;
 +                      status = "disabled";
 +                      ti,hwmods = "dss_core";
 +                      clocks = <&dss1_alwon_fck>;
 +                      clock-names = "fck";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +
 +                      dispc@48050400 {
 +                              compatible = "ti,omap3-dispc";
 +                              reg = <0x48050400 0x400>;
 +                              interrupts = <25>;
 +                              ti,hwmods = "dss_dispc";
 +                              clocks = <&dss1_alwon_fck>;
 +                              clock-names = "fck";
 +                      };
 +
 +                      dsi: encoder@4804fc00 {
 +                              compatible = "ti,omap3-dsi";
 +                              reg = <0x4804fc00 0x200>,
 +                                    <0x4804fe00 0x40>,
 +                                    <0x4804ff00 0x20>;
 +                              reg-names = "proto", "phy", "pll";
 +                              interrupts = <25>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_dsi1";
 +                              clocks = <&dss1_alwon_fck>, <&dss2_alwon_fck>;
 +                              clock-names = "fck", "sys_clk";
 +                      };
 +
 +                      rfbi: encoder@48050800 {
 +                              compatible = "ti,omap3-rfbi";
 +                              reg = <0x48050800 0x100>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_rfbi";
 +                              clocks = <&dss1_alwon_fck>, <&dss_ick>;
 +                              clock-names = "fck", "ick";
 +                      };
 +
 +                      venc: encoder@48050c00 {
 +                              compatible = "ti,omap3-venc";
 +                              reg = <0x48050c00 0x100>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_venc";
 +                              clocks = <&dss_tv_fck>;
 +                              clock-names = "fck";
 +                      };
 +              };
        };
  };
  
index 2b4c1cbbce3351e1cb6b9711307bc684242c7718,070e4f45092bc19c196adc704d1bf4684736216e..27fcac874742894879bb978b8157f213a1c49eb2
                        device_type = "cpu";
                        next-level-cache = <&L2>;
                        reg = <0x0>;
 +
 +                      clocks = <&dpll_mpu_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
                };
                cpu@1 {
                        compatible = "arm,cortex-a9";
                        pinctrl-single,function-mask = <0x7fff>;
                };
  
+               omap4_padconf_global: tisyscon@4a1005a0 {
+                       compatible = "syscon";
+                       reg = <0x4a1005a0 0x170>;
+               };
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0x60 0x4>;
+                       syscon = <&omap4_padconf_global>;
+                       pbias_mmc_reg: pbias_mmc_omap4 {
+                               regulator-name = "pbias_mmc_omap4";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
                sdma: dma-controller@4a056000 {
                        compatible = "ti,omap4430-sdma";
                        reg = <0x4a056000 0x1000>;
                        gpmc,num-waitpins = <4>;
                        ti,hwmods = "gpmc";
                        ti,no-idle-on-init;
 +                      clocks = <&l3_div_ck>;
 +                      clock-names = "fck";
                };
  
                uart1: serial@4806a000 {
                        compatible = "ti,omap4-hwspinlock";
                        reg = <0x4a0f6000 0x1000>;
                        ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
                };
  
                i2c1: i2c@48070000 {
                        ti,needs-special-reset;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
                        dma-names = "tx", "rx";
                };
  
 +              mmu_dsp: mmu@4a066000 {
 +                      compatible = "ti,omap4-iommu";
 +                      reg = <0x4a066000 0x100>;
 +                      interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
 +                      ti,hwmods = "mmu_dsp";
 +              };
 +
 +              mmu_ipu: mmu@55082000 {
 +                      compatible = "ti,omap4-iommu";
 +                      reg = <0x55082000 0x100>;
 +                      interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 +                      ti,hwmods = "mmu_ipu";
 +                      ti,iommu-bus-err-back;
 +              };
 +
                wdt2: wdt@4a314000 {
                        compatible = "ti,omap4-wdt", "ti,omap3-wdt";
                        reg = <0x4a314000 0x80>;
                        dmas = <&sdma 65>,
                               <&sdma 66>;
                        dma-names = "up_link", "dn_link";
 +                      status = "disabled";
                };
  
                dmic: dmic@4012e000 {
                        ti,hwmods = "dmic";
                        dmas = <&sdma 67>;
                        dma-names = "up_link";
 +                      status = "disabled";
                };
  
                mcbsp1: mcbsp@40122000 {
                        dmas = <&sdma 33>,
                               <&sdma 34>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp2: mcbsp@40124000 {
                        dmas = <&sdma 17>,
                               <&sdma 18>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp3: mcbsp@40126000 {
                        dmas = <&sdma 19>,
                               <&sdma 20>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp4: mcbsp@48096000 {
                        dmas = <&sdma 31>,
                               <&sdma 32>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                keypad: keypad@4a31c000 {
                        ti,hwmods = "kbd";
                };
  
 +              dmm@4e000000 {
 +                      compatible = "ti,omap4-dmm";
 +                      reg = <0x4e000000 0x800>;
 +                      interrupts = <0 113 0x4>;
 +                      ti,hwmods = "dmm";
 +              };
 +
                emif1: emif@4c000000 {
                        compatible = "ti,emif-4d";
                        reg = <0x4c000000 0x100>;
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
 +                      clocks = <&init_60m_fclk>,
 +                               <&xclk60mhsp1_ck>,
 +                               <&xclk60mhsp2_ck>;
 +                      clock-names = "refclk_60m_int",
 +                                    "refclk_60m_ext_p1",
 +                                    "refclk_60m_ext_p2";
  
                        usbhsohci: ohci@4a064800 {
 -                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        };
  
                        usbhsehci: ehci@4a064c00 {
 -                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
                        dmas = <&sdma 117>, <&sdma 116>;
                        dma-names = "tx", "rx";
                };
 +
 +              abb_mpu: regulator-abb-mpu {
 +                      compatible = "ti,abb-v2";
 +                      regulator-name = "abb_mpu";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      ti,tranxdone-status-mask = <0x80>;
 +                      clocks = <&sys_clkin_ck>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      status = "disabled";
 +              };
 +
 +              abb_iva: regulator-abb-iva {
 +                      compatible = "ti,abb-v2";
 +                      regulator-name = "abb_iva";
 +                      #address-cells = <0>;
 +                      #size-cells = <0>;
 +                      ti,tranxdone-status-mask = <0x80000000>;
 +                      clocks = <&sys_clkin_ck>;
 +                      ti,settling-time = <50>;
 +                      ti,clock-cycles = <16>;
 +
 +                      status = "disabled";
 +              };
 +
 +              dss: dss@58000000 {
 +                      compatible = "ti,omap4-dss";
 +                      reg = <0x58000000 0x80>;
 +                      status = "disabled";
 +                      ti,hwmods = "dss_core";
 +                      clocks = <&dss_dss_clk>;
 +                      clock-names = "fck";
 +                      #address-cells = <1>;
 +                      #size-cells = <1>;
 +                      ranges;
 +
 +                      dispc@58001000 {
 +                              compatible = "ti,omap4-dispc";
 +                              reg = <0x58001000 0x1000>;
 +                              interrupts = <GIC_SPI 25 IRQ_TYPE_LEVEL_HIGH>;
 +                              ti,hwmods = "dss_dispc";
 +                              clocks = <&dss_dss_clk>;
 +                              clock-names = "fck";
 +                      };
 +
 +                      rfbi: encoder@58002000  {
 +                              compatible = "ti,omap4-rfbi";
 +                              reg = <0x58002000 0x1000>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_rfbi";
 +                              clocks = <&dss_dss_clk>, <&dss_fck>;
 +                              clock-names = "fck", "ick";
 +                      };
 +
 +                      venc: encoder@58003000 {
 +                              compatible = "ti,omap4-venc";
 +                              reg = <0x58003000 0x1000>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_venc";
 +                              clocks = <&dss_tv_clk>;
 +                              clock-names = "fck";
 +                      };
 +
 +                      dsi1: encoder@58004000 {
 +                              compatible = "ti,omap4-dsi";
 +                              reg = <0x58004000 0x200>,
 +                                    <0x58004200 0x40>,
 +                                    <0x58004300 0x20>;
 +                              reg-names = "proto", "phy", "pll";
 +                              interrupts = <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_dsi1";
 +                              clocks = <&dss_dss_clk>, <&dss_sys_clk>;
 +                              clock-names = "fck", "sys_clk";
 +                      };
 +
 +                      dsi2: encoder@58005000 {
 +                              compatible = "ti,omap4-dsi";
 +                              reg = <0x58005000 0x200>,
 +                                    <0x58005200 0x40>,
 +                                    <0x58005300 0x20>;
 +                              reg-names = "proto", "phy", "pll";
 +                              interrupts = <GIC_SPI 84 IRQ_TYPE_LEVEL_HIGH>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_dsi2";
 +                              clocks = <&dss_dss_clk>, <&dss_sys_clk>;
 +                              clock-names = "fck", "sys_clk";
 +                      };
 +
 +                      hdmi: encoder@58006000 {
 +                              compatible = "ti,omap4-hdmi";
 +                              reg = <0x58006000 0x200>,
 +                                    <0x58006200 0x100>,
 +                                    <0x58006300 0x100>,
 +                                    <0x58006400 0x1000>;
 +                              reg-names = "wp", "pll", "phy", "core";
 +                              interrupts = <GIC_SPI 101 IRQ_TYPE_LEVEL_HIGH>;
 +                              status = "disabled";
 +                              ti,hwmods = "dss_hdmi";
 +                              clocks = <&dss_48mhz_clk>, <&dss_sys_clk>;
 +                              clock-names = "fck", "sys_clk";
 +                      };
 +              };
        };
  };
  
index 19155bb8483502dc4505c2d08e55dea8228b007b,1f328ad9476fd37c205d39a968a0ee3bed2bc829..6f3de22fb2660f20a61f2ec4438be6708ab40a6d
                                1000000 1060000
                                1500000 1250000
                        >;
 +
 +                      clocks = <&dpll_mpu_ck>;
 +                      clock-names = "cpu";
 +
 +                      clock-latency = <300000>; /* From omap-cpufreq driver */
 +
                        /* cooling options */
                        cooling-min-level = <0>;
                        cooling-max-level = <2>;
                        pinctrl-single,function-mask = <0x7fff>;
                };
  
+               omap5_padconf_global: tisyscon@4a002da0 {
+                       compatible = "syscon";
+                       reg = <0x4A002da0 0xec>;
+               };
+               pbias_regulator: pbias_regulator {
+                       compatible = "ti,pbias-omap";
+                       reg = <0x60 0x4>;
+                       syscon = <&omap5_padconf_global>;
+                       pbias_mmc_reg: pbias_mmc_omap5 {
+                               regulator-name = "pbias_mmc_omap5";
+                               regulator-min-microvolt = <1800000>;
+                               regulator-max-microvolt = <3000000>;
+                       };
+               };
                sdma: dma-controller@4a056000 {
                        compatible = "ti,omap4430-sdma";
                        reg = <0x4a056000 0x1000>;
                        gpmc,num-cs = <8>;
                        gpmc,num-waitpins = <4>;
                        ti,hwmods = "gpmc";
 +                      clocks = <&l3_iclk_div>;
 +                      clock-names = "fck";
                };
  
                i2c1: i2c@48070000 {
                        compatible = "ti,omap4-hwspinlock";
                        reg = <0x4a0f6000 0x1000>;
                        ti,hwmods = "spinlock";
 +                      #hwlock-cells = <1>;
                };
  
                mcspi1: spi@48098000 {
                        ti,needs-special-reset;
                        dmas = <&sdma 61>, <&sdma 62>;
                        dma-names = "tx", "rx";
+                       pbias-supply = <&pbias_mmc_reg>;
                };
  
                mmc2: mmc@480b4000 {
                        dma-names = "tx", "rx";
                };
  
 +              mmu_dsp: mmu@4a066000 {
 +                      compatible = "ti,omap4-iommu";
 +                      reg = <0x4a066000 0x100>;
 +                      interrupts = <GIC_SPI 28 IRQ_TYPE_LEVEL_HIGH>;
 +                      ti,hwmods = "mmu_dsp";
 +              };
 +
 +              mmu_ipu: mmu@55082000 {
 +                      compatible = "ti,omap4-iommu";
 +                      reg = <0x55082000 0x100>;
 +                      interrupts = <GIC_SPI 100 IRQ_TYPE_LEVEL_HIGH>;
 +                      ti,hwmods = "mmu_ipu";
 +                      ti,iommu-bus-err-back;
 +              };
 +
                keypad: keypad@4ae1c000 {
                        compatible = "ti,omap4-keypad";
                        reg = <0x4ae1c000 0x400>;
                        dmas = <&sdma 65>,
                               <&sdma 66>;
                        dma-names = "up_link", "dn_link";
 +                      status = "disabled";
                };
  
                dmic: dmic@4012e000 {
                        ti,hwmods = "dmic";
                        dmas = <&sdma 67>;
                        dma-names = "up_link";
 +                      status = "disabled";
                };
  
                mcbsp1: mcbsp@40122000 {
                        dmas = <&sdma 33>,
                               <&sdma 34>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp2: mcbsp@40124000 {
                        dmas = <&sdma 17>,
                               <&sdma 18>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                mcbsp3: mcbsp@40126000 {
                        dmas = <&sdma 19>,
                               <&sdma 20>;
                        dma-names = "tx", "rx";
 +                      status = "disabled";
                };
  
                timer1: timer@4ae18000 {
                        ti,hwmods = "wd_timer2";
                };
  
 +              dmm@4e000000 {
 +                      compatible = "ti,omap5-dmm";
 +                      reg = <0x4e000000 0x800>;
 +                      interrupts = <0 113 0x4>;
 +                      ti,hwmods = "dmm";
 +              };
 +
                emif1: emif@4c000000 {
                        compatible      = "ti,emif-4d5";
                        ti,hwmods       = "emif1";
                                compatible = "snps,dwc3";
                                reg = <0x4a030000 0x10000>;
                                interrupts = <GIC_SPI 92 IRQ_TYPE_LEVEL_HIGH>;
 -                              usb-phy = <&usb2_phy>, <&usb3_phy>;
 +                              phys = <&usb2_phy>, <&usb3_phy>;
 +                              phy-names = "usb2-phy", "usb3-phy";
                                dr_mode = "peripheral";
                                tx-fifo-resize;
                        };
                                compatible = "ti,omap-usb2";
                                reg = <0x4a084000 0x7c>;
                                ctrl-module = <&omap_control_usb2phy>;
 +                              #phy-cells = <0>;
                        };
  
                        usb3_phy: usb3phy@4a084400 {
                                      <0x4a084c00 0x40>;
                                reg-names = "phy_rx", "phy_tx", "pll_ctrl";
                                ctrl-module = <&omap_control_usb3phy>;
 +                              #phy-cells = <0>;
                        };
                };
  
                        #address-cells = <1>;
                        #size-cells = <1>;
                        ranges;
 +                      clocks = <&l3init_60m_fclk>,
 +                               <&xclk60mhsp1_ck>,
 +                               <&xclk60mhsp2_ck>;
 +                      clock-names = "refclk_60m_int",
 +                                    "refclk_60m_ext_p1",
 +                                    "refclk_60m_ext_p2";
  
                        usbhsohci: ohci@4a064800 {
 -                              compatible = "ti,ohci-omap3", "usb-ohci";
 +                              compatible = "ti,ohci-omap3";
                                reg = <0x4a064800 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>;
                        };
  
                        usbhsehci: ehci@4a064c00 {
 -                              compatible = "ti,ehci-omap", "usb-ehci";
 +                              compatible = "ti,ehci-omap";
                                reg = <0x4a064c00 0x400>;
                                interrupt-parent = <&gic>;
                                interrupts = <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>;
index 364ba38e40f3138317ef10407588b356732ab729,e4fec1ceb3f1f2a5f9e15a6459df2b006e1d0731..a9667957b7578bac7b218ea9163e657ecb385f88
@@@ -28,7 -28,6 +28,7 @@@ CONFIG_ARCH_OMAP3=
  CONFIG_ARCH_OMAP4=y
  CONFIG_SOC_OMAP5=y
  CONFIG_SOC_AM33XX=y
 +CONFIG_SOC_AM43XX=y
  CONFIG_SOC_DRA7XX=y
  CONFIG_ARM_THUMBEE=y
  CONFIG_ARM_ERRATA_411920=y
@@@ -170,6 -169,7 +170,7 @@@ CONFIG_DRA752_THERMAL=
  CONFIG_WATCHDOG=y
  CONFIG_OMAP_WATCHDOG=y
  CONFIG_TWL4030_WATCHDOG=y
+ CONFIG_MFD_SYSCON=y
  CONFIG_MFD_PALMAS=y
  CONFIG_MFD_TPS65217=y
  CONFIG_MFD_TPS65910=y
@@@ -181,6 -181,7 +182,7 @@@ CONFIG_REGULATOR_TPS6507X=
  CONFIG_REGULATOR_TPS65217=y
  CONFIG_REGULATOR_TPS65910=y
  CONFIG_REGULATOR_TWL4030=y
+ CONFIG_REGULATOR_PBIAS=y
  CONFIG_FB=y
  CONFIG_FIRMWARE_EDID=y
  CONFIG_FB_MODE_HELPERS=y
diff --combined drivers/mmc/core/host.c
index 114f6bdfbef3c5dac060d3ccb046fb9fbb1f872d,453573d5ab08de38b0599d5b88a41a86bcff4729..fdea825dbb240238b66531214b7761bda4b698eb
@@@ -337,7 -337,7 +337,7 @@@ int mmc_of_parse(struct mmc_host *host
                break;
        default:
                dev_err(host->parent,
 -                      "Invalid \"bus-width\" value %ud!\n", bus_width);
 +                      "Invalid \"bus-width\" value %u!\n", bus_width);
                return -EINVAL;
        }
  
                host->caps |= MMC_CAP_SD_HIGHSPEED;
        if (of_find_property(np, "cap-mmc-highspeed", &len))
                host->caps |= MMC_CAP_MMC_HIGHSPEED;
+       if (of_find_property(np, "sd-uhs-sdr12", &len))
+               host->caps |= MMC_CAP_UHS_SDR12;
+       if (of_find_property(np, "sd-uhs-sdr25", &len))
+               host->caps |= MMC_CAP_UHS_SDR25;
+       if (of_find_property(np, "sd-uhs-sdr50", &len))
+               host->caps |= MMC_CAP_UHS_SDR50;
+       if (of_find_property(np, "sd-uhs-sdr104", &len))
+               host->caps |= MMC_CAP_UHS_SDR104;
+       if (of_find_property(np, "sd-uhs-ddr50", &len))
+               host->caps |= MMC_CAP_UHS_DDR50;
        if (of_find_property(np, "cap-power-off-card", &len))
                host->caps |= MMC_CAP_POWER_OFF_CARD;
        if (of_find_property(np, "cap-sdio-irq", &len))
                host->pm_caps |= MMC_PM_KEEP_POWER;
        if (of_find_property(np, "enable-sdio-wakeup", &len))
                host->pm_caps |= MMC_PM_WAKE_SDIO_IRQ;
+       if (of_find_property(np, "mmc-ddr-1_8v", &len))
+               host->caps |= MMC_CAP_1_8V_DDR;
+       if (of_find_property(np, "mmc-ddr-1_2v", &len))
+               host->caps |= MMC_CAP_1_2V_DDR;
+       if (of_find_property(np, "mmc-hs200-1_8v", &len))
+               host->caps2 |= MMC_CAP2_HS200_1_8V_SDR;
+       if (of_find_property(np, "mmc-hs200-1_2v", &len))
+               host->caps2 |= MMC_CAP2_HS200_1_2V_SDR;
  
        return 0;
  
index c204b7d1532c0f1c910b25a7435d3f12c8435732,0c56faa6730efc8ac55704a70e7fe373fd2c175d..cced599d5aebe22aef357fd427a6aa03d7edaa79
@@@ -1345,7 -1345,7 +1345,7 @@@ static void dw_mci_tasklet_func(unsigne
  
                        if (!err) {
                                if (!data->stop || mrq->sbc) {
-                                       if (mrq->sbc)
+                                       if (mrq->sbc && data->stop)
                                                data->stop->error = 0;
                                        dw_mci_request_end(host, mrq);
                                        goto unlock;
@@@ -2607,7 -2607,7 +2607,7 @@@ int dw_mci_probe(struct dw_mci *host
  
        tasklet_init(&host->tasklet, dw_mci_tasklet_func, (unsigned long)host);
        host->card_workqueue = alloc_workqueue("dw-mci-card",
 -                      WQ_MEM_RECLAIM | WQ_NON_REENTRANT, 1);
 +                      WQ_MEM_RECLAIM, 1);
        if (!host->card_workqueue) {
                ret = -ENOMEM;
                goto err_dmaunmap;
diff --combined drivers/mmc/host/mmci.h
index 84c0e59b792acce9e0508fe038e05d204dd2b2d8,b008ace3e8ee6b7ac37302c018174671907e0f63..58b1b8896bf2d188f8c0b5f0f53856260a930e25
  #define MCI_CPSM_INTERRUPT    (1 << 8)
  #define MCI_CPSM_PENDING      (1 << 9)
  #define MCI_CPSM_ENABLE               (1 << 10)
 -#define MCI_SDIO_SUSP         (1 << 11)
 -#define MCI_ENCMD_COMPL               (1 << 12)
 -#define MCI_NIEN              (1 << 13)
 -#define MCI_CE_ATACMD         (1 << 14)
 +/* Argument flag extenstions in the ST Micro versions */
 +#define MCI_ST_SDIO_SUSP      (1 << 11)
 +#define MCI_ST_ENCMD_COMPL    (1 << 12)
 +#define MCI_ST_NIEN           (1 << 13)
 +#define MCI_ST_CE_ATACMD      (1 << 14)
  
  #define MMCIRESPCMD           0x010
  #define MMCIRESPONSE0         0x014
  /* Extended status bits for the ST Micro variants */
  #define MCI_ST_SDIOITMASK     (1 << 22)
  #define MCI_ST_CEATAENDMASK   (1 << 23)
+ #define MCI_ST_BUSYEND                (1 << 24)
  
  #define MMCIMASK1             0x040
  #define MMCIFIFOCNT           0x048
@@@ -187,6 -187,7 +188,7 @@@ struct mmci_host 
        u32                     pwr_reg;
        u32                     clk_reg;
        u32                     datactrl_reg;
+       u32                     busy_status;
        bool                    vqmmc_enabled;
        struct mmci_platform_data *plat;
        struct variant_data     *variant;
index 1cd8584a7b887ffd9fd8fd0089c8148dba595064,58f08d1d24e80ab3a4acc104f76d598b16cd4565..903eb37f047a916d510685b7e203a4ecdb680cbd
@@@ -139,14 -139,6 +139,14 @@@ config REGULATOR_AS372
          AS3722 PMIC. This will enable support for all the software
          controllable DCDC/LDO regulators.
  
 +config REGULATOR_BCM590XX
 +      tristate "Broadcom BCM590xx PMU Regulators"
 +      depends on MFD_BCM590XX
 +      help
 +        This driver provides support for the voltage regulators on the
 +        BCM590xx PMUs. This will enable support for the software
 +        controllable LDO/Switching regulators.
 +
  config REGULATOR_DA903X
        tristate "Dialog Semiconductor DA9030/DA9034 regulators"
        depends on PMIC_DA903X
@@@ -392,6 -384,15 +392,15 @@@ config REGULATOR_PALMA
          on the muxing. This is handled automatically in the driver by
          reading the mux info from OTP.
  
+ config REGULATOR_PBIAS
+       tristate "PBIAS OMAP regulator driver"
+       depends on (ARCH_OMAP || COMPILE_TEST) && MFD_SYSCON
+       help
+        Say y here to support pbias regulator for mmc1:SD card i/o
+        on OMAP SoCs.
+        This driver provides support for OMAP pbias modelled
+        regulators.
  config REGULATOR_PCAP
        tristate "Motorola PCAP2 regulator driver"
        depends on EZX_PCAP
@@@ -407,12 -408,12 +416,12 @@@ config REGULATOR_PCF5063
         on PCF50633
  
  config REGULATOR_PFUZE100
 -      tristate "Freescale PFUZE100 regulator driver"
 +      tristate "Freescale PFUZE100/PFUZE200 regulator driver"
        depends on I2C
        select REGMAP_I2C
        help
 -        Say y here to support the regulators found on the Freescale PFUZE100
 -        PMIC.
 +        Say y here to support the regulators found on the Freescale
 +        PFUZE100/PFUZE200 PMIC.
  
  config REGULATOR_RC5T583
        tristate "RICOH RC5T583 Power regulators"
          through regulator interface. The device supports multiple DCDC/LDO
          outputs which can be controlled by i2c communication.
  
 +config REGULATOR_S2MPA01
 +      tristate "Samsung S2MPA01 voltage regulator"
 +      depends on MFD_SEC_CORE
 +      help
 +       This driver controls Samsung S2MPA01 voltage output regulator
 +       via I2C bus. S2MPA01 has 10 Bucks and 26 LDO outputs.
 +
  config REGULATOR_S2MPS11
 -      tristate "Samsung S2MPS11 voltage regulator"
 +      tristate "Samsung S2MPS11/S2MPS14 voltage regulator"
        depends on MFD_SEC_CORE
        help
 -       This driver supports a Samsung S2MPS11 voltage output regulator
 -       via I2C bus. S2MPS11 is comprised of high efficient Buck converters
 -       including Dual-Phase Buck converter, Buck-Boost converter, various LDOs.
 +       This driver supports a Samsung S2MPS11/S2MPS14 voltage output
 +       regulator via I2C bus. The chip is comprised of high efficient Buck
 +       converters including Dual-Phase Buck converter, Buck-Boost converter,
 +       various LDOs.
  
  config REGULATOR_S5M8767
        tristate "Samsung S5M8767A voltage regulator"
         via I2C bus. S5M8767A have 9 Bucks and 28 LDOs output and
         supports DVS mode with 8bits of output voltage control.
  
 +config REGULATOR_ST_PWM
 +      tristate "STMicroelectronics PWM voltage regulator"
 +      depends on ARCH_STI
 +      help
 +       This driver supports ST's PWM controlled voltage regulators.
 +
  config REGULATOR_TI_ABB
        tristate "TI Adaptive Body Bias on-chip LDO"
        depends on ARCH_OMAP
@@@ -535,15 -522,6 +544,15 @@@ config REGULATOR_TPS6521
          voltage regulators. It supports software based voltage control
          for different voltage domains
  
 +config REGULATOR_TPS65218
 +      tristate "TI TPS65218 Power regulators"
 +      depends on MFD_TPS65218 && OF
 +      help
 +        This driver supports TPS65218 voltage regulator chips. TPS65218
 +        provides six step-down converters and one general-purpose LDO
 +        voltage regulators. It supports software based voltage control
 +        for different voltage domains
 +
  config REGULATOR_TPS6524X
        tristate "TI TPS6524X Power regulators"
        depends on SPI
index f0fe0c50b59c23ffc36680536f17bf0486e4226d,001712ebbf25e1fe1b5be254b36ff388464e8430..12ef277a48b47c55bdceee69f8f637bc929522f8
@@@ -20,7 -20,6 +20,7 @@@ obj-$(CONFIG_REGULATOR_ANATOP) += anato
  obj-$(CONFIG_REGULATOR_ARIZONA) += arizona-micsupp.o arizona-ldo1.o
  obj-$(CONFIG_REGULATOR_AS3711) += as3711-regulator.o
  obj-$(CONFIG_REGULATOR_AS3722) += as3722-regulator.o
 +obj-$(CONFIG_REGULATOR_BCM590XX) += bcm590xx-regulator.o
  obj-$(CONFIG_REGULATOR_DA903X)        += da903x.o
  obj-$(CONFIG_REGULATOR_DA9052)        += da9052-regulator.o
  obj-$(CONFIG_REGULATOR_DA9055)        += da9055-regulator.o
@@@ -55,13 -54,12 +55,14 @@@ obj-$(CONFIG_REGULATOR_MC13XXX_CORE) +
  obj-$(CONFIG_REGULATOR_PALMAS) += palmas-regulator.o
  obj-$(CONFIG_REGULATOR_PFUZE100) += pfuze100-regulator.o
  obj-$(CONFIG_REGULATOR_TPS51632) += tps51632-regulator.o
+ obj-$(CONFIG_REGULATOR_PBIAS) += pbias-regulator.o
  obj-$(CONFIG_REGULATOR_PCAP) += pcap-regulator.o
  obj-$(CONFIG_REGULATOR_PCF50633) += pcf50633-regulator.o
  obj-$(CONFIG_REGULATOR_RC5T583)  += rc5t583-regulator.o
 +obj-$(CONFIG_REGULATOR_S2MPA01) += s2mpa01.o
  obj-$(CONFIG_REGULATOR_S2MPS11) += s2mps11.o
  obj-$(CONFIG_REGULATOR_S5M8767) += s5m8767.o
 +obj-$(CONFIG_REGULATOR_ST_PWM) += st-pwm.o
  obj-$(CONFIG_REGULATOR_STW481X_VMMC) += stw481x-vmmc.o
  obj-$(CONFIG_REGULATOR_TI_ABB) += ti-abb-regulator.o
  obj-$(CONFIG_REGULATOR_TPS6105X) += tps6105x-regulator.o
@@@ -70,7 -68,6 +71,7 @@@ obj-$(CONFIG_REGULATOR_TPS65023) += tps
  obj-$(CONFIG_REGULATOR_TPS6507X) += tps6507x-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65090) += tps65090-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65217) += tps65217-regulator.o
 +obj-$(CONFIG_REGULATOR_TPS65218) += tps65218-regulator.o
  obj-$(CONFIG_REGULATOR_TPS6524X) += tps6524x-regulator.o
  obj-$(CONFIG_REGULATOR_TPS6586X) += tps6586x-regulator.o
  obj-$(CONFIG_REGULATOR_TPS65910) += tps65910-regulator.o