Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 05323998 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Simon Horman
Browse files

soc: renesas: rcar-sysc: Move SYSC interrupt config to rcar-sysc driver 



On R-Car H1 and Gen2, the SYSC interrupt registers are always configured
using hardcoded values in platform code. For R-Car Gen2, values are
provided for H2 and M2-W only, other SoCs are not yet supported, and
never will be.

Move this configuration from SoC-specific platform code to the
rcar_sysc_init() wrapper, so it can be skipped if the SYSC is configured
from DT. This would be the case not only for H1, H2, and M2-W using a
modern DTS, but also for other R-Car Gen2 SoCs not supported by the
platform code, relying purely on DT.

There is no longer a need to return the mapped register block, hence
make the function return void.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarUlrich Hecht <ulrich.hecht+renesas@gmail.com>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent b1e52287

arch/arm/mach-shmobile/pm-r8a7779.c

+1 −5
Original line number Diff line number Diff line
@@ -23,11 +23,7 @@ 


static void __init r8a7779_sysc_init(void)

{

	void __iomem *base = rcar_sysc_init(0xffd85000);



	/* enable all interrupt sources, but do not use interrupt handler */

	iowrite32(0x0131000e, base + SYSCIER);

	iowrite32(0, base + SYSCIMR);

	rcar_sysc_init(0xffd85000, 0x0131000e);

}



#else /* CONFIG_PM || CONFIG_SMP */

arch/arm/mach-shmobile/pm-rcar-gen2.c

+1 −5
Original line number Diff line number Diff line
@@ -37,11 +37,7 @@ 


static void __init rcar_gen2_sysc_init(u32 syscier)

{

	void __iomem *base = rcar_sysc_init(0xe6180000);



	/* enable all interrupt sources, but do not use interrupt handler */

	iowrite32(syscier, base + SYSCIER);

	iowrite32(0, base + SYSCIMR);

	rcar_sysc_init(0xe6180000, syscier);

}



#else /* CONFIG_SMP */

drivers/soc/renesas/rcar-sysc.c

+8 −4
Original line number Diff line number Diff line
@@ -400,10 +400,14 @@ static int __init rcar_sysc_pd_init(void) 
}

early_initcall(rcar_sysc_pd_init);



void __iomem * __init rcar_sysc_init(phys_addr_t base)

void __init rcar_sysc_init(phys_addr_t base, u32 syscier)

{

	if (rcar_sysc_pd_init())

	if (!rcar_sysc_pd_init())

		return;



	rcar_sysc_base = ioremap_nocache(base, PAGE_SIZE);



	return rcar_sysc_base;

	/* enable all interrupt sources, but do not use interrupt handler */

	iowrite32(syscier, rcar_sysc_base + SYSCIER);

	iowrite32(0, rcar_sysc_base + SYSCIMR);

}

include/linux/soc/renesas/rcar-sysc.h

+1 −1
Original line number Diff line number Diff line
@@ -11,6 +11,6 @@ struct rcar_sysc_ch { 


int rcar_sysc_power_down(const struct rcar_sysc_ch *sysc_ch);

int rcar_sysc_power_up(const struct rcar_sysc_ch *sysc_ch);

void __iomem *rcar_sysc_init(phys_addr_t base);

void rcar_sysc_init(phys_addr_t base, u32 syscier);



#endif /* __LINUX_SOC_RENESAS_RCAR_SYSC_H__ */