OMAP: Add initial support for DT on OMAP3 & OMAP4

Add SoC specific map_io function to be used by the generic DT board file. This is an intermediate step before having some generic DT aware map_io function.

Signed-off-by Benoit Cousson <[email protected]>

Cc Tony Lindgren <[email protected]>

---
 arch/arm/mach-omap2/common.c             |   18 ++++++++++++++++++
 arch/arm/plat-omap/include/plat/common.h |    4 ++++
 2 files changed, 22 insertions(+), 0 deletions(-)

arch/arm/mach-omap2/common.c +18 -0

index 3f20cbb..de61f15 100644
@@ -56,6 +56,12 @@ void __init omap2_set_globals_242x(void)
 {
 	__omap2_set_globals(&omap242x_globals);
 }
+
+void __init omap242x_map_io(void)
+{
+	omap2_set_globals_242x();
+	omap242x_map_common_io();
+}
 #endif
 
 #if defined(CONFIG_SOC_OMAP2430)

@@ -74,6 +80,12 @@ void __init omap2_set_globals_243x(void)
 {
 	__omap2_set_globals(&omap243x_globals);
 }
+
+void __init omap243x_map_io(void)
+{
+	omap2_set_globals_243x();
+	omap243x_map_common_io();
+}
 #endif
 
 #if defined(CONFIG_ARCH_OMAP3)

@@ -138,5 +150,11 @@ void __init omap2_set_globals_443x(void)
 	omap2_set_globals_control(&omap4_globals);
 	omap2_set_globals_prcm(&omap4_globals);
 }
+
+void __init omap4_map_io(void)
+{
+	omap2_set_globals_443x();
+	omap44xx_map_common_io();
+}
 #endif
 

arch/arm/plat-omap/include/plat/common.h +4 -0

index 5cac97e..abda2c7 100644
@@ -83,7 +83,11 @@ void omap2_set_globals_sdrc(struct omap_globals *);
 void omap2_set_globals_control(struct omap_globals *);
 void omap2_set_globals_prcm(struct omap_globals *);
 
+void omap242x_map_io(void);
+void omap243x_map_io(void);
 void omap3_map_io(void);
+void omap4_map_io(void);
+
 
 /**
  * omap_test_timeout - busy-loop, testing a condition

Signature · 1 line

1.7.0.4

Quoted 3 lines · Benoit Cousson

Add SoC specific map_io function to be used by the generic DT board file. This is an intermediate step before having some generic DT aware map_io function.

Thanks, I'll apply this into cleanup branch and with the related conversion of board files.

Add SoC specific map_io function to be used by the generic DT board file. This is an intermediate step before having some generic DT aware map_io function.

Signed-off-by Benoit Cousson <[email protected]>

Cc Tony Lindgren <[email protected]>

Hello Benoit,

Le Fri, 23 Sep 2011 22:23:09 +0200,
Benoit Cousson<[email protected]> a ?crit :

Quoted 4 lines

Add SoC specific map_io function to be used by the generic DT board file. This is an intermediate step before having some generic DT aware map_io function.

Quoted 2 lines

Signed-off-by Benoit Cousson<[email protected]>

Cc Tony Lindgren<[email protected]>

Do you know if some progress has been made on having a generic DT aware map_io function, or is the per-SoC ->map_io() function still the recommended way of handling SoC having different requirements of static mappings at boot time?

Salut Thomas,

Sorry for the delay.

Quoted 12 lines · Thomas Petazzoni

Hello Benoit,

Le Fri, 23 Sep 2011 22:23:09 +0200,
Benoit Cousson<[email protected]> a ?crit :

Quoted 6 lines

Add SoC specific map_io function to be used by the generic DT board file. This is an intermediate step before having some generic DT aware map_io function.

Signed-off-by Benoit Cousson<[email protected]>

Cc Tony Lindgren<[email protected]>

Quoted 4 lines

Do you know if some progress has been made on having a generic DT aware map_io function, or is the per-SoC ->map_io() function still the recommended way of handling SoC having different requirements of static mappings at boot time?

Mmm, Maybe I'm wrong, but I'm not sure people are really pushing to store that inside DT. But to be honest, I don't really know :-)

Based on the original omap4-panda.dts file from Manju.
http://www.spinics.net/lists/linux-omap/msg55836.html

Add memory information and a default bootargs to allow a boot from RAMDISK.

Signed-off-by Benoit Cousson <[email protected]>

Cc Grant Likely <[email protected]>

Cc G, Manjunath Kondaiah <[email protected]>

---
 arch/arm/boot/dts/omap4-panda.dts |   29 +++++++++++++++++++++++++++++
 1 files changed, 29 insertions(+), 0 deletions(-)
 create mode 100644 arch/arm/boot/dts/omap4-panda.dts

arch/arm/boot/dts/omap4-panda.dts new file +12 -0

new file mode 100644
index 0000000..c702657
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+/include/ "omap4.dtsi"
+
+/ {

arch/arm/boot/dts/omap4-panda.dts new file +7 -0

+	};
+
+	memory {
+		device_type = "memory";
+		reg = <0x80000000 0x40000000>; /* 1 GB */
+	};
+};

