diff options
| author |   Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-01-27 18:41:33 +0100 |
|---|---|---|
| committer | Nicolas Ferre <nicolas.ferre@atmel.com> | 2015-02-02 11:01:29 +0100 |
| commit | ad3fc3e316891cbc4f33116a61c57c4a9b2a2518 (patch) | |
| tree | 614117b36ff439e4c49893abc740c8b2a6d142b1 /arch/arm/mach-at91/at91rm9200.c | |
| parent | ARM: at91: remove at91_dt_initialize and machine init_early() (diff) | |
| download | linux-dev-ad3fc3e316891cbc4f33116a61c57c4a9b2a2518.tar.xz linux-dev-ad3fc3e316891cbc4f33116a61c57c4a9b2a2518.zip | |
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>
Diffstat (limited to 'arch/arm/mach-at91/at91rm9200.c')
| -rw-r--r-- | arch/arm/mach-at91/at91rm9200.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/arch/arm/mach-at91/at91rm9200.c b/arch/arm/mach-at91/at91rm9200.c index 49ae3d455bd5..8fcfb70f7124 100644 --- a/arch/arm/mach-at91/at91rm9200.c +++ b/arch/arm/mach-at91/at91rm9200.c @@ -43,13 +43,13 @@ static void __init at91rm9200_dt_timer_init(void) at91rm9200_timer_init(); } -static void __init rm9200_dt_device_init(void) +static void __init at91rm9200_dt_device_init(void) { of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); arm_pm_idle = at91rm9200_idle; arm_pm_restart = at91rm9200_restart; - at91_rm9200_pm_init(); + at91rm9200_pm_init(); } @@ -59,9 +59,9 @@ static const char *at91rm9200_dt_board_compat[] __initconst = { NULL }; -DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200 (Device Tree)") +DT_MACHINE_START(at91rm9200_dt, "Atmel AT91RM9200") .init_time = at91rm9200_dt_timer_init, .map_io = at91_map_io, - .init_machine = rm9200_dt_device_init, + .init_machine = at91rm9200_dt_device_init, .dt_compat = at91rm9200_dt_board_compat, MACHINE_END |