diff options
author | R Sricharan <r.sricharan@ti.com> | 2012-05-09 14:04:56 -0400 |
---|---|---|
committer | Santosh Shilimkar <santosh.shilimkar@ti.com> | 2012-07-09 09:44:39 -0400 |
commit | 0c1b6fac9416a4b662f5b23572729120b7ae8074 (patch) | |
tree | a9c1a3f429f03c502f52dd01aa2ae0c6826bb8d2 | |
parent | c4082d499fa2c90c089830700e34b64e3b924bb8 (diff) |
ARM: OMAP5: board-generic: Add device tree support
Adding the minimal support for OMAP5 evm board
with device tree.
Reviewed-by: Benoit Cousson <b-cousson@ti.com>
Signed-off-by: R Sricharan <r.sricharan@ti.com>
Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
-rw-r--r-- | Documentation/devicetree/bindings/arm/omap/omap.txt | 3 | ||||
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 19 | ||||
-rw-r--r-- | arch/arm/mach-omap2/omap4-common.c | 1 |
3 files changed, 23 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/arm/omap/omap.txt b/Documentation/devicetree/bindings/arm/omap/omap.txt index e78e8bccac30..3d450f65a17b 100644 --- a/Documentation/devicetree/bindings/arm/omap/omap.txt +++ b/Documentation/devicetree/bindings/arm/omap/omap.txt | |||
@@ -47,3 +47,6 @@ Boards: | |||
47 | 47 | ||
48 | - AM335X EVM : Software Developement Board for AM335x | 48 | - AM335X EVM : Software Developement Board for AM335x |
49 | compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3" | 49 | compatible = "ti,am335x-evm", "ti,am33xx", "ti,omap3" |
50 | |||
51 | - OMAP5 EVM : Evaluation Module | ||
52 | compatible = "ti,omap5-evm", "ti,omap5" | ||
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 716e6b1a41de..6f93a20536ea 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -138,3 +138,22 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") | |||
138 | .restart = omap_prcm_restart, | 138 | .restart = omap_prcm_restart, |
139 | MACHINE_END | 139 | MACHINE_END |
140 | #endif | 140 | #endif |
141 | |||
142 | #ifdef CONFIG_SOC_OMAP5 | ||
143 | static const char *omap5_boards_compat[] __initdata = { | ||
144 | "ti,omap5", | ||
145 | NULL, | ||
146 | }; | ||
147 | |||
148 | DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)") | ||
149 | .reserve = omap_reserve, | ||
150 | .map_io = omap5_map_io, | ||
151 | .init_early = omap5_init_early, | ||
152 | .init_irq = omap_gic_of_init, | ||
153 | .handle_irq = gic_handle_irq, | ||
154 | .init_machine = omap_generic_init, | ||
155 | .timer = &omap5_timer, | ||
156 | .dt_compat = omap5_boards_compat, | ||
157 | .restart = omap_prcm_restart, | ||
158 | MACHINE_END | ||
159 | #endif | ||
diff --git a/arch/arm/mach-omap2/omap4-common.c b/arch/arm/mach-omap2/omap4-common.c index f38d659869da..c29dee998a79 100644 --- a/arch/arm/mach-omap2/omap4-common.c +++ b/arch/arm/mach-omap2/omap4-common.c | |||
@@ -214,6 +214,7 @@ early_initcall(omap4_sar_ram_init); | |||
214 | 214 | ||
215 | static struct of_device_id irq_match[] __initdata = { | 215 | static struct of_device_id irq_match[] __initdata = { |
216 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, | 216 | { .compatible = "arm,cortex-a9-gic", .data = gic_of_init, }, |
217 | { .compatible = "arm,cortex-a15-gic", .data = gic_of_init, }, | ||
217 | { } | 218 | { } |
218 | }; | 219 | }; |
219 | 220 | ||