Signature · 1 line

1.7.0.4

Quoted 39 lines · Benoit Cousson

Based on the original omap4-panda.dts file from Manju.
http://www.spinics.net/lists/linux-omap/msg55836.html

Add memory information and a default bootargs to allow a boot from RAMDISK.

Signed-off-by Benoit Cousson<[email protected]>

Cc Grant Likely<[email protected]>

Cc G, Manjunath Kondaiah<[email protected]>

---
  arch/arm/boot/dts/omap4-panda.dts |   29 +++++++++++++++++++++++++++++
  1 files changed, 29 insertions(+), 0 deletions(-)

create mode 100644 arch/arm/boot/dts/omap4-panda.dts

arch/arm/boot/dts/omap4-panda.dts new file +19 -0

new file mode 100644
index 0000000..c702657
@@ -0,0 +1,29 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+/dts-v1/;
+
+/include/ "omap4.dtsi"
+
+/ {
+	model = "TI OMAP4 PandaBoard";
+	compatible = "ti,omap4-panda", "ti,omap4430", "ti,omap4";
+
+	/*
+	 * Since the initial device tree board file does not create any
+	 * devices (MMC, network...), the only way to boot is to provide a
+	 * ramdisk.

arch/arm/boot/dts/omap4-panda.dts line 22

Quoted 3 lines

arch/arm/boot/dts/omap4-panda.dts new file +3 -0

+	 */
+	chosen {
+		bootargs = "root=/dev/ram0 rw console=ttyO2,115200n8 initrd=0x81600000,20M ramdisk_size=20480 no_console_suspend debug";

Generally, we don't want bootargs in the .dts files; we want them added to the .dtb by the boot firmware. However, we are bootstrapping here, so I'm okay with it in the short term until firmware matures a bit more.

Re-cycle the original board-generic file to support Device Tree for every OMAP2+ variants.
Note: Since it is a completely new content in the existing file I removed the original copyright.

- * Code for generic OMAP2 board. Should work on many OMAP2 systems where
- * the bootloader passes the board-specific data to the kernel.
- * Do not put any board specific code to this file; create a new machine
- * type if you need custom low-level initializations.
+ * Support for generic OMAP2+ device tree boards.

Quoted 4 lines · Benoit Cousson

Re-cycle the original board-generic file to support Device Tree for every OMAP2+ variants.
Note: Since it is a completely new content in the existing file I removed the original copyright.

I'd suggest just keeping it, maybe just update the comments accordingly?

That's because Copyrights in general just don't "disappear".

And the meaning of the board-generic is still the same as originally, that is do the booting based on board-specific data passed from the bootloader like the comments say:

Quoted 5 lines

- * Code for generic OMAP2 board. Should work on many OMAP2 systems where
- * the bootloader passes the board-specific data to the kernel.
- * Do not put any board specific code to this file; create a new machine
- * type if you need custom low-level initializations.
+ * Support for generic OMAP2+ device tree boards.

Quoted 6 lines · Tony Lindgren

Quoted 4 lines · Benoit Cousson

Re-cycle the original board-generic file to support Device Tree for every OMAP2+ variants.
Note: Since it is a completely new content in the existing file I removed the original copyright.

Quoted 2 lines

I'd suggest just keeping it, maybe just update the comments accordingly?

Do you mean keeping it and adding the comment? Or removing it and adding the comment?

Quoted 1 line

That's because Copyrights in general just don't "disappear".

OK, maybe, but I thought it is weird to keep an old copyright just because we re-use an already existing file since the content is different.

Re-cycle the original board-generic file to support Device Tree for every OMAP2+ variants.
Note: Since it is a completely new content in the existing file I removed the original copyright.

The current approach is an intermediate step before having only one machine descriptor that will use some generic DT aware functions.

Signed-off-by Benoit Cousson<[email protected]>

Cc Tony Lindgren<[email protected]>

---
  arch/arm/mach-omap2/Kconfig         |    8 ++-
  arch/arm/mach-omap2/board-generic.c |  129 ++++++++++++++++++++++------------
  2 files changed, 89 insertions(+), 48 deletions(-)

arch/arm/mach-omap2/Kconfig +6 -2

index 7edf802..5934a27 100644
@@ -106,9 +106,13 @@ comment "OMAP Board Type"
  	depends on ARCH_OMAP2PLUS
 
  config MACH_OMAP_GENERIC
-	bool "Generic OMAP board"
-	depends on ARCH_OMAP2
+	bool "Generic OMAP2+ board"
+	depends on ARCH_OMAP2PLUS
+	select USE_OF
  	default y
+	help
+	  Support for generic TI OMAP2+ boards using Flattened Device Tree.
+	  More information at Documentation/devicetree
 
  config MACH_OMAP2_TUSB6010
  	bool

arch/arm/mach-omap2/board-generic.c +83 -46

index e8d45d3..dcbd64c 100644
@@ -1,76 +1,113 @@
  /*
- * linux/arch/arm/mach-omap2/board-generic.c
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
   *
- * Copyright (C) 2005 Nokia Corporation
- * Author: Paul Mundt<[email protected]>
- *
- * Modified from mach-omap/omap1/board-generic.c
- *
- * Code for generic OMAP2 board. Should work on many OMAP2 systems where
- * the bootloader passes the board-specific data to the kernel.
- * Do not put any board specific code to this file; create a new machine
- * type if you need custom low-level initializations.
+ * Support for generic OMAP2+ device tree boards.
   *
   * This program is free software; you can redistribute it and/or modify
   * it under the terms of the GNU General Public License version 2 as
   * published by the Free Software Foundation.
   */
 
-#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<mach/hardware.h>
-#include<asm/mach-types.h>
  #include<asm/mach/arch.h>
-#include<asm/mach/map.h>
 
-#include<mach/gpio.h>
-#include<plat/usb.h>
  #include<plat/board.h>
  #include<plat/common.h>
+#include<mach/omap4-common.h>
 
-static struct omap_board_config_kernel generic_config[] = {
+
+static struct of_device_id omap_dt_match_table[] __initdata = {
+	{ .compatible = "simple-bus", },
+	{ .compatible = "ti,omap-infra", },
+	{ }
  };
 
-static void __init omap_generic_init_early(void)
-{
-	omap2_init_common_infrastructure();
-}
+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);
-}
 
-static void __init omap_generic_map_io(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();
-	}
+	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
  }
 
