mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-11-16 08:44:21 +08:00
ARM: sunxi: Remove init_machine callback
The init_machine hook is now at its default value. We can remove it. Even though the sun4i and sun7i machines are nothing more than generic machines now, leave them in so that we won't have to add them back if needed, and so that the machine is still displayed in /proc/cpuinfo. Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
This commit is contained in:
parent
553600502b
commit
5e669ec583
@ -12,15 +12,9 @@
|
|||||||
|
|
||||||
#include <linux/clk-provider.h>
|
#include <linux/clk-provider.h>
|
||||||
#include <linux/clocksource.h>
|
#include <linux/clocksource.h>
|
||||||
#include <linux/of_platform.h>
|
|
||||||
|
|
||||||
#include <asm/mach/arch.h>
|
#include <asm/mach/arch.h>
|
||||||
|
|
||||||
static void __init sunxi_dt_init(void)
|
|
||||||
{
|
|
||||||
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
|
|
||||||
}
|
|
||||||
|
|
||||||
static const char * const sunxi_board_dt_compat[] = {
|
static const char * const sunxi_board_dt_compat[] = {
|
||||||
"allwinner,sun4i-a10",
|
"allwinner,sun4i-a10",
|
||||||
"allwinner,sun5i-a10s",
|
"allwinner,sun5i-a10s",
|
||||||
@ -29,7 +23,6 @@ static const char * const sunxi_board_dt_compat[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
|
DT_MACHINE_START(SUNXI_DT, "Allwinner A1X (Device Tree)")
|
||||||
.init_machine = sunxi_dt_init,
|
|
||||||
.dt_compat = sunxi_board_dt_compat,
|
.dt_compat = sunxi_board_dt_compat,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
|
||||||
@ -47,7 +40,6 @@ static void __init sun6i_timer_init(void)
|
|||||||
}
|
}
|
||||||
|
|
||||||
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
|
DT_MACHINE_START(SUN6I_DT, "Allwinner sun6i (A31) Family")
|
||||||
.init_machine = sunxi_dt_init,
|
|
||||||
.init_time = sun6i_timer_init,
|
.init_time = sun6i_timer_init,
|
||||||
.dt_compat = sun6i_board_dt_compat,
|
.dt_compat = sun6i_board_dt_compat,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
@ -58,6 +50,5 @@ static const char * const sun7i_board_dt_compat[] = {
|
|||||||
};
|
};
|
||||||
|
|
||||||
DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
|
DT_MACHINE_START(SUN7I_DT, "Allwinner sun7i (A20) Family")
|
||||||
.init_machine = sunxi_dt_init,
|
|
||||||
.dt_compat = sun7i_board_dt_compat,
|
.dt_compat = sun7i_board_dt_compat,
|
||||||
MACHINE_END
|
MACHINE_END
|
||||||
|
Loading…
Reference in New Issue
Block a user