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

Revert "staging: board: Remove macro board_staging" 

This reverts commit 850c35bb28 as it
breaks the build.

Cc: Song Chen <chensong_2000@189.cn>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Cc: Geert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20210104122653.6f35b9bb@canb.auug.org.au
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
master
Greg Kroah-Hartman 2021-01-04 15:55:40 +01:00
parent 1e9a9c7cba
commit 1f82c33205
3 changed files with 23 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/staging/board/armadillo800eva.c
View File

@ -80,11 +80,9 @@ static const struct board_staging_dev armadillo800eva_devices[] __initconst = {
static void __init armadillo800eva_init(void)
{
if (of_machine_is_compatible("renesas,armadillo800eva")) {
board_staging_gic_setup_xlate("arm,pl390", 32);
board_staging_register_devices(armadillo800eva_devices,
ARRAY_SIZE(armadillo800eva_devices));
}
board_staging_gic_setup_xlate("arm,pl390", 32);
board_staging_register_devices(armadillo800eva_devices,
ARRAY_SIZE(armadillo800eva_devices));
}
device_initcall(armadillo800eva_init);
board_staging("renesas,armadillo800eva", armadillo800eva_init);

11
drivers/staging/board/board.h
View File

@ -32,4 +32,15 @@ int board_staging_register_device(const struct board_staging_dev *dev);
void board_staging_register_devices(const struct board_staging_dev *devs,
unsigned int ndevs);
#define board_staging(str, fn) \
static int __init runtime_board_check(void) \
{ \
if (of_machine_is_compatible(str)) \
fn(); \
\
return 0; \
} \
\
device_initcall(runtime_board_check)
#endif /* __BOARD_H__ */

18
drivers/staging/board/kzm9d.c
View File

@ -12,17 +12,15 @@ static struct resource usbs1_res[] __initdata = {
static void __init kzm9d_init(void)
{
if (of_machine_is_compatible("renesas,kzm9d")) {
board_staging_gic_setup_xlate("arm,pl390", 32);
board_staging_gic_setup_xlate("arm,pl390", 32);
if (!board_staging_dt_node_available(usbs1_res,
ARRAY_SIZE(usbs1_res))) {
board_staging_gic_fixup_resources(usbs1_res,
ARRAY_SIZE(usbs1_res));
platform_device_register_simple("emxx_udc", -1, usbs1_res,
ARRAY_SIZE(usbs1_res));
}
if (!board_staging_dt_node_available(usbs1_res,
ARRAY_SIZE(usbs1_res))) {
board_staging_gic_fixup_resources(usbs1_res,
ARRAY_SIZE(usbs1_res));
platform_device_register_simple("emxx_udc", -1, usbs1_res,
ARRAY_SIZE(usbs1_res));
}
}
device_initcall(kzm9d_init);
board_staging("renesas,kzm9d", kzm9d_init);