-/* XXX This machine entry name should be updated */
-MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
-	/* Maintainer: Paul Mundt<[email protected]>  */
-	.atag_offset	= 0x100,
+#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)")
  	.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)")
+	.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)")
+	.reserve	= omap_reserve,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3430_init_early,
+	.init_irq	= omap3_init_irq,
+	.init_machine	= omap_generic_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)")
+	.reserve	= omap_reserve,
+	.map_io		= omap4_map_io,
+	.init_early	= omap4430_init_early,
+	.init_irq	= gic_init_irq,
+	.init_machine	= omap_generic_init,
+	.timer		=&omap4_timer,
+	.dt_compat	= omap4_boards_compat,
  MACHINE_END
+#endif

Hi Benoit,

Quoted 5 lines · Benoit Cousson

Re-cycle the original board-generic file to support Device Tree for every OMAP2+ variants.
Note: Since it is a completely new content in the existing file I removed the original copyright.

Quoted 3 lines

The current approach is an intermediate step before having only one machine descriptor that will use some generic DT aware functions.

What config does this work with currently? If I use omap2plus_defconfig should I explicitly disable everything other than say CONFIG_ARCH_OMAP4 if I want it working on OMAP4?

regards,
Rajendra

Quoted 192 lines

Signed-off-by Benoit Cousson<[email protected]>

