Merge tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci...

From Sekhar Nori:

These changes add DT boot support to DaVinci DA850
SoC.

* tag 'davinci-for-v3.8/dt' of git://gitorious.org/linux-davinci/linux-davinci:
  ARM: davinci: da850: generate dtbs for da850 boards
  ARM: davinci: add support for am1808 based EnBW CMC board
  ARM: davinci: da850 evm: add DT data
  ARM: davinci: da850: add SoC DT data
  ARM: davinci: da850: add DT boot support
  ARM: davinci: da8xx: add DA850 PRUSS support
  ARM: davinci: add platform hook to fetch the SRAM pool
  ARM: davinci: da850: changed SRAM allocator to shared ram.
  ARM: davinci: sram: switch from iotable to ioremapped regions
  uio: uio_pruss: replace private SRAM API with genalloc
  ARM: davinci: serial: provide API to initialze UART clocks
  ARM: davinci: convert platform code to use clk_prepare/clk_unprepare

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --combined arch/arm/Kconfig
index 23252783e93f37bbdd78bb7bf3fa92a10b027ccd,06e0adf2368eb769d4fcca6054e988bcf272821c..dbbe74c10b1ce2ea9e082c570bca360d3ea0286a
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@ -433,6 -433,19 +433,6 @@@ config ARCH_FOOTBRIDG
          Support for systems based on the DC21285 companion chip
          ("FootBridge"), such as the Simtec CATS and the Rebel NetWinder.
  
 -config ARCH_MXC
 -      bool "Freescale MXC/iMX-based"
 -      select ARCH_REQUIRE_GPIOLIB
 -      select CLKDEV_LOOKUP
 -      select CLKSRC_MMIO
 -      select GENERIC_CLOCKEVENTS
 -      select GENERIC_IRQ_CHIP
 -      select MULTI_IRQ_HANDLER
 -      select SPARSE_IRQ
 -      select USE_OF
 -      help
 -        Support for Freescale MXC/iMX-based family of processors
 -
  config ARCH_MXS
        bool "Freescale MXS-based"
        select ARCH_REQUIRE_GPIOLIB
@@@ -911,6 -924,7 +911,7 @@@ config ARCH_DAVINC
        select GENERIC_IRQ_CHIP
        select HAVE_IDE
        select NEED_MACH_GPIO_H
+       select USE_OF
        select ZONE_DMA
        help
          Support for TI's DaVinci platform.
@@@ -924,6 -938,7 +925,6 @@@ config ARCH_OMA
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
 -      select NEED_MACH_GPIO_H
        help
          Support for TI's OMAP platform (OMAP1/2/3/4).
  
@@@ -945,7 -960,7 +946,7 @@@ config ARCH_ZYN
        bool "Xilinx Zynq ARM Cortex A9 Platform"
        select ARM_AMBA
        select ARM_GIC
 -      select CLKDEV_LOOKUP
 +      select COMMON_CLK
        select CPU_V7
        select GENERIC_CLOCKEVENTS
        select ICST
@@@ -1044,7 -1059,7 +1045,7 @@@ source "arch/arm/mach-msm/Kconfig
  
  source "arch/arm/mach-mv78xx0/Kconfig"
  
 -source "arch/arm/plat-mxc/Kconfig"
 +source "arch/arm/mach-imx/Kconfig"
  
  source "arch/arm/mach-mxs/Kconfig"
  
@@@ -1589,8 -1604,8 +1590,8 @@@ config NR_CPU
        default "4"
  
  config HOTPLUG_CPU
 -      bool "Support for hot-pluggable CPUs (EXPERIMENTAL)"
 -      depends on SMP && HOTPLUG && EXPERIMENTAL
 +      bool "Support for hot-pluggable CPUs"
 +      depends on SMP && HOTPLUG
        help
          Say Y here to experiment with turning CPUs off and on.  CPUs
          can be controlled through /sys/devices/system/cpu.
@@@ -1631,8 -1646,8 +1632,8 @@@ config H
        default 100
  
  config THUMB2_KERNEL
 -      bool "Compile the kernel in Thumb-2 mode (EXPERIMENTAL)"
 -      depends on CPU_V7 && !CPU_V6 && !CPU_V6K && EXPERIMENTAL
 +      bool "Compile the kernel in Thumb-2 mode"
 +      depends on CPU_V7 && !CPU_V6 && !CPU_V6K
        select AEABI
        select ARM_ASM_UNIFIED
        select ARM_UNWIND
@@@ -1836,7 -1851,6 +1837,7 @@@ config XEN_DOM
  config XEN
        bool "Xen guest support on ARM (EXPERIMENTAL)"
        depends on EXPERIMENTAL && ARM && OF
 +      depends on CPU_V7 && !CPU_V6
        help
          Say Y if you want to run Linux in a Virtual Machine on Xen on ARM.