From d453ef752cf01e96168ea012016baea0079f5377 Mon Sep 17 00:00:00 2001 From: Russell King Date: Wed, 19 Mar 2014 12:50:53 +0000 Subject: ARM: l2c: remove unnecessary UL-suffix to mask values They're u32, they're not unsigned long. The UL suffix is not required here. Acked-by: Shawn Guo Signed-off-by: Russell King --- arch/arm/mach-rockchip/rockchip.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'arch/arm/mach-rockchip') diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index d211d6fa0d98..d252efe3747b 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -26,7 +26,7 @@ static void __init rockchip_dt_init(void) { - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); } -- cgit v1.2.3 From 2a2d2fff1d0bdf0723ebd2b867509dbf89a74846 Mon Sep 17 00:00:00 2001 From: Russell King Date: Mon, 28 Apr 2014 15:27:59 +0100 Subject: 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 --- arch/arm/mach-rockchip/rockchip.c | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) (limited to 'arch/arm/mach-rockchip') 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 #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 -- cgit v1.2.3