Cc Tony Lindgren<[email protected]>

---
   arch/arm/mach-omap2/Kconfig         |    8 ++-
   arch/arm/mach-omap2/board-generic.c |  129 ++++++++++++++++++++++------------
   2 files changed, 89 insertions(+), 48 deletions(-)

arch/arm/mach-omap2/Kconfig +6 -2

index 7edf802..5934a27 100644
@@ -106,9 +106,13 @@ comment "OMAP Board Type"
   	depends on ARCH_OMAP2PLUS
 
   config MACH_OMAP_GENERIC
-	bool "Generic OMAP board"
-	depends on ARCH_OMAP2
+	bool "Generic OMAP2+ board"
+	depends on ARCH_OMAP2PLUS
+	select USE_OF
   	default y
+	help
+	  Support for generic TI OMAP2+ boards using Flattened Device Tree.
+	  More information at Documentation/devicetree
 
   config MACH_OMAP2_TUSB6010
   	bool

arch/arm/mach-omap2/board-generic.c +83 -46

index e8d45d3..dcbd64c 100644
@@ -1,76 +1,113 @@
   /*
- * linux/arch/arm/mach-omap2/board-generic.c
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
    *
- * Copyright (C) 2005 Nokia Corporation
- * Author: Paul Mundt<[email protected]>
- *
- * Modified from mach-omap/omap1/board-generic.c
- *
- * Code for generic OMAP2 board. Should work on many OMAP2 systems where
- * the bootloader passes the board-specific data to the kernel.
- * Do not put any board specific code to this file; create a new machine
- * type if you need custom low-level initializations.
+ * Support for generic OMAP2+ device tree boards.
    *
    * This program is free software; you can redistribute it and/or modify
    * it under the terms of the GNU General Public License version 2 as
    * published by the Free Software Foundation.
    */
 
-#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<mach/hardware.h>
-#include<asm/mach-types.h>
   #include<asm/mach/arch.h>
-#include<asm/mach/map.h>
 
-#include<mach/gpio.h>
-#include<plat/usb.h>
   #include<plat/board.h>
   #include<plat/common.h>
+#include<mach/omap4-common.h>
 
-static struct omap_board_config_kernel generic_config[] = {
+
+static struct of_device_id omap_dt_match_table[] __initdata = {
+	{ .compatible = "simple-bus", },
+	{ .compatible = "ti,omap-infra", },
+	{ }
   };
 
-static void __init omap_generic_init_early(void)
-{
-	omap2_init_common_infrastructure();
-}
+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);
-}
 
-static void __init omap_generic_map_io(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();
-	}
+	of_platform_populate(NULL, omap_dt_match_table, NULL, NULL);
   }
 
-/* XXX This machine entry name should be updated */
-MACHINE_START(OMAP_GENERIC, "Generic OMAP24xx")
-	/* Maintainer: Paul Mundt<[email protected]>   */
-	.atag_offset	= 0x100,
+#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)")
   	.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)")
+	.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)")
+	.reserve	= omap_reserve,
+	.map_io		= omap3_map_io,
+	.init_early	= omap3430_init_early,
+	.init_irq	= omap3_init_irq,
+	.init_machine	= omap_generic_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)")
+	.reserve	= omap_reserve,
+	.map_io		= omap4_map_io,
+	.init_early	= omap4430_init_early,
+	.init_irq	= gic_init_irq,
+	.init_machine	= omap_generic_init,
+	.timer		=&omap4_timer,
+	.dt_compat	= omap4_boards_compat,
   MACHINE_END
+#endif

Still needed to boot until the i2c & twl driver is adapted to device-tree. Otherwise the voltage control code will try to access the twl and crash.

Quoted 3 lines · Benoit Cousson

Still needed to boot until the i2c & twl driver is adapted to device-tree. Otherwise the voltage control code will try to access the twl and crash.

That sounds OK to me for now. For merging these patches, how about the following:

- Kevin queues up the omap_device related changes

- Grant queues up the .dts changes

