Commit 4c071429 authored by Arnd Bergmann's avatar Arnd Bergmann

Merge tag 'mvebu-cleanup-4.1' of git://git.infradead.org/linux-mvebu into next/cleanup

Pull "mvebu clean-up changes for v4.1 (part #1)" from Gregory CLEMENT:

- Constify the dt_compat table in DT_MACHINE_START

* tag 'mvebu-cleanup-4.1' of git://git.infradead.org/linux-mvebu:
  ARM: mvebu: add __initconst specifiers on DT_MACHINE_START dt_compat tables
parents 13a7a6ac bc2d7a58
...@@ -184,7 +184,7 @@ static void __init mvebu_dt_init(void) ...@@ -184,7 +184,7 @@ static void __init mvebu_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
static const char * const armada_370_xp_dt_compat[] = { static const char * const armada_370_xp_dt_compat[] __initconst = {
"marvell,armada-370-xp", "marvell,armada-370-xp",
NULL, NULL,
}; };
...@@ -205,7 +205,7 @@ DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)") ...@@ -205,7 +205,7 @@ DT_MACHINE_START(ARMADA_370_XP_DT, "Marvell Armada 370/XP (Device Tree)")
.dt_compat = armada_370_xp_dt_compat, .dt_compat = armada_370_xp_dt_compat,
MACHINE_END MACHINE_END
static const char * const armada_375_dt_compat[] = { static const char * const armada_375_dt_compat[] __initconst = {
"marvell,armada375", "marvell,armada375",
NULL, NULL,
}; };
...@@ -219,7 +219,7 @@ DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)") ...@@ -219,7 +219,7 @@ DT_MACHINE_START(ARMADA_375_DT, "Marvell Armada 375 (Device Tree)")
.dt_compat = armada_375_dt_compat, .dt_compat = armada_375_dt_compat,
MACHINE_END MACHINE_END
static const char * const armada_38x_dt_compat[] = { static const char * const armada_38x_dt_compat[] __initconst = {
"marvell,armada380", "marvell,armada380",
"marvell,armada385", "marvell,armada385",
NULL, NULL,
......
...@@ -27,7 +27,7 @@ static void __init dove_init(void) ...@@ -27,7 +27,7 @@ static void __init dove_init(void)
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
} }
static const char * const dove_dt_compat[] = { static const char * const dove_dt_compat[] __initconst = {
"marvell,dove", "marvell,dove",
NULL NULL
}; };
......
...@@ -186,7 +186,7 @@ static void __init kirkwood_dt_init(void) ...@@ -186,7 +186,7 @@ static void __init kirkwood_dt_init(void)
of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL); of_platform_populate(NULL, of_default_bus_match_table, auxdata, NULL);
} }
static const char * const kirkwood_dt_board_compat[] = { static const char * const kirkwood_dt_board_compat[] __initconst = {
"marvell,kirkwood", "marvell,kirkwood",
NULL NULL
}; };
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment