ARM: at91/trivial: unify functions and machine names

Remove the string "(Device Tree)" after the machine name because all AT91
machines use the DT nowadays.
Also change some function names to unify following the convention:
- at91sam9xxx aren't named sam9, 9xxx but with the full name
- sama5 are the ones that don't have the at91 prefix anymore.

Signed-off-by: Nicolas Ferre <nicolas.ferre@atmel.com>

1 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-at91/sama5.c b/arch/arm/mach-at91/sama5.c
index 9816ef0f203d..03dcb441f3d2 100644
--- a/arch/arm/mach-at91/sama5.c
+++ b/arch/arm/mach-at91/sama5.c
@@ -49,7 +49,7 @@ static void __init sama5_dt_device_init(void)
         }
 
         of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-        at91_sam9x5_pm_init();
+        at91sam9x5_pm_init();
 }
 
 static const char *sama5_dt_board_compat[] __initconst = {
@@ -57,7 +57,7 @@ static const char *sama5_dt_board_compat[] __initconst = {
         NULL
 };
 
-DT_MACHINE_START(sama5_dt, "Atmel SAMA5 (Device Tree)")
+DT_MACHINE_START(sama5_dt, "Atmel SAMA5")
         /* Maintainer: Atmel */
         .map_io         = at91_map_io,
         .init_machine   = sama5_dt_device_init,
@@ -102,7 +102,7 @@ static const char *sama5_alt_dt_board_compat[] __initconst = {
         NULL
 };
 
-DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5 (Device Tree)")
+DT_MACHINE_START(sama5_alt_dt, "Atmel SAMA5")
         /* Maintainer: Atmel */
         .map_io         = sama5_alt_map_io,
         .init_machine   = sama5_dt_device_init,