- I'll queue the map_io and board changes based on Kevin's omap_device changes

Quoted 8 lines · Tony Lindgren

Quoted 3 lines · Benoit Cousson

Still needed to boot until the i2c & twl driver is adapted to device-tree. Otherwise the voltage control code will try to access the twl and crash.

That sounds OK to me for now. For merging these patches, how about the following:

Quoted 6 lines

- Kevin queues up the omap_device related changes

- Grant queues up the .dts changes

- I'll queue the map_io and board changes based on Kevin's omap_device changes

Go ahead and queue up the .dts changes in your tree. No need to split them up.

Used the main OCP node to add bindings with the l3_noc driver. Remove l3_noc static device creation if DT is populated.

arch/arm/mach-omap2/devices.c +1 -0

@@ -16,6 +16,7 @@
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/slab.h>
+#include <linux/of.h>
 
 #include <mach/hardware.h>
 #include <mach/irqs.h>

Quoted 13 lines · Benoit Cousson

Used the main OCP node to add bindings with the l3_noc driver. Remove l3_noc static device creation if DT is populated.

arch/arm/mach-omap2/devices.c +1 -0

@@ -16,6 +16,7 @@
  #include<linux/clk.h>
  #include<linux/err.h>
  #include<linux/slab.h>
+#include<linux/of.h>
 
  #include<mach/hardware.h>
  #include<mach/irqs.h>

arch/arm/mach-omap2/devices.c static int __init omap4_l3_init(void) · line 87

Quoted 10 lines

arch/arm/mach-omap2/devices.c +4 -0

@@ -77,6 +78,10 @@ static int __init omap4_l3_init(void)
  	struct platform_device *pdev;
  	char oh_name[L3_MODULES_MAX_LEN];
 
