From: Arnd Bergmann <arnd@arndb.de>
Date: Thu, 20 Jun 2013 20:13:28 +0000 (+0200)
Subject: Merge branch 'next/drivers' into for-next
X-Git-Tag: next-20130628~18^2~34
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=435f4c6d5242317472b220a5fa0e82ae25e58a8a;p=karo-tx-linux.git

Merge branch 'next/drivers' into for-next

Conflicts:
	arch/arm/mach-omap2/devices.c
	arch/arm/mach-picoxcell/common.c
	arch/arm/mach-ux500/cpu-db8500.c
---

435f4c6d5242317472b220a5fa0e82ae25e58a8a
diff --cc arch/arm/mach-omap2/devices.c
index 403c211e35d0,73762accd128..210cd7541683
--- a/arch/arm/mach-omap2/devices.c
+++ b/arch/arm/mach-omap2/devices.c
@@@ -20,7 -19,9 +20,9 @@@
  #include <linux/of.h>
  #include <linux/pinctrl/machine.h>
  #include <linux/platform_data/omap4-keypad.h>
 -#include <linux/platform_data/omap_ocp2scp.h>
+ #include <linux/platform_data/mailbox-omap.h>
+ #include <linux/usb/omap_control_usb.h>
 +#include <linux/wl12xx.h>
  
  #include <asm/mach-types.h>
  #include <asm/mach/map.h>
diff --cc arch/arm/mach-picoxcell/common.c
index aa6a7e0e80a4,7cde0424d33c..b13f51bc35cf
--- a/arch/arm/mach-picoxcell/common.c
+++ b/arch/arm/mach-picoxcell/common.c
@@@ -8,10 -8,13 +8,9 @@@
   * All enquiries to support@picochip.com
   */
  #include <linux/delay.h>
 -#include <linux/irq.h>
 -#include <linux/irqchip.h>
 -#include <linux/irqdomain.h>
  #include <linux/of.h>
  #include <linux/of_address.h>
 -#include <linux/of_irq.h>
  #include <linux/of_platform.h>
- #include <linux/dw_apb_timer.h>
  
  #include <asm/mach/arch.h>
  #include <asm/mach/map.h>
@@@ -80,7 -85,8 +79,6 @@@ static void picoxcell_wdt_restart(char 
  
  DT_MACHINE_START(PICOXCELL, "Picochip picoXcell")
  	.map_io		= picoxcell_map_io,
- 	.init_time	= dw_apb_timer_init,
 -	.nr_irqs	= NR_IRQS_LEGACY,
 -	.init_irq	= irqchip_init,
  	.init_machine	= picoxcell_init_machine,
  	.dt_compat	= picoxcell_dt_match,
  	.restart	= picoxcell_wdt_restart,
diff --cc arch/arm/mach-s3c24xx/Kconfig
index 0adb2b85f830,ed8aadc646f9..6d9252e081ce
--- a/arch/arm/mach-s3c24xx/Kconfig
+++ b/arch/arm/mach-s3c24xx/Kconfig
@@@ -28,10 -28,9 +28,10 @@@ config CPU_S3C241
  	select CPU_ARM920T
  	select CPU_LLSERIAL_S3C2410
  	select S3C2410_CLOCK
- 	select S3C2410_CPUFREQ if CPU_FREQ_S3C24XX
+ 	select ARM_S3C2410_CPUFREQ if ARM_S3C24XX_CPUFREQ
  	select S3C2410_PM if PM
  	select SAMSUNG_HRT
 +	select SAMSUNG_WDT_RESET
  	help
  	  Support for S3C2410 and S3C2410A family from the S3C24XX line
  	  of Samsung Mobile CPUs.
diff --cc arch/arm/mach-ux500/cpu-db8500.c
index 7669a49fb6fb,f63847dabe7d..27e55665dbb0
--- a/arch/arm/mach-ux500/cpu-db8500.c
+++ b/arch/arm/mach-ux500/cpu-db8500.c
@@@ -330,16 -285,8 +300,13 @@@ static void __init u8500_init_machine(v
  	else if (of_machine_is_compatible("st-ericsson,ccu9540")) {}
  		/* TODO: Add pinmaps for ccu9540 board. */
  
- 	/* TODO: Export SoC, USB, cpu-freq and DMA40 */
- 	parent = u8500_of_init_devices();
- 
 -	/* automatically probe child nodes of db8500 device */
 -	of_platform_populate(NULL, u8500_local_bus_nodes, u8500_auxdata_lookup, parent);
 +	/* automatically probe child nodes of dbx5x0 devices */
 +	if (of_machine_is_compatible("st-ericsson,u8540"))
 +		of_platform_populate(NULL, u8500_local_bus_nodes,
 +				     u8540_auxdata_lookup, parent);
 +	else
 +		of_platform_populate(NULL, u8500_local_bus_nodes,
 +				     u8500_auxdata_lookup, parent);
  }
  
  static const char * stericsson_dt_platform_compat[] = {