1 files changed, 17 insertions, 27 deletions

diff --git a/arch/arm/mach-omap2/board-generic.c b/arch/arm/mach-omap2/board-generic.c
index 9480997ba616..608079a1aba6 100644
--- a/arch/arm/mach-omap2/board-generic.c
+++ b/arch/arm/mach-omap2/board-generic.c
@@ -27,7 +27,7 @@
 #define gic_of_init             NULL
 #endif
 
-static struct of_device_id omap_dt_match_table[] __initdata = {
+static const struct of_device_id omap_dt_match_table[] __initconst = {
         { .compatible = "simple-bus", },
         { .compatible = "ti,omap-infra", },
         { }
@@ -43,7 +43,7 @@ static void __init omap_generic_init(void)
 }
 
 #ifdef CONFIG_SOC_OMAP2420
-static const char *omap242x_boards_compat[] __initconst = {
+static const char *const omap242x_boards_compat[] __initconst = {
         "ti,omap2420",
         NULL,
 };
@@ -52,8 +52,6 @@ DT_MACHINE_START(OMAP242X_DT, "Generic OMAP2420 (Flattened Device Tree)")
         .reserve        = omap_reserve,
         .map_io         = omap242x_map_io,
         .init_early     = omap2420_init_early,
-        .init_irq       = omap_intc_of_init,
-        .handle_irq     = omap2_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_time      = omap2_sync32k_timer_init,
         .dt_compat      = omap242x_boards_compat,
@@ -62,7 +60,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_SOC_OMAP2430
-static const char *omap243x_boards_compat[] __initconst = {
+static const char *const omap243x_boards_compat[] __initconst = {
         "ti,omap2430",
         NULL,
 };
@@ -71,8 +69,6 @@ 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       = omap_intc_of_init,
-        .handle_irq     = omap2_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_time      = omap2_sync32k_timer_init,
         .dt_compat      = omap243x_boards_compat,
@@ -81,7 +77,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_ARCH_OMAP3
-static const char *omap3_boards_compat[] __initconst = {
+static const char *const omap3_boards_compat[] __initconst = {
         "ti,omap3430",
         "ti,omap3",
         NULL,
@@ -91,8 +87,6 @@ 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       = omap_intc_of_init,
-        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_late      = omap3_init_late,
         .init_time      = omap3_sync32k_timer_init,
@@ -100,7 +94,7 @@ DT_MACHINE_START(OMAP3_DT, "Generic OMAP3 (Flattened Device Tree)")
         .restart        = omap3xxx_restart,
 MACHINE_END
 
-static const char *omap36xx_boards_compat[] __initconst = {
+static const char *const omap36xx_boards_compat[] __initconst = {
         "ti,omap36xx",
         NULL,
 };
@@ -109,8 +103,6 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
         .reserve        = omap_reserve,
         .map_io         = omap3_map_io,
         .init_early     = omap3630_init_early,
-        .init_irq       = omap_intc_of_init,
-        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_late      = omap3_init_late,
         .init_time      = omap3_sync32k_timer_init,
@@ -118,7 +110,7 @@ DT_MACHINE_START(OMAP36XX_DT, "Generic OMAP36xx (Flattened Device Tree)")
         .restart        = omap3xxx_restart,
 MACHINE_END
 
-static const char *omap3_gp_boards_compat[] __initconst = {
+static const char *const omap3_gp_boards_compat[] __initconst = {
         "ti,omap3-beagle",
         "timll,omap3-devkit8000",
         NULL,
@@ -128,8 +120,6 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
         .reserve        = omap_reserve,
         .map_io         = omap3_map_io,
         .init_early     = omap3430_init_early,
-        .init_irq       = omap_intc_of_init,
-        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_late      = omap3_init_late,
         .init_time      = omap3_secure_sync32k_timer_init,
@@ -137,7 +127,7 @@ DT_MACHINE_START(OMAP3_GP_DT, "Generic OMAP3-GP (Flattened Device Tree)")
         .restart        = omap3xxx_restart,
 MACHINE_END
 
-static const char *am3517_boards_compat[] __initconst = {
+static const char *const am3517_boards_compat[] __initconst = {
         "ti,am3517",
         NULL,
 };
@@ -146,8 +136,6 @@ DT_MACHINE_START(AM3517_DT, "Generic AM3517 (Flattened Device Tree)")
         .reserve        = omap_reserve,
         .map_io         = omap3_map_io,
         .init_early     = am35xx_init_early,
-        .init_irq       = omap_intc_of_init,
-        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_late      = omap3_init_late,
         .init_time      = omap3_gptimer_timer_init,
@@ -157,7 +145,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_SOC_AM33XX
-static const char *am33xx_boards_compat[] __initconst = {
+static const char *const am33xx_boards_compat[] __initconst = {
         "ti,am33xx",
         NULL,
 };
@@ -166,8 +154,6 @@ DT_MACHINE_START(AM33XX_DT, "Generic AM33XX (Flattened Device Tree)")
         .reserve        = omap_reserve,
         .map_io         = am33xx_map_io,
         .init_early     = am33xx_init_early,
-        .init_irq       = omap_intc_of_init,
-        .handle_irq     = omap3_intc_handle_irq,
         .init_machine   = omap_generic_init,
         .init_late      = am33xx_init_late,
         .init_time      = omap3_gptimer_timer_init,
@@ -177,7 +163,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_ARCH_OMAP4
-static const char *omap4_boards_compat[] __initconst = {
+static const char *const omap4_boards_compat[] __initconst = {
         "ti,omap4460",
         "ti,omap4430",
         "ti,omap4",
@@ -199,7 +185,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_SOC_OMAP5
-static const char *omap5_boards_compat[] __initconst = {
+static const char *const omap5_boards_compat[] __initconst = {
         "ti,omap5432",
         "ti,omap5430",
         "ti,omap5",
@@ -221,7 +207,7 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_SOC_AM43XX
-static const char *am43_boards_compat[] __initconst = {
+static const char *const am43_boards_compat[] __initconst = {
         "ti,am4372",
         "ti,am43",
         NULL,
@@ -240,7 +226,9 @@ MACHINE_END
 #endif
 
 #ifdef CONFIG_SOC_DRA7XX
-static const char *dra74x_boards_compat[] __initconst = {
+static const char *const dra74x_boards_compat[] __initconst = {
+        "ti,am5728",
+        "ti,am5726",
         "ti,dra742",
         "ti,dra7",
         NULL,
@@ -259,7 +247,9 @@ DT_MACHINE_START(DRA74X_DT, "Generic DRA74X (Flattened Device Tree)")
         .restart        = omap44xx_restart,
 MACHINE_END
 
-static const char *dra72x_boards_compat[] __initconst = {
+static const char *const dra72x_boards_compat[] __initconst = {
+        "ti,am5718",
+        "ti,am5716",
         "ti,dra722",
         NULL,
 };