diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-04-28 15:27:59 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2014-05-30 00:50:00 +0100 |
| commit | 2a2d2fff1d0bdf0723ebd2b867509dbf89a74846 (patch) | |
| tree | c5430f39c0264e7ad1a9345710d2905a31db78fe | |
| parent | 39b53458cc635f103365ef09e9db6980fa01e3fb (diff) | |
| download | linux-2a2d2fff1d0bdf0723ebd2b867509dbf89a74846.tar.gz linux-2a2d2fff1d0bdf0723ebd2b867509dbf89a74846.tar.bz2 linux-2a2d2fff1d0bdf0723ebd2b867509dbf89a74846.zip | |
ARM: l2c: rockchip: convert to generic l2c OF initialisation
Remove the explicit call to l2x0_of_init(), converting to the generic
infrastructure instead. This also allows us to eliminate the
.init_machine function as this becomes the same as the generic version.
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
| -rw-r--r-- | arch/arm/mach-rockchip/rockchip.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index d252efe3747b..138b9975313a 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -24,12 +24,6 @@ #include <asm/hardware/cache-l2x0.h> #include "core.h" -static void __init rockchip_dt_init(void) -{ - l2x0_of_init(0, ~0); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - static const char * const rockchip_board_dt_compat[] = { "rockchip,rk2928", "rockchip,rk3066a", @@ -39,7 +33,8 @@ static const char * const rockchip_board_dt_compat[] = { }; DT_MACHINE_START(ROCKCHIP_DT, "Rockchip Cortex-A9 (Device Tree)") + .l2c_aux_val = 0, + .l2c_aux_mask = ~0, .smp = smp_ops(rockchip_smp_ops), - .init_machine = rockchip_dt_init, .dt_compat = rockchip_board_dt_compat, MACHINE_END |