| Message ID | E1WTYUW-0004WD-UP@rmk-PC.arm.linux.org.uk |
|---|---|
| State | New |
| Headers | show |
On Fri, Mar 28, 2014 at 10:14 AM, Russell King <rmk+kernel@arm.linux.org.uk> wrote: > They're u32, they're not unsigned long. The UL suffix is not required > here. > > Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> > --- > arch/arm/mach-highbank/highbank.c | 2 +- > arch/arm/mach-imx/mach-vf610.c | 2 +- > arch/arm/mach-imx/system.c | 2 +- > arch/arm/mach-mvebu/armada-370-xp.c | 2 +- > arch/arm/mach-rockchip/rockchip.c | 2 +- > arch/arm/mach-socfpga/socfpga.c | 2 +- > 6 files changed, 6 insertions(+), 6 deletions(-) > > diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c > index c7de89b263dd..38e1dc3b4c6e 100644 > --- a/arch/arm/mach-highbank/highbank.c > +++ b/arch/arm/mach-highbank/highbank.c > @@ -69,7 +69,7 @@ static void __init highbank_init_irq(void) > if (IS_ENABLED(CONFIG_CACHE_L2X0) && > of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) { > highbank_smc1(0x102, 0x1); > - l2x0_of_init(0, ~0UL); > + l2x0_of_init(0, ~0); What about changing these callers to use l2x0_of_init(void) and creating l2x0_of_init_legacy(val, mask) for ones that need the aux ctrl setup? We do want to encourage people to either setup aux ctrl in the bootloader or via DT properties. Rob
On Fri, Mar 28, 2014 at 10:50:32AM -0500, Rob Herring wrote: > What about changing these callers to use l2x0_of_init(void) and > creating l2x0_of_init_legacy(val, mask) for ones that need the aux > ctrl setup? We do want to encourage people to either setup aux ctrl in > the bootloader or via DT properties. I have thought about that, but let's first sort out what platforms need. It sounds like some platforms really do need to manipulate the register, some really need to do it to have a functional setup because they never set the hardware configuration of the cache size.
diff --git a/arch/arm/mach-highbank/highbank.c b/arch/arm/mach-highbank/highbank.c index c7de89b263dd..38e1dc3b4c6e 100644 --- a/arch/arm/mach-highbank/highbank.c +++ b/arch/arm/mach-highbank/highbank.c @@ -69,7 +69,7 @@ static void __init highbank_init_irq(void) if (IS_ENABLED(CONFIG_CACHE_L2X0) && of_find_compatible_node(NULL, NULL, "arm,pl310-cache")) { highbank_smc1(0x102, 0x1); - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); outer_cache.disable = highbank_l2x0_disable; } } diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c index 2d8aef5a6efa..6288a9690e78 100644 --- a/arch/arm/mach-imx/mach-vf610.c +++ b/arch/arm/mach-imx/mach-vf610.c @@ -22,7 +22,7 @@ static void __init vf610_init_machine(void) static void __init vf610_init_irq(void) { - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); irqchip_init(); } diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 5e3027d3692f..c6571f1de9fd 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -145,6 +145,6 @@ void __init imx_init_l2cache(void) of_node_put(np); out: - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); } #endif diff --git a/arch/arm/mach-mvebu/armada-370-xp.c b/arch/arm/mach-mvebu/armada-370-xp.c index f6c9d1d85c14..9d6c401d8738 100644 --- a/arch/arm/mach-mvebu/armada-370-xp.c +++ b/arch/arm/mach-mvebu/armada-370-xp.c @@ -43,7 +43,7 @@ static void __init armada_370_xp_timer_and_clk_init(void) coherency_init(); BUG_ON(mvebu_mbus_dt_init()); #ifdef CONFIG_CACHE_L2X0 - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); #endif } diff --git a/arch/arm/mach-rockchip/rockchip.c b/arch/arm/mach-rockchip/rockchip.c index 82c0b0709712..de9dc5f87d55 100644 --- a/arch/arm/mach-rockchip/rockchip.c +++ b/arch/arm/mach-rockchip/rockchip.c @@ -25,7 +25,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); } diff --git a/arch/arm/mach-socfpga/socfpga.c b/arch/arm/mach-socfpga/socfpga.c index dd0d49cdbe09..395fa085b43e 100644 --- a/arch/arm/mach-socfpga/socfpga.c +++ b/arch/arm/mach-socfpga/socfpga.c @@ -104,7 +104,7 @@ static void socfpga_cyclone5_restart(enum reboot_mode mode, const char *cmd) static void __init socfpga_cyclone5_init(void) { - l2x0_of_init(0, ~0UL); + l2x0_of_init(0, ~0); of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); socfpga_init_clocks(); }
They're u32, they're not unsigned long. The UL suffix is not required here. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> --- arch/arm/mach-highbank/highbank.c | 2 +- arch/arm/mach-imx/mach-vf610.c | 2 +- arch/arm/mach-imx/system.c | 2 +- arch/arm/mach-mvebu/armada-370-xp.c | 2 +- arch/arm/mach-rockchip/rockchip.c | 2 +- arch/arm/mach-socfpga/socfpga.c | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-)