diff options
| -rw-r--r-- | arch/arm/boot/dts/omap3-beagle-xm.dts | 2 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 18 |
2 files changed, 19 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/omap3-beagle-xm.dts b/arch/arm/boot/dts/omap3-beagle-xm.dts index 0c514dc8460c..2816bf612672 100644 --- a/arch/arm/boot/dts/omap3-beagle-xm.dts +++ b/arch/arm/boot/dts/omap3-beagle-xm.dts | |||
| @@ -11,7 +11,7 @@ | |||
| 11 | 11 | ||
| 12 | / { | 12 | / { |
| 13 | model = "TI OMAP3 BeagleBoard xM"; | 13 | model = "TI OMAP3 BeagleBoard xM"; |
| 14 | compatible = "ti,omap3-beagle-xm", "ti,omap3-beagle", "ti,omap3"; | 14 | compatible = "ti,omap3-beagle-xm", "ti,omap36xx", "ti,omap3"; |
| 15 | 15 | ||
| 16 | cpus { | 16 | cpus { |
| 17 | cpu@0 { | 17 | cpu@0 { |
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 39c78387ddec..87162e1b94a5 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
| @@ -129,6 +129,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") | |||
| 129 | .restart = omap3xxx_restart, | 129 | .restart = omap3xxx_restart, |
| 130 | MACHINE_END | 130 | MACHINE_END |
| 131 | 131 | ||
| 132 | static const char *omap36xx_boards_compat[] __initdata = { | ||
| 133 | "ti,omap36xx", | ||
| 134 | NULL, | ||
| 135 | }; | ||
| 136 | |||
| 137 | DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)") | ||
| 138 | .reserve = omap_reserve, | ||
| 139 | .map_io = omap3_map_io, | ||
| 140 | .init_early = omap3630_init_early, | ||
| 141 | .init_irq = omap_intc_of_init, | ||
| 142 | .handle_irq = omap3_intc_handle_irq, | ||
| 143 | .init_machine = omap_generic_init, | ||
| 144 | .init_late = omap3_init_late, | ||
| 145 | .init_time = omap3_sync32k_timer_init, | ||
| 146 | .dt_compat = omap36xx_boards_compat, | ||
| 147 | .restart = omap3xxx_restart, | ||
| 148 | MACHINE_END | ||
| 149 | |||
| 132 | static const char *omap3_gp_boards_compat[] __initdata = { | 150 | static const char *omap3_gp_boards_compat[] __initdata = { |
| 133 | "ti,omap3-beagle", | 151 | "ti,omap3-beagle", |
| 134 | "timll,omap3-devkit8000", | 152 | "timll,omap3-devkit8000", |
