mirror of
https://github.com/torvalds/linux.git
synced 2025-12-07 20:06:24 +00:00
Merge tag 'renesas-drivers-for-v6.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into soc/drivers
Renesas driver updates for v6.19 - Keep the WDTRSTCR.RESBAR2S bit in the default state on R-Car Gen4. * tag 'renesas-drivers-for-v6.19-tag1' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel: soc: renesas: rcar-rst: Keep RESBAR2S in default state Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
@@ -12,6 +12,7 @@
|
||||
|
||||
#define WDTRSTCR_RESET 0xA55A0002
|
||||
#define WDTRSTCR 0x0054
|
||||
#define GEN4_WDTRSTCR_RESET 0xA55A8002
|
||||
#define GEN4_WDTRSTCR 0x0010
|
||||
|
||||
#define CR7BAR 0x0070
|
||||
@@ -30,7 +31,7 @@ static int rcar_rst_enable_wdt_reset(void __iomem *base)
|
||||
|
||||
static int rcar_rst_v3u_enable_wdt_reset(void __iomem *base)
|
||||
{
|
||||
iowrite32(WDTRSTCR_RESET, base + GEN4_WDTRSTCR);
|
||||
iowrite32(GEN4_WDTRSTCR_RESET, base + GEN4_WDTRSTCR);
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user