+	/* If dtb is there, the devices will be created dynamically */
+	if (of_have_populated_dt())
+		return -ENODEV;
+
  	/*
  	 * To avoid code running on other OMAPs in
  	 * multi-omap builds

How about just remove omap3_l3_init and omap4_l3_init completely instead?

There should not be any need for the platform glue code if the driver, it's OK for us to require that either DT is passed from the bootloader or as appended DT as soon as the appended DT patches are merged.

Quoted 9 lines · Tony Lindgren

* Benoit Cousson<[email protected]> [110923 12:50]:

How about just remove omap3_l3_init and omap4_l3_init completely instead?

There should not be any need for the platform glue code if the driver, it's OK for us to require that either DT is passed from the bootloader or as appended DT as soon as the appended DT patches are merged.

Yeah, but we should still allow the others board files to work in case DT is not passed by the bootloader. Otherwise the DT support need to be added to every other boards, and in that case that generic board become useless. The effort / duplication will be much important if we start hacking every boards with some DT code in them.

Whereas that code is simple and will be removed easily when the DT migration will be completed.

Add nodes for devices used by PM code (mpu, dsp, iva).

Add an empty cpus node as well as recommended in the DT spec.

Remove mpu, dsp, iva devices init if dt is populated.

Signed-off-by Benoit Cousson <[email protected]>

Cc Grant Likely <[email protected]>

Cc Kevin Hilman <[email protected]>

---
 Documentation/devicetree/bindings/arm/omap/dsp.txt |   14 ++++++++++
 Documentation/devicetree/bindings/arm/omap/iva.txt |   19 ++++++++++++++
 Documentation/devicetree/bindings/arm/omap/mpu.txt |   27 ++++++++++++++++++++
 arch/arm/boot/dts/omap3.dtsi                       |   19 ++++++++++++++
 arch/arm/boot/dts/omap4.dtsi                       |   23 +++++++++++++++++
 arch/arm/mach-omap2/pm.c                           |    3 +-
 6 files changed, 104 insertions(+), 1 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/arm/omap/dsp.txt
 create mode 100644 Documentation/devicetree/bindings/arm/omap/iva.txt
 create mode 100644 Documentation/devicetree/bindings/arm/omap/mpu.txt

Documentation/devicetree/bindings/arm/omap/dsp.txt new file +14 -0

new file mode 100644
index 0000000..325feef
@@ -0,0 +1,14 @@
+* TI - DSP (Digital Signal Processor)
+
+TI DSP included in OMAP SoC
+
+Required properties:
+- compatible : Should be "ti,omap3-c64" for OMAP3 & 4
+- ti,hwmods: "dsp"
+
+Examples:
+
+dsp {
+    compatible = "ti,omap3-c64";
+    ti,hwmods = "dsp";
+};

Documentation/devicetree/bindings/arm/omap/iva.txt new file +19 -0

new file mode 100644
index 0000000..b889475
@@ -0,0 +1,19 @@
+* TI - IVA (Imaging and Video Accelerator) subsystem
+
+The IVA contain various audio, video or imaging HW accelerator
+depending of the version.
+
+Required properties:
+- compatible : Should be:
+  - "ti,ivahd" for OMAP4
+  - "ti,iva2.2" for OMAP3
+  - "ti,iva2.1" for OMAP2430
+  - "ti,iva1" for OMAP2420
+- ti,hwmods: "iva"
+
+Examples:
+
+iva {
+    compatible = "ti,ivahd", "ti,iva";
+    ti,hwmods = "iva";
+};

Documentation/devicetree/bindings/arm/omap/mpu.txt new file +27 -0

new file mode 100644
index 0000000..5ffbacd
@@ -0,0 +1,27 @@
+* TI - MPU (Main Processor Unit) subsystem
+
+The MPU subsystem contain one or several ARM cores
+depending of the version.
+The MPU contain CPUs, GIC, L2 cache and a local PRCM.
+
+Required properties:
+- compatible : Should be "ti,omap3-mpu" for OMAP3
+               Should be "ti,omap4-mpu" for OMAP4
+- ti,hwmods: "mpu"
+
+Examples:
+
+- For an OMAP4 SMP system:
+
+mpu {
+    compatible = "ti,omap4-mpu";
+    ti,hwmods = "mpu";
+};
+
+
+- For an OMAP3 monocore system:
+
+mpu {
+    compatible = "ti,omap3-mpu";
+    ti,hwmods = "mpu";
+};

arch/arm/boot/dts/omap3.dtsi +19 -0

index d558785..d202bb5 100644
@@ -13,12 +13,31 @@
 / {
 	compatible = "ti,omap3430", "ti,omap3";
 
+	cpus {
+		cpu at 0 {
+			compatible = "arm,cortex-a8";
+		};
+	};
+
 	/*
 	 * The soc node represents the soc top level view. It is uses for IPs
 	 * that are not memory mapped in the MPU view or for the MPU itself.
 	 */
 	soc {
 		compatible = "ti,omap-infra";
+		mpu {
+			compatible = "ti,omap3-mpu";
+			ti,hwmods = "mpu";
+		};
+
+		iva {
+			compatible = "ti,iva2.2";
+			ti,hwmods = "iva";
+
+			dsp {
+				compatible = "ti,omap3-c64";
+			};
+		};
 	};
 
 	/*

arch/arm/boot/dts/omap4.dtsi +23 -0

index b85a39d..4c61c82 100644
@@ -23,12 +23,35 @@
 	aliases {
 	};
 
+	cpus {
+		cpu at 0 {
+			compatible = "arm,cortex-a9";
+		};
+		cpu at 1 {
+			compatible = "arm,cortex-a9";
+		};
+	};
+
 	/*
 	 * The soc node represents the soc top level view. It is uses for IPs
 	 * that are not memory mapped in the MPU view or for the MPU itself.
 	 */
 	soc {
 		compatible = "ti,omap-infra";
+		mpu {
+			compatible = "ti,omap4-mpu";
+			ti,hwmods = "mpu";
+		};
+
+		dsp {
+			compatible = "ti,omap3-c64";
+			ti,hwmods = "dsp";
+		};
+
+		iva {
+			compatible = "ti,ivahd";
+			ti,hwmods = "iva";
+		};
 	};
 
 	/*

arch/arm/mach-omap2/pm.c +2 -1

index 1fd9576..640c266 100644
@@ -217,7 +217,8 @@ static void __init omap4_init_voltages(void)
 
 static int __init omap2_common_pm_init(void)
 {
-	omap2_init_processor_devices();
+	if (!of_have_populated_dt())
+		omap2_init_processor_devices();
 	omap_pm_if_init();
 
 	return 0;

Signature · 1 line

1.7.0.4