Merge tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

Pull ARM SoC non-critical fixes from Olof Johansson:
 "Here's a small collection of fixes accrued during the last release
  that weren't considered severe enough to merge during the -rc series.

  A few of these are around resurrecting TI81xx support that's been
  broken for quite a while, the rest are smaller fixes -- most for PXA
  but a few across the board.

  There are also some updates to MAINTAINERS here, in particular for
  Broadcom platforms"

* tag 'fixes-non-critical-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (23 commits)
  MAINTAINERS: fix git repositories for Broadcom SoCs
  ARM: pxa: fix broken isa interrupts for zeus and viper
  ARM: DRA7: hwmod: Fix boot crash with DEBUG_LL enabled on UART3
  ARM: OMAP: DRA7: hwmod: Make gpmc software supervised as the smart idle is broken
  ARM: AM43xx: hwmod: set DSS submodule parent hwmods
  ARM: OMAP2+: hwmod: print error if wait_target_ready() failed
  MAINTAINERS: add maintainer for OMAP hwmod data
  ARM: OMAP2+: Disable omap3 PM init for ti81xx
  ARM: OMAP2+: Fix reboot for 81xx
  ARM: OMAP2+: Fix dm814 and dm816 for clocks and timer init
  ARM: OMAP2+: Fix ti81xx class type
  ARM: OMAP2+: Fix ti81xx devtype
  ARM: OMAP2+: Fix error handling for omap2_clk_enable_init_clocks
  MAINTAINERS: add a git entry for BMIPS-based BCM7xxx SoCs
  MAINTAINERS: add a git entry for BCM7xxx ARM-based SoCs
  MAINTAINERS: update Broadcom Cygnus SoC git tree
  MAINTAINERS: move BCM63xx ARM-based SoCs git tree
  hx4700: regulator: declare full constraints
  ARM: pxa: add regulator_has_full_constraints to spitz board file
  ARM: pxa: add regulator_has_full_constraints to poodle board file
  ...

diff --combined MAINTAINERS
index e75c2184081567245e646c0cc55ff469f3d805bb,cbff8262926ba104c54db84cb2c6a20439e4eefc..b27178c8744437608b0229cbfbf8d7f948368ae6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -34,7 -34,7 +34,7 @@@ trivial patch so apply some common sens
        generalized kernel feature ready for next time.
  
        PLEASE check your patch with the automated style checker
 -      (scripts/checkpatch.pl) to catch trival style violations.
 +      (scripts/checkpatch.pl) to catch trivial style violations.
        See Documentation/CodingStyle for guidance here.
  
        PLEASE CC: the maintainers and mailing lists that are generated
@@@ -270,12 -270,12 +270,12 @@@ F:      drivers/acpi
  F:    drivers/pnp/pnpacpi/
  F:    include/linux/acpi.h
  F:    include/acpi/
 -F:    Documentation/acpi
 +F:    Documentation/acpi/
  F:    Documentation/ABI/testing/sysfs-bus-acpi
  F:    drivers/pci/*acpi*
  F:    drivers/pci/*/*acpi*
  F:    drivers/pci/*/*/*acpi*
 -F:    tools/power/acpi
 +F:    tools/power/acpi/
  
  ACPI COMPONENT ARCHITECTURE (ACPICA)
  M:    Robert Moore <robert.moore@intel.com>
