Merge tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm...

Omap fixes and minor defconfig updates that would be good to
get in before -rc1.

* tag 'omap-for-v3.11/fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
  ARM: OMAP2+: omap2plus_defconfig: Enable appended DTB support
  ARM: OMAP2+: Enable TI_EDMA in omap2plus_defconfig
  ARM: OMAP2+: omap2plus_defconfig: enable DRA752 thermal support by default
  ARM: OMAP2+: omap2plus_defconfig: enable TI bandgap driver
  ARM: OMAP2+: devices: remove duplicated include from devices.c
  ARM: OMAP3: igep0020: Set DSS pins in correct mux mode.
  ARM: OMAP2+: N900: enable N900-specific drivers even if device tree is enabled
  ARM: OMAP2+: Cocci spatch "ptr_ret.spatch"
  ARM: OMAP2+: Remove obsolete Makefile line
  ARM: OMAP5: Enable Cortex A15 errata 798181
  ARM: scu: provide inline dummy functions when SCU is not present
  ARM: OMAP4: sleep: build OMAP4 specific functions only for OMAP4
  ARM: OMAP2+: timer: initialize before using oh_name

Signed-off-by: Olof Johansson <olof@lixom.net>
Add/move/change conflicts in arch/arm/mach-omap2/Kconfig resolved.

diff --cc arch/arm/Kconfig.debug
Simple merge

diff --cc arch/arm/configs/omap2plus_defconfig
Simple merge

diff --cc arch/arm/mach-exynos/Kconfig
Simple merge

diff --cc arch/arm/mach-omap2/Kconfig
index 58152b15ecaa59acd526e41a5a8185d425813279,e658f7a272e4746ea74ef08f2653353ff0a39e98..627fa7e41fbabbeccf38c1703dc26ed2a98d66db
--- 1/arch/arm/mach-omap2/Kconfig
--- 2/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
@@@ -62,78 -114,8 +62,79 @@@ config SOC_OMAP
        select HAVE_SMP
        select COMMON_CLK
        select HAVE_ARM_ARCH_TIMER
+       select ARM_ERRATA_798181
  
 +config SOC_AM33XX
 +      bool "AM33XX support"
 +      depends on ARCH_MULTI_V7
 +      select ARCH_OMAP2PLUS
 +      select ARM_CPU_SUSPEND if PM
 +      select CPU_V7
 +      select MULTI_IRQ_HANDLER
 +      select COMMON_CLK
 +
 +config SOC_AM43XX
 +      bool "TI AM43x"
 +      depends on ARCH_MULTI_V7
 +      select CPU_V7
 +      select ARCH_OMAP2PLUS
 +      select MULTI_IRQ_HANDLER
 +      select ARM_GIC
 +      select COMMON_CLK
 +      select MACH_OMAP_GENERIC
 +
 +config ARCH_OMAP2PLUS
 +      bool
 +      select ARCH_HAS_BANDGAP
 +      select ARCH_HAS_CPUFREQ
 +      select ARCH_HAS_HOLES_MEMORYMODEL
 +      select ARCH_OMAP
 +      select ARCH_REQUIRE_GPIOLIB
 +      select CLKDEV_LOOKUP
 +      select CLKSRC_MMIO
 +      select GENERIC_CLOCKEVENTS
 +      select GENERIC_IRQ_CHIP
 +      select HAVE_CLK
 +      select OMAP_DM_TIMER
 +      select PINCTRL
 +      select PROC_DEVICETREE if PROC_FS
 +      select SOC_BUS
 +      select SPARSE_IRQ
 +      select TI_PRIV_EDMA
 +      select USE_OF
 +      help
 +        Systems based on OMAP2, OMAP3, OMAP4 or OMAP5
 +
 +
 +if ARCH_OMAP2PLUS
 +
 +menu "TI OMAP2/3/4 Specific Features"
 +
 +config ARCH_OMAP2PLUS_TYPICAL
 +      bool "Typical OMAP configuration"
 +      default y
 +      select AEABI
 +      select HIGHMEM
 +      select I2C
 +      select I2C_OMAP
 +      select MENELAUS if ARCH_OMAP2
 +      select NEON if ARCH_OMAP3 || ARCH_OMAP4 || SOC_OMAP5
 +      select PM_RUNTIME
 +      select REGULATOR
 +      select TWL4030_CORE if ARCH_OMAP3 || ARCH_OMAP4
 +      select TWL4030_POWER if ARCH_OMAP3 || ARCH_OMAP4
 +      select VFP
 +      help
 +        Compile a kernel suitable for booting most boards
 +
 +config SOC_HAS_OMAP2_SDRC
 +      bool "OMAP2 SDRAM Controller support"
 +
 +config SOC_HAS_REALTIME_COUNTER
 +      bool "Real time free running counter"
 +      depends on SOC_OMAP5
 +      default y
 +
  comment "OMAP Core Type"
        depends on ARCH_OMAP2