redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

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>
hifive-unleashed-5.1
Nicolas Ferre 2015-01-27 18:41:33 +01:00
parent 827de1f123
commit ad3fc3e316
5 changed files with 33 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/mach-at91/at91rm9200.c
View File

@ -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

28
arch/arm/mach-at91/at91sam9.c
View File

@ -25,12 +25,12 @@
#include "generic.h"
static void __init sam9_dt_device_init(void)
static void __init at91sam9_dt_device_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
arm_pm_idle = at91sam9_idle;
at91_sam9260_pm_init();
at91sam9260_pm_init();
}
static const char *at91_dt_board_compat[] __initconst = {
@ -38,22 +38,22 @@ static const char *at91_dt_board_compat[] __initconst = {
NULL
};
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM (Device Tree)")
DT_MACHINE_START(at91sam_dt, "Atmel AT91SAM9")
/* Maintainer: Atmel */
.map_io = at91_map_io,
.init_machine = sam9_dt_device_init,
.init_machine = at91sam9_dt_device_init,
.dt_compat = at91_dt_board_compat,
MACHINE_END
static void __init sam9g45_dt_device_init(void)
static void __init at91sam9g45_dt_device_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
arm_pm_idle = at91sam9_idle;
at91_sam9g45_pm_init();
at91sam9g45_pm_init();
}
static const char *at91_9g45_board_compat[] __initconst = {
static const char *at91sam9g45_board_compat[] __initconst = {
"atmel,at91sam9g45",
NULL
};
@ -61,19 +61,19 @@ static const char *at91_9g45_board_compat[] __initconst = {
DT_MACHINE_START(at91sam9g45_dt, "Atmel AT91SAM9G45")
/* Maintainer: Atmel */
.map_io = at91_map_io,
.init_machine = sam9g45_dt_device_init,
.dt_compat = at91_9g45_board_compat,
.init_machine = at91sam9g45_dt_device_init,
.dt_compat = at91sam9g45_board_compat,
MACHINE_END
static void __init sam9x5_dt_device_init(void)
static void __init at91sam9x5_dt_device_init(void)
{
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
arm_pm_idle = at91sam9_idle;
at91_sam9x5_pm_init();
at91sam9x5_pm_init();
}
static const char *at91_9x5_board_compat[] __initconst = {
static const char *at91sam9x5_board_compat[] __initconst = {
"atmel,at91sam9x5",
"atmel,at91sam9n12",
NULL
@ -82,6 +82,6 @@ static const char *at91_9x5_board_compat[] __initconst = {
DT_MACHINE_START(at91sam9x5_dt, "Atmel AT91SAM9")
/* Maintainer: Atmel */
.map_io = at91_map_io,
.init_machine = sam9x5_dt_device_init,
.dt_compat = at91_9x5_board_compat,
.init_machine = at91sam9x5_dt_device_init,
.dt_compat = at91sam9x5_board_compat,
MACHINE_END

16
arch/arm/mach-at91/generic.h
View File

@ -30,15 +30,15 @@ extern void at91_ioremap_matrix(u32 base_addr);
#ifdef CONFIG_PM
extern void __init at91_rm9200_pm_init(void);
extern void __init at91_sam9260_pm_init(void);
extern void __init at91_sam9g45_pm_init(void);
extern void __init at91_sam9x5_pm_init(void);
extern void __init at91rm9200_pm_init(void);
extern void __init at91sam9260_pm_init(void);
extern void __init at91sam9g45_pm_init(void);
extern void __init at91sam9x5_pm_init(void);
#else
void __init at91_rm9200_pm_init(void) { }
void __init at91_sam9260_pm_init(void) { }
void __init at91_sam9g45_pm_init(void) { }
void __init at91_sam9x5_pm_init(void) { }
void __init at91rm9200_pm_init(void) { }
void __init at91sam9260_pm_init(void) { }
void __init at91sam9g45_pm_init(void) { }
void __init at91sam9x5_pm_init(void) { }
#endif
#endif /* _AT91_GENERIC_H */

8
arch/arm/mach-at91/pm.c
View File

@ -319,7 +319,7 @@ static void __init at91_pm_init(void)
suspend_set_ops(&at91_pm_ops);
}
void __init at91_rm9200_pm_init(void)
void __init at91rm9200_pm_init(void)
{
at91_dt_ramc();
@ -334,7 +334,7 @@ void __init at91_rm9200_pm_init(void)
at91_pm_init();
}
void __init at91_sam9260_pm_init(void)
void __init at91sam9260_pm_init(void)
{
at91_dt_ramc();
at91_pm_data.memctrl = AT91_MEMCTRL_SDRAMC;
@ -342,7 +342,7 @@ void __init at91_sam9260_pm_init(void)
return at91_pm_init();
}
void __init at91_sam9g45_pm_init(void)
void __init at91sam9g45_pm_init(void)
{
at91_dt_ramc();
at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP;
@ -350,7 +350,7 @@ void __init at91_sam9g45_pm_init(void)
return at91_pm_init();
}
void __init at91_sam9x5_pm_init(void)
void __init at91sam9x5_pm_init(void)
{
at91_dt_ramc();
at91_pm_data.uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP;

6
arch/arm/mach-at91/sama5.c
View File

@ -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,