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

soc: renesas: rcar-sysc: Add support for R-Car H3 ES2.0 



Power area A2VC0 was removed in revision ES2.0, cfr. R-Car Gen3 Hardware
User's Manual rev. 0.53E.

Hence remove it from the power area table when not running on ES1.x.

This is in line with the goal to:
  1. Support both the ES1.x and ES2.0 SoC revisions in a single binary
     for now,
  2. Make it clear which code supports ES1.x, so it can easily be
     identified and removed later, when production SoCs are deemed
     ubiquitous.

Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: default avatarSimon Horman <horms+renesas@verge.net.au>
parent afa6f53d

drivers/soc/renesas/r8a7795-sysc.c

+24 −2
Original line number Diff line number Diff line 
/*

 * Renesas R-Car H3 System Controller

 *

 * Copyright (C) 2016 Glider bvba

 * Copyright (C) 2016-2017 Glider bvba

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License as published by
@@ -10,12 +10,13 @@ 


#include <linux/bug.h>

#include <linux/kernel.h>

#include <linux/sys_soc.h>



#include <dt-bindings/power/r8a7795-sysc.h>



#include "rcar-sysc.h"



static const struct rcar_sysc_area r8a7795_areas[] __initconst = {

static struct rcar_sysc_area r8a7795_areas[] __initdata = {

	{ "always-on",	    0, 0, R8A7795_PD_ALWAYS_ON,	-1, PD_ALWAYS_ON },

	{ "ca57-scu",	0x1c0, 0, R8A7795_PD_CA57_SCU,	R8A7795_PD_ALWAYS_ON,

	  PD_SCU },
@@ -40,6 +41,7 @@ static const struct rcar_sysc_area r8a7795_areas[] __initconst = { 
	{ "a3vp",	0x340, 0, R8A7795_PD_A3VP,	R8A7795_PD_ALWAYS_ON },

	{ "cr7",	0x240, 0, R8A7795_PD_CR7,	R8A7795_PD_ALWAYS_ON },

	{ "a3vc",	0x380, 0, R8A7795_PD_A3VC,	R8A7795_PD_ALWAYS_ON },

	/* A2VC0 exists on ES1.x only */

	{ "a2vc0",	0x3c0, 0, R8A7795_PD_A2VC0,	R8A7795_PD_A3VC },

	{ "a2vc1",	0x3c0, 1, R8A7795_PD_A2VC1,	R8A7795_PD_A3VC },

	{ "3dg-a",	0x100, 0, R8A7795_PD_3DG_A,	R8A7795_PD_ALWAYS_ON },
@@ -50,7 +52,27 @@ static const struct rcar_sysc_area r8a7795_areas[] __initconst = { 
	{ "a3ir",	0x180, 0, R8A7795_PD_A3IR,	R8A7795_PD_ALWAYS_ON },

};





	/*

	 * Fixups for R-Car H3 revisions after ES1.x

	 */



static const struct soc_device_attribute r8a7795es1[] __initconst = {

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

	{ /* sentinel */ }

};



static int __init r8a7795_sysc_init(void)

{

	if (!soc_device_match(r8a7795es1))

		rcar_sysc_nullify(r8a7795_areas, ARRAY_SIZE(r8a7795_areas),

				  R8A7795_PD_A2VC0);



	return 0;

}



const struct rcar_sysc_info r8a7795_sysc_info __initconst = {

	.init = r8a7795_sysc_init,

	.areas = r8a7795_areas,

	.num_areas = ARRAY_SIZE(r8a7795_areas),

};

include/dt-bindings/power/r8a7795-sysc.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define R8A7795_PD_CA53_SCU		21

#define R8A7795_PD_3DG_E		22

#define R8A7795_PD_A3IR			24

#define R8A7795_PD_A2VC0		25

#define R8A7795_PD_A2VC0		25	/* ES1.x only */

#define R8A7795_PD_A2VC1		26



/* Always-on power area */

CRA Git | Maintained and supported by SUSTech CRA and CCSE