ARM: at91: SAMA5D4 SoC detection code and low level routines

SoC identification code, kernel uncompress and low level
debugging routines update.
On SAMA5D4, DBGU is at another address AT91_BASE_DBGU2 so another
round of detection is needed. We also had to differentiate with
SAMA5D3 SoC family and rename some variables.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Acked-by: Alexandre Belloni <alexandre.belloni@free-electrons.com>

diff --git a/arch/arm/mach-at91/board-dt-sama5.c b/arch/arm/mach-at91/board-dt-sama5.c
index 075ec05..5149563 100644 (file)
--- a/arch/arm/mach-at91/board-dt-sama5.c
+++ b/arch/arm/mach-at91/board-dt-sama5.c
@@ -73,7 +73,7 @@ static void __init sama5_dt_device_init(void)
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 }
 
-static const char *sama5_dt_board_compat[] __initdata = {
+static const char *sama5_dt_board_compat[] __initconst = {
        "atmel,sama5",
        NULL
 };
@@ -88,3 +88,17 @@ DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)")
        .init_machine   = sama5_dt_device_init,
        .dt_compat      = sama5_dt_board_compat,
 MACHINE_END
+
+static const char *sama5_alt_dt_board_compat[] __initconst = {
+       "atmel,sama5d4",
+       NULL
+};
+
+DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5 (Device Tree)")
+       /* Maintainer: Atmel */
+       .map_io         = at91_alt_map_io,
+       .init_early     = at91_dt_initialize,
+       .init_machine   = sama5_dt_device_init,
+       .dt_compat      = sama5_alt_dt_board_compat,
+       .l2c_aux_mask   = ~0UL,
+MACHINE_END

diff --cc arch/arm/mach-at91/generic.h
Simple merge

diff --cc arch/arm/mach-at91/include/mach/cpu.h
Simple merge

diff --cc arch/arm/mach-at91/include/mach/debug-macro.S
Simple merge

diff --cc arch/arm/mach-at91/include/mach/hardware.h
Simple merge

diff --cc arch/arm/mach-at91/include/mach/uncompress.h
Simple merge

diff --cc arch/arm/mach-at91/sama5d4.c
Simple merge

diff --cc arch/arm/mach-at91/setup.c
Simple merge