@@ -835,10 +835,6 @@ static void __init r8a7740_generic_init(void)
{
r8a7740_meram_workaround();
-#ifdef CONFIG_CACHE_L2X0
- /* Shared attribute override enable, 32K*8way */
- l2x0_init(IOMEM(0xf0002000), 0x00400000, 0xc20f0fff);
-#endif
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
@@ -848,6 +844,8 @@ static const char *r8a7740_boards_compat_dt[] __initdata = {
};
DT_MACHINE_START(R8A7740_DT, "Generic R8A7740 (Flattened Device Tree)")
+ .l2c_aux_val = 0,
+ .l2c_aux_mask = ~0,
.map_io = r8a7740_map_io,
.init_early = shmobile_init_delay,
.init_irq = r8a7740_init_irq_of,
Migrate the generic r8a7740 platform from calling l2x0_of_init() to the generic l2c OF initialization. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- v3: - Use 0/~0 now DT supports "arm,shared-override", v2: - Keep only {,~}L2C_AUX_CTRL_SHARED_OVERRIDE. --- arch/arm/mach-shmobile/setup-r8a7740.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)