Commit 5a6cf826 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven
Browse files

soc: renesas: r8a7796-sysc: Fix power request conflicts 



Describe the location and contents of the SYSCEXTMASK register on R-Car
M3-W, to prevent conflicts between internal and external power requests.

This register does not exist on R-Car M3-W ES1.x.

Based on a patch in the BSP by Dien Pham <dien.pham.ry@renesas.com>.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: default avatarYoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
Reviewed-by: default avatarSimon Horman <horms+renesas@verge.net.au>
Link: https://lore.kernel.org/r/20190828113618.6672-4-geert+renesas@glider.be
parent 0e0c4db2

drivers/soc/renesas/r8a7796-sysc.c

+21 −1
Original line number Diff line number Diff line
@@ -5,8 +5,10 @@ 
 * Copyright (C) 2016 Glider bvba

 */



#include <linux/bits.h>

#include <linux/bug.h>

#include <linux/kernel.h>

#include <linux/sys_soc.h>



#include <dt-bindings/power/r8a7796-sysc.h>
@@ -39,7 +41,25 @@ static const struct rcar_sysc_area r8a7796_areas[] __initconst = { 
	{ "a3ir",	0x180, 0, R8A7796_PD_A3IR,	R8A7796_PD_ALWAYS_ON },

};



const struct rcar_sysc_info r8a7796_sysc_info __initconst = {



/* Fixups for R-Car M3-W ES1.x revision */

static const struct soc_device_attribute r8a7796es1[] __initconst = {

	{ .soc_id = "r8a7796", .revision = "ES1.*" },

	{ /* sentinel */ }

};



static int __init r8a7796_sysc_init(void)

{

	if (soc_device_match(r8a7796es1))

		r8a7796_sysc_info.extmask_val = 0;



	return 0;

}



struct rcar_sysc_info r8a7796_sysc_info __initdata = {

	.init = r8a7796_sysc_init,

	.areas = r8a7796_areas,

	.num_areas = ARRAY_SIZE(r8a7796_areas),

	.extmask_offs = 0x2f8,

	.extmask_val = BIT(0),

};

drivers/soc/renesas/rcar-sysc.h

+1 −1
Original line number Diff line number Diff line
@@ -60,7 +60,7 @@ extern const struct rcar_sysc_info r8a7791_sysc_info; 
extern const struct rcar_sysc_info r8a7792_sysc_info;

extern const struct rcar_sysc_info r8a7794_sysc_info;

extern struct rcar_sysc_info r8a7795_sysc_info;

extern const struct rcar_sysc_info r8a7796_sysc_info;

extern struct rcar_sysc_info r8a7796_sysc_info;

extern const struct rcar_sysc_info r8a77965_sysc_info;

extern const struct rcar_sysc_info r8a77970_sysc_info;

extern const struct rcar_sysc_info r8a77980_sysc_info;

CRA Git | Maintained and supported by SUSTech CRA and CCSE