From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 1 Nov 2011 16:05:48 +0000 (+0100)
Subject: Merge branch 'next/cleanup2' into for-linus
X-Git-Tag: next-20111103~78^2~4
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=38b9c2164fc27127d4a3347c4774c70085b2a77e;p=karo-tx-linux.git

Merge branch 'next/cleanup2' into for-linus

Conflicts:
	arch/arm/mach-omap2/board-generic.c
---

38b9c2164fc27127d4a3347c4774c70085b2a77e
diff --cc arch/arm/mach-omap2/board-generic.c
index 7ac546219e5d,0c427976d62f..537db377af19
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@@ -15,61 -11,148 +11,148 @@@
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
 -
 +#include <linux/gpio.h>
 +#include <linux/kernel.h>
 +#include <linux/init.h>
 +#include <linux/device.h>
+ #include <linux/io.h>
+ #include <linux/of_platform.h>
+ #include <linux/irqdomain.h>
+ #include <linux/i2c/twl.h>
  
  #include <mach/hardware.h>
- #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
- #include <asm/mach/map.h>
  
 +#include <plat/usb.h>
  #include <plat/board.h>
  #include <plat/common.h>
+ #include <mach/omap4-common.h>
+ #include "common-board-devices.h"
+ 
+ /*
+  * XXX: Still needed to boot until the i2c & twl driver is adapted to
+  * device-tree
+  */
+ static struct twl4030_platform_data sdp4430_twldata = {
+ 	.irq_base	= TWL6030_IRQ_BASE,
+ 	.irq_end	= TWL6030_IRQ_END,
+ };
  
- static struct omap_board_config_kernel generic_config[] = {
+ static void __init omap4_i2c_init(void)
+ {
+ 	omap4_pmic_init("twl6030", &sdp4430_twldata);
+ }
+ 
+ static struct twl4030_platform_data beagle_twldata = {
+ 	.irq_base	= TWL4030_IRQ_BASE,
+ 	.irq_end	= TWL4030_IRQ_END,
  };
  
- static void __init omap_generic_init_early(void)
+ static void __init omap3_i2c_init(void)
  {
- 	omap2_init_common_infrastructure();
+ 	omap3_pmic_init("twl4030", &beagle_twldata);
  }
  
+ static struct of_device_id omap_dt_match_table[] __initdata = {
+ 	{ .compatible = "simple-bus", },
+ 	{ .compatible = "ti,omap-infra", },
+ 	{ }
+ };
+ 
+ static struct of_device_id intc_match[] __initdata = {
+ 	{ .compatible = "ti,omap3-intc", },
+ 	{ .compatible = "arm,cortex-a9-gic", },
+ 	{ }
+ };
+ 
  static void __init omap_generic_init(void)
  {
+ 	struct device_node *node = of_find_matching_node(NULL, intc_match);
+ 	if (node)
+ 		irq_domain_add_simple(node, 0);
+ 
  	omap_serial_init();
  	omap_sdrc_init(NULL, NULL);
- 	omap_board_config = generic_config;
- 	omap_board_config_size = ARRAY_SIZE(generic_config);
+ 
+ 	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
  }
  
- static void __init omap_generic_map_io(void)
+ static void __init omap4_init(void)
  {
- 	if (cpu_is_omap242x()) {
- 		omap2_set_globals_242x();
- 		omap242x_map_common_io();
- 	} else if (cpu_is_omap243x()) {
- 		omap2_set_globals_243x();
- 		omap243x_map_common_io();
- 	} else if (cpu_is_omap34xx()) {
- 		omap2_set_globals_3xxx();
- 		omap34xx_map_common_io();
- 	} else if (cpu_is_omap44xx()) {
- 		omap2_set_globals_443x();
- 		omap44xx_map_common_io();
- 	}
+ 	omap4_i2c_init();
+ 	omap_generic_init();
  }
  
- /* XXX This machine entry name should be updated */
- MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
- 	/* Maintainer: Paul Mundt <paul.mundt@nokia.com> */
- 	.atag_offset	= 0x100,
+ static void __init omap3_init(void)
+ {
+ 	omap3_i2c_init();
+ 	omap_generic_init();
+ }
+ 
+ #if defined(CONFIG_SOC_OMAP2420)
+ static const char *omap242x_boards_compat[] __initdata = {
+ 	"ti,omap2420",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
 -	.atag_offset	= 0x100,
  	.reserve	= omap_reserve,
- 	.map_io		= omap_generic_map_io,
- 	.init_early	= omap_generic_init_early,
+ 	.map_io		= omap242x_map_io,
+ 	.init_early	= omap2420_init_early,
  	.init_irq	= omap2_init_irq,
  	.init_machine	= omap_generic_init,
  	.timer		= &omap2_timer,
+ 	.dt_compat	= omap242x_boards_compat,
+ MACHINE_END
+ #endif
+ 
+ #if defined(CONFIG_SOC_OMAP2430)
+ static const char *omap243x_boards_compat[] __initdata = {
+ 	"ti,omap2430",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)")
 -	.atag_offset	= 0x100,
+ 	.reserve	= omap_reserve,
+ 	.map_io		= omap243x_map_io,
+ 	.init_early	= omap2430_init_early,
+ 	.init_irq	= omap2_init_irq,
+ 	.init_machine	= omap_generic_init,
+ 	.timer		= &omap2_timer,
+ 	.dt_compat	= omap243x_boards_compat,
+ MACHINE_END
+ #endif
+ 
+ #if defined(CONFIG_ARCH_OMAP3)
+ static const char *omap3_boards_compat[] __initdata = {
+ 	"ti,omap3",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
 -	.atag_offset	= 0x100,
+ 	.reserve	= omap_reserve,
+ 	.map_io		= omap3_map_io,
+ 	.init_early	= omap3430_init_early,
+ 	.init_irq	= omap3_init_irq,
+ 	.init_machine	= omap3_init,
+ 	.timer		= &omap3_timer,
+ 	.dt_compat	= omap3_boards_compat,
+ MACHINE_END
+ #endif
+ 
+ #if defined(CONFIG_ARCH_OMAP4)
+ static const char *omap4_boards_compat[] __initdata = {
+ 	"ti,omap4",
+ 	NULL,
+ };
+ 
+ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)")
 -	.atag_offset	= 0x100,
+ 	.reserve	= omap_reserve,
+ 	.map_io		= omap4_map_io,
+ 	.init_early	= omap4430_init_early,
+ 	.init_irq	= gic_init_irq,
+ 	.init_machine	= omap4_init,
+ 	.timer		= &omap4_timer,
+ 	.dt_compat	= omap4_boards_compat,
  MACHINE_END
+ #endif