Merge tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/pub/scm...

Merge "urgent omap boot fix for v4.1 if MFD_SYSCON is not set" from Tony
Lindgren:

Urgent pull request for v4.1 to booting for custom kernel
.config files that do not have MFD_SYSCON set.

Omaps now have a dependency to MFD_SYSCON for system control
module generic register area and some clocks with the changes
done in omap-for-v4.1/prcm-dts branch.

This can be pulled on top of omap-for-v4.1/prcm-dts, or into
fixes for v4.1.

We already do have a slight MFD_SYSCON dependency for
REGULATOR_PBIAS for dual voltage MMC cards on the first MMC
bus for many devices, so from that point of view this can
also be merged separately from omap-for-v4.1/prcm-dts.

* tag 'omap-for-v4.1/prcm-dts-mfd-syscon-fix' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: Fix booting with configs that don't have MFD_SYSCON

Signed-off-by: Olof Johansson <[email protected]>

diff --combined arch/arm/mach-omap2/Kconfig
index 1041b19485ab84a6f780ad85def3b408dbd0fd93,02f5f3faac1fba6e7fdf8dd446b35225344dfe09..f92f389890bd3c8d56515c55bcf34ed7c0038617
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -69,7 -69,6 +69,7 @@@ config SOC_DRA7X
        select ARM_GIC
        select HAVE_ARM_ARCH_TIMER
        select IRQ_CROSSBAR
 +      select ARM_ERRATA_798181 if SMP
  
  config ARCH_OMAP2PLUS
        bool
@@@ -81,6 -80,7 +81,7 @@@
        select GENERIC_IRQ_CHIP
        select MACH_OMAP_GENERIC
        select MEMORY
+       select MFD_SYSCON
        select OMAP_DM_TIMER
        select OMAP_GPMC
        select PINCTRL
@@@ -279,6 -279,27 +280,6 @@@ config OMAP3_SDRC_AC_TIMIN
          wish to say no.  Selecting yes without understanding what is
          going on could result in system crashes;
  
 -config OMAP4_ERRATA_I688
 -      bool "OMAP4 errata: Async Bridge Corruption"
 -      depends on (ARCH_OMAP4 || SOC_OMAP5) && !ARCH_MULTIPLATFORM
 -      select ARCH_HAS_BARRIERS
 -      help
 -        If a data is stalled inside asynchronous bridge because of back
 -        pressure, it may be accepted multiple times, creating pointer
 -        misalignment that will corrupt next transfers on that data path
 -        until next reset of the system (No recovery procedure once the
 -        issue is hit, the path remains consistently broken). Async bridge
 -        can be found on path between MPU to EMIF and MPU to L3 interconnect.
 -        This situation can happen only when the idle is initiated by a
 -        Master Request Disconnection (which is trigged by software when
 -        executing WFI on CPU).
 -        The work-around for this errata needs all the initiators connected
 -        through async bridge must ensure that data path is properly drained
 -        before issuing WFI. This condition will be met if one Strongly ordered
 -        access is performed to the target right before executing the WFI.
 -        In MPU case, L3 T2ASYNC FIFO and DDR T2ASYNC FIFO needs to be drained.
 -        IO barrier ensure that there is no synchronisation loss on initiators
 -        operating on both interconnect port simultaneously.
  endmenu
  
  endif