From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 28 Mar 2012 19:34:33 +0000 (-0700)
Subject: Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.4-rc1~71
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=09893ee84591b0417a9186a7e7cf1503ccf99ac2;p=users%2Fjedix%2Flinux-maple.git

Merge tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

Pull "ARM: More device tree support updates" from Olof Johansson:
 "This branch contains a number of updates for device tree support on
  several ARM platforms, in particular:

   * AT91 continues the device tree conversion adding support for a
     number of on-chip drivers and other functionality
   * ux500 adds probing of some of the core SoC blocks through device
     tree
   * Initial device tree support for ST SPEAr600 platforms
   * kirkwood continues the conversion to device-tree probing"

Manually merge arch/arm/mach-ux500/Kconfig due to MACH_U8500 rename, and
drivers/usb/gadget/at91_udc.c due to header file include cleanups.

Also do an "evil merge" for the MACH_U8500 config option rename that the
affected RMI4 touchscreen driver in staging.  It's called MACH_MOP500
now, and it was missed during previous merges.

* tag 'dt2' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: (48 commits)
  ARM: SPEAr600: Add device-tree support to SPEAr600 boards
  ARM: ux500: Provide local timer support for Device Tree
  ARM: ux500: Enable PL022 SSP Controller in Device Tree
  ARM: ux500: Enable PL310 Level 2 Cache Controller in Device Tree
  ARM: ux500: Enable PL011 AMBA UART Controller for Device Tree
  ARM: ux500: Enable Cortex-A9 GIC (Generic Interrupt Controller) in Device Tree
  ARM: ux500: db8500: list most devices in the snowball device tree
  ARM: ux500: split dts file for snowball into generic part
  ARM: ux500: combine the board init functions for DT boot
  ARM: ux500: Initial Device Tree support for Snowball
  ARM: ux500: CONFIG: Enable Device Tree support for future endeavours
  ARM: kirkwood: use devicetree for rtc-mv
  ARM: kirkwood: rtc-mv devicetree bindings
  ARM: kirkwood: fdt: define uart[01] as disabled, enable uart0
  ARM: kirkwood: fdt: facilitate new boards during fdt migration
  ARM: kirkwood: fdt: absorb kirkwood_init()
  ARM: kirkwood: fdt: use mrvl ticker symbol
  ARM: orion: wdt: use resource vice direct access
  ARM: Kirkwood: Remove tclk from kirkwood_asoc_platform_data.
  ARM: orion: spi: remove enable_clock_fix which is not used
  ...
---

09893ee84591b0417a9186a7e7cf1503ccf99ac2
diff --cc arch/arm/mach-ux500/Kconfig
index 8904d18de01a,ea908c66aebd..880d02ec89d4
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@@ -50,14 -51,11 +50,20 @@@ config MACH_U550
  	help
  	  Include support for the U5500 development platform.
  
 +config UX500_AUTO_PLATFORM
 +	def_bool y
 +	depends on !MACH_U5500
 +	select MACH_MOP500
 +	help
 +	  At least one platform needs to be selected in order to build
 +	  a working kernel. If everything else is disabled, this
 +	  automatically enables MACH_MOP500.
++
+ config MACH_UX500_DT
+ 	bool "Generic U8500 support using device tree"
 -	depends on MACH_U8500
++	depends on MACH_MOP500
+ 	select USE_OF
+ 
  endmenu
  
  config UX500_DEBUG_UART
diff --cc drivers/staging/ste_rmi4/Makefile
index 176f46900571,176f46900571..e4c03351420f
--- a/drivers/staging/ste_rmi4/Makefile
+++ b/drivers/staging/ste_rmi4/Makefile
@@@ -2,4 -2,4 +2,4 @@@
  # Makefile for the RMI4 touchscreen driver.
  #
  obj-$(CONFIG_TOUCHSCREEN_SYNAPTICS_I2C_RMI4) += synaptics_i2c_rmi4.o
--obj-$(CONFIG_MACH_U8500) += board-mop500-u8500uib-rmi4.o
++obj-$(CONFIG_MACH_MOP500) += board-mop500-u8500uib-rmi4.o
diff --cc drivers/usb/gadget/at91_udc.c
index 2db5f68f7960,4063209fe8da..36fd2b4b49a2
--- a/drivers/usb/gadget/at91_udc.c
+++ b/drivers/usb/gadget/at91_udc.c
@@@ -29,6 -29,9 +29,8 @@@
  #include <linux/clk.h>
  #include <linux/usb/ch9.h>
  #include <linux/usb/gadget.h>
 -#include <linux/prefetch.h>
+ #include <linux/of.h>
+ #include <linux/of_gpio.h>
  
  #include <asm/byteorder.h>
  #include <mach/hardware.h>