@@@ -563,12 -563,6 +563,12 @@@ S:       Odd Fixe
  L:    linux-alpha@vger.kernel.org
  F:    arch/alpha/
  
 +ALTERA MAILBOX DRIVER
 +M:    Ley Foon Tan <lftan@altera.com>
 +L:    nios2-dev@lists.rocketboards.org (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/mailbox/mailbox-altera.c
 +
  ALTERA TRIPLE SPEED ETHERNET DRIVER
  M:    Vince Bridgers <vbridger@opensource.altera.com>
  L:    netdev@vger.kernel.org
@@@ -630,8 -624,6 +630,8 @@@ L:      dri-devel@lists.freedesktop.or
  T:      git git://people.freedesktop.org/~gabbayo/linux.git
  S:      Supported
  F:      drivers/gpu/drm/amd/amdkfd/
 +F:    drivers/gpu/drm/amd/include/cik_structs.h
 +F:    drivers/gpu/drm/amd/include/kgd_kfd_interface.h
  F:      drivers/gpu/drm/radeon/radeon_kfd.c
  F:      drivers/gpu/drm/radeon/radeon_kfd.h
  F:      include/uapi/linux/kfd_ioctl.h
@@@ -667,13 -659,6 +667,13 @@@ L:       linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/ad9389b*
  
 +ANALOG DEVICES INC ADV7180 DRIVER
 +M:    Lars-Peter Clausen <lars@metafoo.de>
 +L:    linux-media@vger.kernel.org
 +W:    http://ez.analog.com/community/linux-device-drivers
 +S:    Supported
 +F:    drivers/media/i2c/adv7180.c
 +
  ANALOG DEVICES INC ADV7511 DRIVER
  M:    Hans Verkuil <hans.verkuil@cisco.com>
  L:    linux-media@vger.kernel.org
@@@ -711,7 -696,7 +711,7 @@@ L: alsa-devel@alsa-project.org (moderat
  W:    http://blackfin.uclinux.org/
  S:    Supported
  F:    sound/soc/blackfin/*
 - 
 +
  ANALOG DEVICES INC IIO DRIVERS
  M:    Lars-Peter Clausen <lars@metafoo.de>
  M:    Michael Hennerich <Michael.Hennerich@analog.com>
@@@ -723,16 -708,6 +723,16 @@@ X:       drivers/iio/*/adjd
  F:    drivers/staging/iio/*/ad*
  F:    staging/iio/trigger/iio-trig-bfin-timer.c
  
 +ANDROID DRIVERS
 +M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 +M:    Arve Hjønnevåg <arve@android.com>
 +M:    Riley Andrews <riandrews@android.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/gregkh/staging.git
 +L:    devel@driverdev.osuosl.org
 +S:    Supported
 +F:    drivers/android/
 +F:    drivers/staging/android/
 +
  AOA (Apple Onboard Audio) ALSA DRIVER
  M:    Johannes Berg <johannes@sipsolutions.net>
  L:    linuxppc-dev@lists.ozlabs.org
@@@ -779,6 -754,13 +779,6 @@@ L:        linux-media@vger.kernel.or
  S:    Maintained
  F:    drivers/media/i2c/aptina-pll.*
  
 -ARASAN COMPACT FLASH PATA CONTROLLER
 -M:    Viresh Kumar <viresh.linux@gmail.com>
 -L:    linux-ide@vger.kernel.org
 -S:    Maintained
 -F:    include/linux/pata_arasan_cf_data.h
 -F:    drivers/ata/pata_arasan_cf.c
 -
  ARC FRAMEBUFFER DRIVER
  M:    Jaya Kumar <jayalk@intworks.biz>
  S:    Maintained
@@@ -976,7 -958,7 +976,7 @@@ S: Maintaine
  F:    arch/arm/mach-prima2/
  F:    drivers/clk/sirf/
  F:    drivers/clocksource/timer-prima2.c
 -F:    drivers/clocksource/timer-marco.c
 +F:    drivers/clocksource/timer-atlas7.c
  N:    [^a-z]sirf
  
  ARM/EBSA110 MACHINE SUPPORT
@@@ -1175,7 -1157,6 +1175,7 @@@ M:      Sebastian Hesselbarth <sebastian.hes
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    arch/arm/mach-mvebu/
 +F:    drivers/rtc/armada38x-rtc
  
  ARM/Marvell Berlin SoC support
  M:    Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
@@@ -1602,14 -1583,12 +1602,14 @@@ N:   xilin
  F:    drivers/clocksource/cadence_ttc_timer.c
  F:    drivers/i2c/busses/i2c-cadence.c
  F:    drivers/mmc/host/sdhci-of-arasan.c
 +F:    drivers/edac/synopsys_edac.c
  
  ARM SMMU DRIVER
  M:    Will Deacon <will.deacon@arm.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  S:    Maintained
  F:    drivers/iommu/arm-smmu.c
 +F:    drivers/iommu/io-pgtable-arm.c
  
  ARM64 PORT (AARCH64 ARCHITECTURE)
  M:    Catalin Marinas <catalin.marinas@arm.com>
@@@ -1678,6 -1657,7 +1678,6 @@@ M:      Jiri Slaby <jirislaby@gmail.com
  M:    Nick Kossifidis <mickflemm@gmail.com>
  M:    "Luis R. Rodriguez" <mcgrof@do-not-panic.com>
  L:    linux-wireless@vger.kernel.org
 -L:    ath5k-devel@lists.ath5k.org
  W:    http://wireless.kernel.org/en/users/Drivers/ath5k
  S:    Maintained
  F:    drivers/net/wireless/ath/ath5k/
@@@ -2144,7 -2124,7 +2144,7 @@@ F:      arch/arm/boot/dts/bcm470
  BROADCOM BCM63XX ARM ARCHITECTURE
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org
- T:    git git://git.github.com/brcm/linux.git
+ T:    git git://github.com/broadcom/arm-bcm63xx.git
  S:    Maintained
  F:    arch/arm/mach-bcm/bcm63xx.c
  F:    arch/arm/include/debug/bcm63xx.S
@@@ -2161,6 -2141,7 +2161,7 @@@ M:      Brian Norris <computersforpeace@gmai
  M:    Gregory Fong <gregory.0xf0@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+ T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/arm/mach-bcm/*brcmstb*
  F:    arch/arm/boot/dts/bcm7*.dts*
@@@ -2170,6 -2151,7 +2171,7 @@@ BROADCOM BMIPS MIPS ARCHITECTUR
  M:    Kevin Cernekee <cernekee@gmail.com>
  M:    Florian Fainelli <f.fainelli@gmail.com>
  L:    linux-mips@linux-mips.org
+ T:    git git://github.com/broadcom/stblinux.git
  S:    Maintained
  F:    arch/mips/bmips/*
  F:    arch/mips/include/asm/mach-bmips/*
@@@ -2212,7 -2194,7 +2214,7 @@@ M:      Ray Jui <rjui@broadcom.com
  M:    Scott Branden <sbranden@broadcom.com>
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  L:    bcm-kernel-feedback-list@broadcom.com
- T:    git git://git.github.com/brcm/linux.git
+ T:    git git://github.com/broadcom/cygnus-linux.git
  S:    Maintained
  N:    iproc
  N:    cygnus
@@@ -2366,8 -2348,7 +2368,8 @@@ CAN NETWORK LAYE
  M:    Oliver Hartkopp <socketcan@hartkopp.net>
  L:    linux-can@vger.kernel.org
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    Documentation/networking/can.txt
  F:    net/can/
@@@ -2382,8 -2363,7 +2384,8 @@@ M:      Wolfgang Grandegger <wg@grandegger.c
  M:    Marc Kleine-Budde <mkl@pengutronix.de>
  L:    linux-can@vger.kernel.org
  W:    http://gitorious.org/linux-can
 -T:    git git://gitorious.org/linux-can/linux-can-next.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can.git
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can-next.git
  S:    Maintained
  F:    drivers/net/can/
  F:    include/linux/can/dev.h
@@@ -2401,12 -2381,6 +2403,12 @@@ F:    security/capability.
  F:    security/commoncap.c
  F:    kernel/capability.c
  
 +CAPELLA MICROSYSTEMS LIGHT SENSOR DRIVER
 +M:    Kevin Tsai <ktsai@capellamicro.com>
 +S:    Maintained
 +F:    drivers/iio/light/cm*
 +F:    Documentation/devicetree/bindings/i2c/trivial-devices.txt
 +
  CC2520 IEEE-802.15.4 RADIO DRIVER
  M:    Varka Bhadram <varkabhadram@gmail.com>
  L:    linux-wpan@vger.kernel.org
@@@ -2965,12 -2939,6 +2967,12 @@@ S:    Supporte
  F:    drivers/input/touchscreen/cyttsp*
  F:    include/linux/input/cyttsp.h
  
 +DALLAS/MAXIM DS1685-FAMILY REAL TIME CLOCK
 +M:    Joshua Kinard <kumba@gentoo.org>
 +S:    Maintained
 +F:    drivers/rtc/rtc-ds1685.c
 +F:    include/linux/rtc/ds1685.h
 +
  DAMA SLAVE for AX.25
  M:    Joerg Reuter <jreuter@yaina.de>
  W:    http://yaina.de/jreuter/
@@@ -3047,7 -3015,6 +3049,7 @@@ F:      drivers/platform/x86/dell-laptop.
  
  DELL LAPTOP SMM DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
 +S:    Maintained
  F:    drivers/char/i8k.c
  F:    include/uapi/linux/i8k.h
  
@@@ -3063,7 -3030,7 +3065,7 @@@ S:      Maintaine
  F:    drivers/platform/x86/dell-wmi.c
  
  DESIGNWARE USB2 DRD IP DRIVER
 -M:    Paul Zimmerman <paulz@synopsys.com>
 +M:    John Youn <johnyoun@synopsys.com>
  L:    linux-usb@vger.kernel.org
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git
  S:    Maintained
@@@ -3159,12 -3126,6 +3161,12 @@@ L:    linux-i2c@vger.kernel.or
  S:    Maintained
  F:    drivers/i2c/busses/i2c-diolan-u2c.c
  
 +DIRECT ACCESS (DAX)
 +M:    Matthew Wilcox <willy@linux.intel.com>
 +L:    linux-fsdevel@vger.kernel.org
 +S:    Supported
 +F:    fs/dax.c
 +
  DIRECTORY NOTIFICATION (DNOTIFY)
  M:    Eric Paris <eparis@parisplace.org>
  S:    Maintained
@@@ -3224,7 -3185,7 +3226,7 @@@ L:      dmaengine@vger.kernel.or
  Q:    https://patchwork.kernel.org/project/linux-dmaengine/list/
  S:    Maintained
  F:    drivers/dma/
 -F:    include/linux/dma*
 +F:    include/linux/dmaengine.h
  F:    Documentation/dmaengine/
  T:    git git://git.infradead.org/users/vkoul/slave-dma.git
  
@@@ -3249,7 -3210,6 +3251,7 @@@ F:      Documentation
  X:    Documentation/ABI/
  X:    Documentation/devicetree/
  X:    Documentation/[a-z][a-z]_[A-Z][A-Z]/
 +T:    git git://git.lwn.net/linux-2.6.git docs-next
  
  DOUBLETALK DRIVER
  M:    "James R. Van Zandt" <jrv@vanzandt.mv.com>
@@@ -3509,14 -3469,6 +3511,14 @@@ M:    "Maciej W. Rozycki" <macro@linux-mip
  S:    Maintained
  F:    drivers/tty/serial/dz.*
  
 +E3X0 POWER BUTTON DRIVER
 +M:    Moritz Fischer <moritz.fischer@ettus.com>
 +L:    usrp-users@lists.ettus.com
 +W:    http://www.ettus.com
 +S:    Supported
 +F:    drivers/input/misc/e3x0-button.c
 +F:    Documentation/devicetree/bindings/input/e3x0-button.txt
 +
  E4000 MEDIA DRIVER
  M:    Antti Palosaari <crope@iki.fi>
  L:    linux-media@vger.kernel.org
@@@ -3558,8 -3510,6 +3560,8 @@@ M:      Borislav Petkov <bp@alien8.de
  M:    Mauro Carvalho Chehab <mchehab@osg.samsung.com>
  L:    linux-edac@vger.kernel.org
  W:    bluesmoke.sourceforge.net
 +T:    git://git.kernel.org/pub/scm/linux/kernel/git/bp/bp.git#for-next
 +T:    git://git.kernel.org/pub/linux/kernel/git/mchehab/linux-edac.git#linux_next
  S:    Supported
  F:    Documentation/edac.txt
  F:    drivers/edac/
@@@ -3924,12 -3874,6 +3926,12 @@@ S:    Supporte
  F:    Documentation/fault-injection/
  F:    lib/fault-inject.c
  
 +FBTFT Framebuffer drivers
 +M:    Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
 +M:    Noralf Trønnes <noralf@tronnes.org>
 +S:    Maintained
 +F:    drivers/staging/fbtft/
 +
  FCOE SUBSYSTEM (libfc, libfcoe, fcoe)
  M:    Robert Love <robert.w.love@intel.com>
  L:    fcoe-devel@open-fcoe.org
@@@ -4461,7 -4405,6 +4463,7 @@@ F:      include/linux/hwmon*.
  HARDWARE RANDOM NUMBER GENERATOR CORE
  M:    Matt Mackall <mpm@selenic.com>
  M:    Herbert Xu <herbert@gondor.apana.org.au>
 +L:    linux-crypto@vger.kernel.org
  S:    Odd fixes
  F:    Documentation/hw_random.txt
  F:    drivers/char/hw_random/
@@@ -4808,20 -4751,20 +4810,20 @@@ S:   Supporte
  F:    drivers/scsi/ipr.*
  
  IBM Power Virtual Ethernet Device Driver
 -M:    Santiago Leon <santil@linux.vnet.ibm.com>
 +M:    Thomas Falcon <tlfalcon@linux.vnet.ibm.com>
  L:    netdev@vger.kernel.org
  S:    Supported
  F:    drivers/net/ethernet/ibm/ibmveth.*
  
  IBM Power Virtual SCSI Device Drivers
 -M:    Nathan Fontenot <nfont@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvscsi*
  F:    drivers/scsi/ibmvscsi/viosrp.h
  
  IBM Power Virtual FC Device Drivers
 -M:    Brian King <brking@linux.vnet.ibm.com>
 +M:    Tyrel Datwyler <tyreld@linux.vnet.ibm.com>
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    drivers/scsi/ibmvscsi/ibmvfc*
@@@ -4947,7 -4890,7 +4949,7 @@@ F:      drivers/ipack
  
  INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
  M:    Mimi Zohar <zohar@linux.vnet.ibm.com>
 -M:    Dmitry Kasatkin <d.kasatkin@samsung.com>
 +M:    Dmitry Kasatkin <dmitry.kasatkin@gmail.com>
  L:    linux-ima-devel@lists.sourceforge.net
  L:    linux-ima-user@lists.sourceforge.net
  L:    linux-security-module@vger.kernel.org
@@@ -4989,6 -4932,7 +4991,6 @@@ F:      include/uapi/linux/inotify.
  
  INPUT (KEYBOARD, MOUSE, JOYSTICK, TOUCHSCREEN) DRIVERS
  M:    Dmitry Torokhov <dmitry.torokhov@gmail.com>
 -M:    Dmitry Torokhov <dtor@mail.ru>
  L:    linux-input@vger.kernel.org
  Q:    http://patchwork.kernel.org/project/linux-input/list/
  T:    git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git
@@@ -5007,19 -4951,10 +5009,19 @@@ F:   Documentation/input/multi-touch-prot
  F:    drivers/input/input-mt.c
  K:    \b(ABS|SYN)_MT_
  
 +INTEL ASoC BDW/HSW DRIVERS
 +M:    Jie Yang <yang.jie@linux.intel.com>
 +L:    alsa-devel@alsa-project.org
 +S:    Supported
 +F:    sound/soc/intel/sst-haswell*
 +F:    sound/soc/intel/sst-dsp*
 +F:    sound/soc/intel/sst-firmware.c
 +F:    sound/soc/intel/broadwell.c
 +F:    sound/soc/intel/haswell.c
 +
  INTEL C600 SERIES SAS CONTROLLER DRIVER
  M:    Intel SCU Linux support <intel-linux-scu@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
  S:    Supported
@@@ -5347,15 -5282,6 +5349,15 @@@ W:    www.open-iscsi.or
  Q:    http://patchwork.kernel.org/project/linux-rdma/list/
  F:    drivers/infiniband/ulp/iser/
  
 +ISCSI EXTENSIONS FOR RDMA (ISER) TARGET
 +M:    Sagi Grimberg <sagig@mellanox.com>
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/nab/target-pending.git master
 +L:    linux-rdma@vger.kernel.org
 +L:    target-devel@vger.kernel.org
 +S:    Supported
 +W:    http://www.linux-iscsi.org
 +F:    drivers/infiniband/ulp/isert
 +
  ISDN SUBSYSTEM
  M:    Karsten Keil <isdn@linux-pingi.de>
  L:    isdn4linux@listserv.isdn4linux.de (subscribers-only)
@@@ -5770,49 -5696,6 +5772,49 @@@ F:    drivers/lguest
  F:    include/linux/lguest*.h
  F:    tools/lguest/
  
 +LIBATA SUBSYSTEM (Serial and Parallel ATA drivers)
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/
 +F:    include/linux/ata.h
 +F:    include/linux/libata.h
 +
 +LIBATA PATA ARASAN COMPACT FLASH CONTROLLER
 +M:    Viresh Kumar <viresh.linux@gmail.com>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    include/linux/pata_arasan_cf_data.h
 +F:    drivers/ata/pata_arasan_cf.c
 +
 +LIBATA PATA DRIVERS
 +M:    Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/pata_*.c
 +F:    drivers/ata/ata_generic.c
 +
 +LIBATA SATA AHCI PLATFORM devices support
 +M:    Hans de Goede <hdegoede@redhat.com>
 +M:    Tejun Heo <tj@kernel.org>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/ahci_platform.c
 +F:    drivers/ata/libahci_platform.c
 +F:    include/linux/ahci_platform.h
 +
 +LIBATA SATA PROMISE TX2/TX4 CONTROLLER DRIVER
 +M:    Mikael Pettersson <mikpelinux@gmail.com>
 +L:    linux-ide@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 +S:    Maintained
 +F:    drivers/ata/sata_promise.*
 +
  LIBLOCKDEP
  M:    Sasha Levin <sasha.levin@oracle.com>
  S:    Maintained
@@@ -5904,21 -5787,6 +5906,21 @@@ F:    Documentation/misc-devices/lis3lv02
  F:    drivers/misc/lis3lv02d/
  F:    drivers/platform/x86/hp_accel.c
  
 +LIVE PATCHING
 +M:    Josh Poimboeuf <jpoimboe@redhat.com>
 +M:    Seth Jennings <sjenning@redhat.com>
 +M:    Jiri Kosina <jkosina@suse.cz>
 +M:    Vojtech Pavlik <vojtech@suse.cz>
 +S:    Maintained
 +F:    kernel/livepatch/
 +F:    include/linux/livepatch.h
 +F:    arch/x86/include/asm/livepatch.h
 +F:    arch/x86/kernel/livepatch.c
 +F:    Documentation/ABI/testing/sysfs-kernel-livepatch
 +F:    samples/livepatch/
 +L:    live-patching@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/livepatching.git
 +
  LLC (802.2)
  M:    Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
  S:    Maintained
@@@ -6217,33 -6085,6 +6219,33 @@@ F:    Documentation/devicetree/bindings/i2
  F:    drivers/hwmon/max6697.c
  F:    include/linux/platform_data/max6697.h
  
 +MAXIM MUIC CHARGER DRIVERS FOR EXYNOS BASED BOARDS
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +L:    linux-pm@vger.kernel.org
 +S:    Supported
 +F:    drivers/power/max14577_charger.c
 +F:    drivers/power/max77693_charger.c
 +
 +MAXIM PMIC AND MUIC DRIVERS FOR EXYNOS BASED BOARDS
 +M:    Chanwoo Choi <cw00.choi@samsung.com>
 +M:    Krzysztof Kozlowski <k.kozlowski@samsung.com>
 +L:    linux-kernel@vger.kernel.org
 +S:    Supported
 +F:    drivers/*/max14577.c
 +F:    drivers/*/max77686.c
 +F:    drivers/*/max77693.c
 +F:    drivers/extcon/extcon-max14577.c
 +F:    drivers/extcon/extcon-max77693.c
 +F:    drivers/rtc/rtc-max77686.c
 +F:    drivers/clk/clk-max77686.c
 +F:    Documentation/devicetree/bindings/mfd/max14577.txt
 +F:    Documentation/devicetree/bindings/mfd/max77686.txt
 +F:    Documentation/devicetree/bindings/mfd/max77693.txt
 +F:    Documentation/devicetree/bindings/clock/maxim,max77686.txt
 +F:    include/linux/mfd/max14577*.h
 +F:    include/linux/mfd/max77686*.h
 +F:    include/linux/mfd/max77693*.h
 +
  MAXIRADIO FM RADIO RECEIVER DRIVER
  M:    Hans Verkuil <hverkuil@xs4all.nl>
  L:    linux-media@vger.kernel.org
@@@ -6274,6 -6115,14 +6276,6 @@@ F:     include/uapi/linux/meye.
  F:    include/uapi/linux/ivtv*
  F:    include/uapi/linux/uvcvideo.h
  
 -MEDIAVISION PRO MOVIE STUDIO DRIVER
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/pms*
 -
  MEGARAID SCSI/SAS DRIVERS
  M:    Kashyap Desai <kashyap.desai@avagotech.com>
  M:    Sumit Saxena <sumit.saxena@avagotech.com>
@@@ -6691,10 -6540,9 +6693,10 @@@ F:    include/uapi/linux/netrom.
  F:    net/netrom/
  
  NETWORK BLOCK DEVICE (NBD)
 -M:    Paul Clements <Paul.Clements@steeleye.com>
 +M:    Markus Pargmann <mpa@pengutronix.de>
  S:    Maintained
  L:    nbd-general@lists.sourceforge.net
 +T:    git git://git.pengutronix.de/git/mpa/linux-nbd.git
  F:    Documentation/blockdev/nbd.txt
  F:    drivers/block/nbd.c
  F:    include/linux/nbd.h
@@@ -6723,7 -6571,6 +6725,7 @@@ F:      include/linux/netdevice.
  F:    include/uapi/linux/in.h
  F:    include/uapi/linux/net.h
  F:    include/uapi/linux/netdevice.h
 +F:    include/uapi/linux/net_namespace.h
  F:    tools/net/
  F:    tools/testing/selftests/net/
  F:    lib/random32.c
@@@ -6828,7 -6675,6 +6830,7 @@@ F:      Documentation/devicetree/bindings/ne
  
  NFS, SUNRPC, AND LOCKD CLIENTS
  M:    Trond Myklebust <trond.myklebust@primarydata.com>
 +M:    Anna Schumaker <anna.schumaker@netapp.com>
  L:    linux-nfs@vger.kernel.org
  W:    http://client.linux-nfs.org
  T:    git git://git.linux-nfs.org/projects/trondmy/linux-nfs.git
@@@ -7044,6 -6890,12 +7046,12 @@@ L:    linux-omap@vger.kernel.or
  S:    Maintained
  F:    arch/arm/mach-omap2/omap_hwmod.*
  
+ OMAP HWMOD DATA
+ M:    Paul Walmsley <paul@pwsan.com>
+ L:    linux-omap@vger.kernel.org
+ S:    Maintained
+ F:    arch/arm/mach-omap2/omap_hwmod*data*
+ 
  OMAP HWMOD DATA FOR OMAP4-BASED DEVICES
  M:    Benoît Cousson <bcousson@baylibre.com>
  L:    linux-omap@vger.kernel.org
@@@ -7134,12 -6986,14 +7142,12 @@@ OPEN FIRMWARE AND FLATTENED DEVICE TRE
  M:    Grant Likely <grant.likely@linaro.org>
  M:    Rob Herring <robh+dt@kernel.org>
  L:    devicetree@vger.kernel.org
 -W:    http://fdt.secretlab.ca
 -T:    git git://git.secretlab.ca/git/linux-2.6.git
 +W:    http://www.devicetree.org/
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/glikely/linux.git
  S:    Maintained
  F:    drivers/of/
  F:    include/linux/of*.h
  F:    scripts/dtc/
 -K:    of_get_property
 -K:    of_match_table
  
  OPEN FIRMWARE AND FLATTENED DEVICE TREE BINDINGS
  M:    Rob Herring <robh+dt@kernel.org>
@@@ -7163,12 -7017,11 +7171,12 @@@ F:   arch/openrisc
  
  OPENVSWITCH
  M:    Pravin Shelar <pshelar@nicira.com>
 +L:    netdev@vger.kernel.org
  L:    dev@openvswitch.org
  W:    http://openvswitch.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/pshelar/openvswitch.git
  S:    Maintained
  F:    net/openvswitch/
 +F:    include/uapi/linux/openvswitch.h
  
  OPL4 DRIVER
  M:    Clemens Ladisch <clemens@ladisch.de>
@@@ -7366,14 -7219,6 +7374,14 @@@ F:    include/linux/pci
  F:    arch/x86/pci/
  F:    arch/x86/kernel/quirks.c
  
 +PCI DRIVER FOR ARM VERSATILE PLATFORM
 +M:    Rob Herring <robh@kernel.org>
 +L:    linux-pci@vger.kernel.org
 +L:    linux-arm-kernel@lists.infradead.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/pci/versatile.txt
 +F:    drivers/pci/host/pci-versatile.c
 +
  PCI DRIVER FOR APPLIEDMICRO XGENE
  M:    Tanmay Inamdar <tinamdar@apm.com>
  L:    linux-pci@vger.kernel.org
@@@ -7393,7 -7238,7 +7401,7 @@@ S:      Maintaine
  F:    drivers/pci/host/*layerscape*
  
  PCI DRIVER FOR IMX6
 -M:    Richard Zhu <r65037@freescale.com>
 +M:    Richard Zhu <Richard.Zhu@freescale.com>
  M:    Lucas Stach <l.stach@pengutronix.de>
  L:    linux-pci@vger.kernel.org
  L:    linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
@@@ -7563,7 -7408,6 +7571,7 @@@ F:      drivers/crypto/picoxcell
  PIN CONTROL SUBSYSTEM
  M:    Linus Walleij <linus.walleij@linaro.org>
  L:    linux-gpio@vger.kernel.org
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git
  S:    Maintained
  F:    drivers/pinctrl/
  F:    include/linux/pinctrl/
@@@ -7731,6 -7575,12 +7739,6 @@@ W:     http://wireless.kernel.org/en/users/
  S:    Obsolete
  F:    drivers/net/wireless/prism54/
  
 -PROMISE SATA TX2/TX4 CONTROLLER LIBATA DRIVER
 -M:    Mikael Pettersson <mikpelinux@gmail.com>
 -L:    linux-ide@vger.kernel.org
 -S:    Maintained
 -F:    drivers/ata/sata_promise.*
 -
  PS3 NETWORK SUPPORT
  M:    Geoff Levand <geoff@infradead.org>
  L:    netdev@vger.kernel.org
@@@ -7896,7 -7746,8 +7904,7 @@@ F:      Documentation/scsi/LICENSE.qla2xx
  F:    drivers/scsi/qla2xxx/
  
  QLOGIC QLA4XXX iSCSI DRIVER
 -M:    Vikas Chaudhary <vikas.chaudhary@qlogic.com>
 -M:    iscsi-driver@qlogic.com
 +M:    QLogic-Storage-Upstream@qlogic.com
  L:    linux-scsi@vger.kernel.org
  S:    Supported
  F:    Documentation/scsi/LICENSE.qla4xxx
@@@ -7975,6 -7826,14 +7983,6 @@@ T:     git git://github.com/KrasnikovEugene
  S:    Supported
  F:    drivers/net/wireless/ath/wcn36xx/
  
 -QUICKCAM PARALLEL PORT WEBCAMS
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -L:    linux-media@vger.kernel.org
 -T:    git git://linuxtv.org/media_tree.git
 -W:    http://linuxtv.org
 -S:    Odd Fixes
 -F:    drivers/media/parport/*-qcam*
 -
  RADOS BLOCK DEVICE (RBD)
  M:    Yehuda Sadeh <yehuda@inktank.com>
  M:    Sage Weil <sage@inktank.com>
@@@ -8163,13 -8022,6 +8171,13 @@@ S:    Maintaine
  F:    Documentation/rfkill.txt
  F:    net/rfkill/
  
 +RHASHTABLE
 +M:    Thomas Graf <tgraf@suug.ch>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    lib/rhashtable.c
 +F:    include/linux/rhashtable.h
 +
  RICOH SMARTMEDIA/XD DRIVER
  M:    Maxim Levitsky <maximlevitsky@gmail.com>
  S:    Maintained
@@@ -8512,6 -8364,12 +8520,6 @@@ F:     kernel/time/clocksource.
  F:    kernel/time/time*.c
  F:    kernel/time/ntp.c
  
 -TLG2300 VIDEO4LINUX-2 DRIVER
 -M:    Huang Shijie <shijie8@gmail.com>
 -M:    Hans Verkuil <hverkuil@xs4all.nl>
 -S:    Odd Fixes
 -F:    drivers/media/usb/tlg2300/
 -
  SC1200 WDT DRIVER
  M:    Zwane Mwaikambo <zwanem@gmail.com>
  S:    Maintained
@@@ -8697,6 -8555,25 +8705,6 @@@ S:     Maintaine
  F:    drivers/misc/phantom.c
  F:    include/uapi/linux/phantom.h
  
 -SERIAL ATA (SATA) SUBSYSTEM
 -M:    Tejun Heo <tj@kernel.org>
 -L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/
 -F:    include/linux/ata.h
 -F:    include/linux/libata.h
 -
 -SERIAL ATA AHCI PLATFORM devices support
 -M:    Hans de Goede <hdegoede@redhat.com>
 -M:    Tejun Heo <tj@kernel.org>
 -L:    linux-ide@vger.kernel.org
 -T:    git git://git.kernel.org/pub/scm/linux/kernel/git/tj/libata.git
 -S:    Supported
 -F:    drivers/ata/ahci_platform.c
 -F:    drivers/ata/libahci_platform.c
 -F:    include/linux/ahci_platform.h
 -
  SERVER ENGINES 10Gbps iSCSI - BladeEngine 2 DRIVER
  M:    Jayamohan Kallickal <jayamohan.kallickal@emulex.com>
  L:    linux-scsi@vger.kernel.org
@@@ -8877,15 -8754,6 +8885,15 @@@ S:    Maintaine
  F:    drivers/media/platform/davinci/
  F:    include/media/davinci/
  
 +TI AM437X VPFE DRIVER
 +M:    Lad, Prabhakar <prabhakar.csengg@gmail.com>
 +L:    linux-media@vger.kernel.org
 +W:    http://linuxtv.org/
 +Q:    http://patchwork.linuxtv.org/project/linux-media/list/
 +T:    git git://linuxtv.org/mhadli/v4l-dvb-davinci_devices.git
 +S:    Maintained
 +F:    drivers/media/platform/am437x/
 +
  SIS 190 ETHERNET DRIVER
  M:    Francois Romieu <romieu@fr.zoreil.com>
  L:    netdev@vger.kernel.org
@@@ -8967,8 -8835,6 +8975,8 @@@ F:      drivers/media/i2c/smiapp
  F:    include/media/smiapp.h
  F:    drivers/media/i2c/smiapp-pll.c
  F:    drivers/media/i2c/smiapp-pll.h
 +F:    include/uapi/linux/smiapp.h
 +F:    Documentation/devicetree/bindings/media/i2c/nokia,smia.txt
  
  SMM665 HARDWARE MONITOR DRIVER
  M:    Guenter Roeck <linux@roeck-us.net>
@@@ -9035,7 -8901,6 +9043,7 @@@ SOFTLOGIC 6x10 MPEG CODE
  M:    Bluecherry Maintainers <maintainers@bluecherrydvr.com>
  M:    Andrey Utkin <andrey.utkin@corp.bluecherry.net>
  M:    Andrey Utkin <andrey.krieger.utkin@gmail.com>
 +M:    Ismael Luceno <ismael@iodev.co.uk>
  L:    linux-media@vger.kernel.org
  S:    Supported
  F:    drivers/media/pci/solo6x10/
@@@ -9308,14 -9173,6 +9316,14 @@@ L:    linux-wireless@vger.kernel.or
  S:    Maintained
  F:    drivers/staging/rtl8723au/
  
 +STAGING - SILICON MOTION SM7XX FRAME BUFFER DRIVER
 +M:    Sudip Mukherjee <sudipm.mukherjee@gmail.com>
 +M:    Teddy Wang <teddy.wang@siliconmotion.com>
 +M:    Sudip Mukherjee <sudip@vectorindia.org>
 +L:    linux-fbdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/staging/sm7xxfb/
 +
  STAGING - SLICOSS
  M:    Lior Dotan <liodot@gmail.com>
  M:    Christopher Harrer <charrer@alacritech.com>
@@@ -9356,13 -9213,6 +9364,13 @@@ F:    arch/m68k/sun3*
  F:    arch/m68k/include/asm/sun3*
  F:    drivers/net/ethernet/i825xx/sun3*
  
 +SUN4I LOW RES ADC ATTACHED TABLET KEYS DRIVER
 +M:    Hans de Goede <hdegoede@redhat.com>
 +L:    linux-input@vger.kernel.org
 +S:    Maintained
 +F:    Documentation/devicetree/bindings/input/sun4i-lradc-keys.txt
 +F:    drivers/input/keyboard/sun4i-lradc-keys.c
 +
  SUNDANCE NETWORK DRIVER
  M:    Denis Kirjanov <kda@linux-powerpc.org>
  L:    netdev@vger.kernel.org
@@@ -9371,6 -9221,7 +9379,6 @@@ F:      drivers/net/ethernet/dlink/sundance.
  
  SUPERH
  L:    linux-sh@vger.kernel.org
 -W:    http://www.linux-sh.org
  Q:    http://patchwork.kernel.org/project/linux-sh/list/
  S:    Orphan
  F:    Documentation/sh/
@@@ -9691,8 -9542,7 +9699,8 @@@ F:      drivers/platform/x86/thinkpad_acpi.
  TI BANDGAP AND THERMAL DRIVER
  M:    Eduardo Valentin <edubezval@gmail.com>
  L:    linux-pm@vger.kernel.org
 -S:    Supported
 +L:    linux-omap@vger.kernel.org
 +S:    Maintained
  F:    drivers/thermal/ti-soc-thermal/
  
  TI CLOCK DRIVER
@@@ -9749,13 -9599,6 +9757,13 @@@ F:    drivers/power/lp8788-charger.
  F:    drivers/regulator/lp8788-*.c
  F:    include/linux/mfd/lp8788*.h
  
 +TI NETCP ETHERNET DRIVER
 +M:    Wingman Kwok <w-kwok2@ti.com>
 +M:    Murali Karicheri <m-karicheri2@ti.com>
 +L:    netdev@vger.kernel.org
 +S:    Maintained
 +F:    drivers/net/ethernet/ti/netcp*
 +
  TI TWL4030 SERIES SOC CODEC DRIVER
  M:    Peter Ujfalusi <peter.ujfalusi@ti.com>
  L:    alsa-devel@alsa-project.org (moderated for non-subscribers)
@@@ -9783,7 -9626,7 +9791,7 @@@ F:      net/tipc
  
  TILE ARCHITECTURE
  M:    Chris Metcalf <cmetcalf@ezchip.com>
 -W:    http://www.tilera.com/scm/
 +W:    http://www.ezchip.com/scm/
  S:    Supported
  F:    arch/tile/
  F:    drivers/char/tile-srom.c
@@@ -9876,21 -9719,13 +9884,21 @@@ F:   drivers/media/pci/tw68
  
  TPM DEVICE DRIVER
  M:    Peter Huewe <peterhuewe@gmx.de>
 -M:    Ashley Lai <ashley@ashleylai.com>
  M:    Marcel Selhorst <tpmdd@selhorst.net>
  W:    http://tpmdd.sourceforge.net
  L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 +Q:    git git://github.com/PeterHuewe/linux-tpmdd.git
 +T:    https://github.com/PeterHuewe/linux-tpmdd
  S:    Maintained
  F:    drivers/char/tpm/
  
 +TPM IBM_VTPM DEVICE DRIVER
 +M:    Ashley Lai <ashleydlai@gmail.com>
 +W:    http://tpmdd.sourceforge.net
 +L:    tpmdd-devel@lists.sourceforge.net (moderated for non-subscribers)
 +S:    Maintained
 +F:    drivers/char/tpm/tpm_ibmvtpm*
 +
  TRACING
  M:    Steven Rostedt <rostedt@goodmis.org>
  M:    Ingo Molnar <mingo@redhat.com>
@@@ -10045,15 -9880,20 +10053,15 @@@ F: drivers/scsi/ufs
  
  UNSORTED BLOCK IMAGES (UBI)
  M:    Artem Bityutskiy <dedekind1@gmail.com>
 +M:    Richard Weinberger <richard@nod.at>
  W:    http://www.linux-mtd.infradead.org/
  L:    linux-mtd@lists.infradead.org
  T:    git git://git.infradead.org/ubifs-2.6.git
 -S:    Maintained
 +S:    Supported
  F:    drivers/mtd/ubi/
  F:    include/linux/mtd/ubi.h
  F:    include/uapi/mtd/ubi-user.h
  
 -UNSORTED BLOCK IMAGES (UBI) Fastmap
 -M:    Richard Weinberger <richard@nod.at>
 -L:    linux-mtd@lists.infradead.org
 -S:    Maintained
 -F:    drivers/mtd/ubi/fastmap.c
 -
  USB ACM DRIVER
  M:    Oliver Neukum <oliver@neukum.org>
  L:    linux-usb@vger.kernel.org
@@@ -10315,7 -10155,6 +10323,7 @@@ USERSPACE I/O (UIO
  M:    "Hans J. Koch" <hjk@hansjkoch.de>
  M:    Greg Kroah-Hartman <gregkh@linuxfoundation.org>
  S:    Maintained
 +T:    git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git
  F:    Documentation/DocBook/uio-howto.tmpl
  F:    drivers/uio/
  F:    include/linux/uio*.h
@@@ -10743,7 -10582,6 +10751,7 @@@ F:   drivers/pci/*xen
  
  XEN BLOCK SUBSYSTEM
  M:    Konrad Rzeszutek Wilk <konrad.wilk@oracle.com>
 +M:    Roger Pau Monné <roger.pau@citrix.com>
  L:    xen-devel@lists.xenproject.org (moderated for non-subscribers)
  S:    Supported
  F:    drivers/block/xen-blkback/*
@@@ -10799,7 -10637,6 +10807,7 @@@ M:   Max Filippov <jcmvbkbc@gmail.com
  L:    linux-xtensa@linux-xtensa.org
  S:    Maintained
  F:    drivers/spi/spi-xtensa-xtfpga.c
 +F:    sound/soc/xtensa/xtfpga-i2s.c
  
  YAM DRIVER FOR AX.25
  M:    Jean-Paul Roubelat <jpr@f6fbb.org>

diff --combined arch/arm/mach-omap2/common.h
index 3933b8aa4f01964e103b4b7344fd36286a480b7c,65b4371b3361751ac9ce4bc61937992d6819a8b5..46e24581d6245a45ff316a9c00dfe74284539238
--- 1/arch/arm/mach-omap2/common.h
--- 2/arch/arm/mach-omap2/common.h
+++ b/arch/arm/mach-omap2/common.h
@@@ -35,7 -35,6 +35,7 @@@
  #include <linux/irqchip/irq-omap-intc.h>
  
  #include <asm/proc-fns.h>
 +#include <asm/hardware/cache-l2x0.h>
  
  #include "i2c.h"
  #include "serial.h"
@@@ -95,18 -94,11 +95,18 @@@ extern void omap3_gptimer_timer_init(vo
  extern void omap4_local_timer_init(void);
  #ifdef CONFIG_CACHE_L2X0
  int omap_l2_cache_init(void);
 +#define OMAP_L2C_AUX_CTRL     (L2C_AUX_CTRL_SHARED_OVERRIDE | \
 +                               L310_AUX_CTRL_DATA_PREFETCH | \
 +                               L310_AUX_CTRL_INSTR_PREFETCH)
 +void omap4_l2c310_write_sec(unsigned long val, unsigned reg);
  #else
  static inline int omap_l2_cache_init(void)
  {
        return 0;
  }
 +
 +#define OMAP_L2C_AUX_CTRL     0
 +#define omap4_l2c310_write_sec        NULL
  #endif
  extern void omap5_realtime_timer_init(void);
  
@@@ -118,7 -110,8 +118,8 @@@ void omap3630_init_early(void)
  void omap3_init_early(void);  /* Do not use this one */
  void am33xx_init_early(void);
  void am35xx_init_early(void);
- void ti81xx_init_early(void);
+ void ti814x_init_early(void);
+ void ti816x_init_early(void);
  void am33xx_init_early(void);
  void am43xx_init_early(void);
  void am43xx_init_late(void);
@@@ -171,6 -164,14 +172,14 @@@ static inline void omap3xxx_restart(enu
  }
  #endif
  
+ #ifdef CONFIG_SOC_TI81XX
+ void ti81xx_restart(enum reboot_mode mode, const char *cmd);
+ #else
+ static inline void ti81xx_restart(enum reboot_mode mode, const char *cmd)
+ {
+ }
+ #endif
+ 
  #if defined(CONFIG_ARCH_OMAP4) || defined(CONFIG_SOC_OMAP5) || \
        defined(CONFIG_SOC_DRA7XX) || defined(CONFIG_SOC_AM43XX)
  void omap44xx_restart(enum reboot_mode mode, const char *cmd);
@@@ -219,7 -220,6 +228,7 @@@ extern struct device *omap2_get_iva_dev
  extern struct device *omap2_get_l3_device(void);
  extern struct device *omap4_get_dsp_device(void);
  
 +unsigned int omap4_xlate_irq(unsigned int hwirq);
  void omap_gic_of_init(void);
  
  #ifdef CONFIG_CACHE_L2X0
@@@ -258,7 -258,6 +267,7 @@@ extern void omap4_cpu_die(unsigned int 
  extern struct smp_operations omap4_smp_ops;
  
  extern void omap5_secondary_startup(void);
 +extern void omap5_secondary_hyp_startup(void);
  #endif
  
  #if defined(CONFIG_SMP) && defined(CONFIG_PM)

diff --combined arch/arm/mach-omap2/control.h
index a80ac2d70bb1bca42084187851c09b914cd51871,0fba6d1130a9f5f0bd4a5914e41053d4c9f00e9b..b8a48718121015931c1d7d90092dd1161a5c4efb
--- 1/arch/arm/mach-omap2/control.h
--- 2/arch/arm/mach-omap2/control.h
+++ b/arch/arm/mach-omap2/control.h
@@@ -53,6 -53,7 +53,7 @@@
  #define OMAP343X_CONTROL_GENERAL_WKUP 0xa60
  
  /* TI81XX spefic control submodules */
+ #define TI81XX_CONTROL_DEVBOOT                0x040
  #define TI81XX_CONTROL_DEVCONF                0x600
  
  /* Control register offsets - read/write with omap_ctrl_{read,write}{bwl}() */
@@@ -246,6 -247,9 +247,9 @@@
  #define OMAP3_PADCONF_SAD2D_MSTANDBY   0x250
  #define OMAP3_PADCONF_SAD2D_IDLEACK    0x254
  
+ /* TI81XX CONTROL_DEVBOOT register offsets */
+ #define TI81XX_CONTROL_STATUS         (TI81XX_CONTROL_DEVBOOT + 0x000)
+ 
  /* TI81XX CONTROL_DEVCONF register offsets */
  #define TI81XX_CONTROL_DEVICE_ID      (TI81XX_CONTROL_DEVCONF + 0x000)
  
@@@ -286,10 -290,6 +290,10 @@@
  #define OMAP5XXX_CONTROL_STATUS                0x134
  #define OMAP5_DEVICETYPE_MASK          (0x7 << 6)
  
 +/* DRA7XX CONTROL CORE BOOTSTRAP */
 +#define DRA7_CTRL_CORE_BOOTSTRAP      0x6c4
 +#define DRA7_SPEEDSELECT_MASK         (0x3 << 8)
 +
  /*
   * REVISIT: This list of registers is not comprehensive - there are more
   * that should be added.

diff --combined arch/arm/mach-omap2/omap_hwmod.c
index 9025ffffd2dc1d066fcb54a2cf44f2bf9a73525c,06157af892ce2b3048d53c0814e5f08038fde2f1..2af58570cb65785d4adab69efcdb18e06a5c2a42
--- 1/arch/arm/mach-omap2/omap_hwmod.c
--- 2/arch/arm/mach-omap2/omap_hwmod.c
+++ b/arch/arm/mach-omap2/omap_hwmod.c
@@@ -2155,8 -2155,8 +2155,8 @@@ static int _enable(struct omap_hwmod *o
                if (soc_ops.disable_module)
                        soc_ops.disable_module(oh);
                _disable_clocks(oh);
-               pr_debug("omap_hwmod: %s: _wait_target_ready: %d\n",
-                        oh->name, r);
+               pr_err("omap_hwmod: %s: _wait_target_ready failed: %d\n",
+                      oh->name, r);
  
                if (oh->clkdm)
                        clkdm_hwmod_disable(oh->clkdm, oh);
@@@ -3534,15 -3534,9 +3534,15 @@@ int omap_hwmod_fill_resources(struct om
  
        mpu_irqs_cnt = _count_mpu_irqs(oh);
        for (i = 0; i < mpu_irqs_cnt; i++) {
 +              unsigned int irq;
 +
 +              if (oh->xlate_irq)
 +                      irq = oh->xlate_irq((oh->mpu_irqs + i)->irq);
 +              else
 +                      irq = (oh->mpu_irqs + i)->irq;
                (res + r)->name = (oh->mpu_irqs + i)->name;
 -              (res + r)->start = (oh->mpu_irqs + i)->irq;
 -              (res + r)->end = (oh->mpu_irqs + i)->irq;
 +              (res + r)->start = irq;
 +              (res + r)->end = irq;
                (res + r)->flags = IORESOURCE_IRQ;
                r++;
        }

diff --combined arch/arm/mach-omap2/prm_common.c
index dea2833ca627c84ca67db08d77c24f834c3a0340,b6587854bca51a11e8dbee1e2dc2ee3ba4d74e99..264b5e29404d0eded3c9eca764384e8d93a5e563
--- 1/arch/arm/mach-omap2/prm_common.c
--- 2/arch/arm/mach-omap2/prm_common.c
+++ b/arch/arm/mach-omap2/prm_common.c
@@@ -187,7 -187,6 +187,7 @@@ int omap_prcm_event_to_irq(const char *
   */
  void omap_prcm_irq_cleanup(void)
  {
 +      unsigned int irq;
        int i;
  
        if (!prcm_irq_setup) {
@@@ -212,11 -211,7 +212,11 @@@
        kfree(prcm_irq_setup->priority_mask);
        prcm_irq_setup->priority_mask = NULL;
  
 -      irq_set_chained_handler(prcm_irq_setup->irq, NULL);
 +      if (prcm_irq_setup->xlate_irq)
 +              irq = prcm_irq_setup->xlate_irq(prcm_irq_setup->irq);
 +      else
 +              irq = prcm_irq_setup->irq;
 +      irq_set_chained_handler(irq, NULL);
  
        if (prcm_irq_setup->base_irq > 0)
                irq_free_descs(prcm_irq_setup->base_irq,
@@@ -264,7 -259,6 +264,7 @@@ int omap_prcm_register_chain_handler(st
        int offset, i;
        struct irq_chip_generic *gc;
        struct irq_chip_type *ct;
 +      unsigned int irq;
  
        if (!irq_setup)
                return -EINVAL;
@@@ -304,11 -298,7 +304,11 @@@
                                1 << (offset & 0x1f);
        }
  
 -      irq_set_chained_handler(irq_setup->irq, omap_prcm_irq_handler);
 +      if (irq_setup->xlate_irq)
 +              irq = irq_setup->xlate_irq(irq_setup->irq);
 +      else
 +              irq = irq_setup->irq;
 +      irq_set_chained_handler(irq, omap_prcm_irq_handler);
  
        irq_setup->base_irq = irq_alloc_descs(-1, 0, irq_setup->nr_regs * 32,
                0);
@@@ -581,6 -571,10 +581,10 @@@ static const struct of_device_id omap_p
        { .compatible = "ti,am3-scrm" },
        { .compatible = "ti,am4-prcm" },
        { .compatible = "ti,am4-scrm" },
+       { .compatible = "ti,dm814-prcm" },
+       { .compatible = "ti,dm814-scrm" },
+       { .compatible = "ti,dm816-prcm" },
+       { .compatible = "ti,dm816-scrm" },
        { .compatible = "ti,omap2-prcm" },
        { .compatible = "ti,omap2-scrm" },
        { .compatible = "ti,omap3-prm" },

diff --combined arch/arm/mach-omap2/timer.c
index 7d45c84c69ba38a3da362456c941bb39ef90d7a2,376b099ba84bb3460a35bd2d7aa060c14e7bf625..cef67af9e9b88aa50416c46cf4aab66769964437
--- 1/arch/arm/mach-omap2/timer.c
--- 2/arch/arm/mach-omap2/timer.c
+++ b/arch/arm/mach-omap2/timer.c
@@@ -54,7 -54,6 +54,7 @@@
  
  #include "soc.h"
  #include "common.h"
 +#include "control.h"
  #include "powerdomain.h"
  #include "omap-secure.h"
  
@@@ -147,6 -146,8 +147,8 @@@ static const struct of_device_id omap_t
        { .compatible = "ti,omap3430-timer", },
        { .compatible = "ti,omap4430-timer", },
        { .compatible = "ti,omap5430-timer", },
+       { .compatible = "ti,dm814-timer", },
+       { .compatible = "ti,dm816-timer", },
        { .compatible = "ti,am335x-timer", },
        { .compatible = "ti,am335x-timer-1ms", },
        { }
@@@ -497,8 -498,7 +499,8 @@@ static void __init realtime_counter_ini
        void __iomem *base;
        static struct clk *sys_clk;
        unsigned long rate;
 -      unsigned int reg, num, den;
 +      unsigned int reg;
 +      unsigned long long num, den;
  
        base = ioremap(REALTIME_COUNTER_BASE, SZ_32);
        if (!base) {
@@@ -513,42 -513,13 +515,42 @@@
        }
  
        rate = clk_get_rate(sys_clk);
 +
 +      if (soc_is_dra7xx()) {
 +              /*
 +               * Errata i856 says the 32.768KHz crystal does not start at
 +               * power on, so the CPU falls back to an emulated 32KHz clock
 +               * based on sysclk / 610 instead. This causes the master counter
 +               * frequency to not be 6.144MHz but at sysclk / 610 * 375 / 2
 +               * (OR sysclk * 75 / 244)
 +               *
 +               * This affects at least the DRA7/AM572x 1.0, 1.1 revisions.
 +               * Of course any board built without a populated 32.768KHz
 +               * crystal would also need this fix even if the CPU is fixed
 +               * later.
 +               *
 +               * Either case can be detected by using the two speedselect bits
 +               * If they are not 0, then the 32.768KHz clock driving the
 +               * coarse counter that corrects the fine counter every time it
 +               * ticks is actually rate/610 rather than 32.768KHz and we
 +               * should compensate to avoid the 570ppm (at 20MHz, much worse
 +               * at other rates) too fast system time.
 +               */
 +              reg = omap_ctrl_readl(DRA7_CTRL_CORE_BOOTSTRAP);
 +              if (reg & DRA7_SPEEDSELECT_MASK) {
 +                      num = 75;
 +                      den = 244;
 +                      goto sysclk1_based;
 +              }
 +      }
 +
        /* Numerator/denumerator values refer TRM Realtime Counter section */
        switch (rate) {
 -      case 1200000:
 +      case 12000000:
                num = 64;
                den = 125;
                break;
 -      case 1300000:
 +      case 13000000:
                num = 768;
                den = 1625;
                break;
@@@ -560,11 -531,11 +562,11 @@@
                num = 192;
                den = 625;
                break;
 -      case 2600000:
 +      case 26000000:
                num = 384;
                den = 1625;
                break;
 -      case 2700000:
 +      case 27000000:
                num = 256;
                den = 1125;
                break;
@@@ -576,7 -547,6 +578,7 @@@
                break;
        }
  
 +sysclk1_based:
        /* Program numerator and denumerator registers */
        reg = readl_relaxed(base + INCREMENTER_NUMERATOR_OFFSET) &
                        NUMERATOR_DENUMERATOR_MASK;
@@@ -588,7 -558,7 +590,7 @@@
        reg |= den;
        writel_relaxed(reg, base + INCREMENTER_DENUMERATOR_RELOAD_OFFSET);
  
 -      arch_timer_freq = (rate / den) * num;
 +      arch_timer_freq = DIV_ROUND_UP_ULL(rate * num, den);
        set_cntfreq();
  
        iounmap(base);