diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-generic.c')
-rw-r--r-- | arch/arm/mach-omap2/board-generic.c | 27 |
1 files changed, 22 insertions, 5 deletions
diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c index 601ecdfb1cf9..f0715a369c44 100644 --- a/arch/arm/mach-omap2/board-generic.c +++ b/arch/arm/mach-omap2/board-generic.c | |||
@@ -57,7 +57,7 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)") | |||
57 | .init_machine = omap_generic_init, | 57 | .init_machine = omap_generic_init, |
58 | .timer = &omap2_timer, | 58 | .timer = &omap2_timer, |
59 | .dt_compat = omap242x_boards_compat, | 59 | .dt_compat = omap242x_boards_compat, |
60 | .restart = omap_prcm_restart, | 60 | .restart = omap2xxx_restart, |
61 | MACHINE_END | 61 | MACHINE_END |
62 | #endif | 62 | #endif |
63 | 63 | ||
@@ -76,7 +76,7 @@ DT_MACHINE_START(OMAP243X_DT, "Generic OMAP2430 (Flattened Device Tree)") | |||
76 | .init_machine = omap_generic_init, | 76 | .init_machine = omap_generic_init, |
77 | .timer = &omap2_timer, | 77 | .timer = &omap2_timer, |
78 | .dt_compat = omap243x_boards_compat, | 78 | .dt_compat = omap243x_boards_compat, |
79 | .restart = omap_prcm_restart, | 79 | .restart = omap2xxx_restart, |
80 | MACHINE_END | 80 | MACHINE_END |
81 | #endif | 81 | #endif |
82 | 82 | ||
@@ -95,7 +95,24 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)") | |||
95 | .init_machine = omap_generic_init, | 95 | .init_machine = omap_generic_init, |
96 | .timer = &omap3_timer, | 96 | .timer = &omap3_timer, |
97 | .dt_compat = omap3_boards_compat, | 97 | .dt_compat = omap3_boards_compat, |
98 | .restart = omap_prcm_restart, | 98 | .restart = omap3xxx_restart, |
99 | MACHINE_END | ||
100 | |||
101 | static const char *omap3_gp_boards_compat[] __initdata = { | ||
102 | "ti,omap3-beagle", | ||
103 | NULL, | ||
104 | }; | ||
105 | |||
106 | DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)") | ||
107 | .reserve = omap_reserve, | ||
108 | .map_io = omap3_map_io, | ||
109 | .init_early = omap3430_init_early, | ||
110 | .init_irq = omap_intc_of_init, | ||
111 | .handle_irq = omap3_intc_handle_irq, | ||
112 | .init_machine = omap_generic_init, | ||
113 | .timer = &omap3_secure_timer, | ||
114 | .dt_compat = omap3_gp_boards_compat, | ||
115 | .restart = omap3xxx_restart, | ||
99 | MACHINE_END | 116 | MACHINE_END |
100 | #endif | 117 | #endif |
101 | 118 | ||
@@ -134,7 +151,7 @@ DT_MACHINE_START(OMAP4_DT, "Generic OMAP4 (Flattened Device Tree)") | |||
134 | .init_late = omap4430_init_late, | 151 | .init_late = omap4430_init_late, |
135 | .timer = &omap4_timer, | 152 | .timer = &omap4_timer, |
136 | .dt_compat = omap4_boards_compat, | 153 | .dt_compat = omap4_boards_compat, |
137 | .restart = omap_prcm_restart, | 154 | .restart = omap44xx_restart, |
138 | MACHINE_END | 155 | MACHINE_END |
139 | #endif | 156 | #endif |
140 | 157 | ||
@@ -154,6 +171,6 @@ DT_MACHINE_START(OMAP5_DT, "Generic OMAP5 (Flattened Device Tree)") | |||
154 | .init_machine = omap_generic_init, | 171 | .init_machine = omap_generic_init, |
155 | .timer = &omap5_timer, | 172 | .timer = &omap5_timer, |
156 | .dt_compat = omap5_boards_compat, | 173 | .dt_compat = omap5_boards_compat, |
157 | .restart = omap_prcm_restart, | 174 | .restart = omap44xx_restart, |
158 | MACHINE_END | 175 | MACHINE_END |
159 | #endif | 176 | #endif |