Use symbols rather for register offsets for R-Car H3 power areas
to improve readability.
This does not have any functional change.
Signed-off-by: Simon Horman <horms+renesas@xxxxxxxxxxxx>
---
drivers/soc/renesas/r8a7795-sysc.c | 76 ++++++++++++++++++++++----------------
1 file changed, 44 insertions(+), 32 deletions(-)
diff --git a/drivers/soc/renesas/r8a7795-sysc.c b/drivers/soc/renesas/r8a7795-sysc.c
index 7412666187b3..0c8440741b58 100644
--- a/drivers/soc/renesas/r8a7795-sysc.c
+++ b/drivers/soc/renesas/r8a7795-sysc.c
@@ -17,39 +17,51 @@
#include "rcar-sysc.h"
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 },
- { "ca57-cpu0", 0x80, 0, R8A7795_PD_CA57_CPU0, R8A7795_PD_CA57_SCU,
- PD_CPU_NOCR },
- { "ca57-cpu1", 0x80, 1, R8A7795_PD_CA57_CPU1, R8A7795_PD_CA57_SCU,
- PD_CPU_NOCR },
- { "ca57-cpu2", 0x80, 2, R8A7795_PD_CA57_CPU2, R8A7795_PD_CA57_SCU,
- PD_CPU_NOCR },
- { "ca57-cpu3", 0x80, 3, R8A7795_PD_CA57_CPU3, R8A7795_PD_CA57_SCU,
- PD_CPU_NOCR },
- { "ca53-scu", 0x140, 0, R8A7795_PD_CA53_SCU, R8A7795_PD_ALWAYS_ON,
- PD_SCU },
- { "ca53-cpu0", 0x200, 0, R8A7795_PD_CA53_CPU0, R8A7795_PD_CA53_SCU,
- PD_CPU_NOCR },
- { "ca53-cpu1", 0x200, 1, R8A7795_PD_CA53_CPU1, R8A7795_PD_CA53_SCU,
- PD_CPU_NOCR },
- { "ca53-cpu2", 0x200, 2, R8A7795_PD_CA53_CPU2, R8A7795_PD_CA53_SCU,
- PD_CPU_NOCR },
- { "ca53-cpu3", 0x200, 3, R8A7795_PD_CA53_CPU3, R8A7795_PD_CA53_SCU,
- PD_CPU_NOCR },
- { "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 },
+ { "always-on", RCAR_GEN3_SYSCSR, 0, R8A7795_PD_ALWAYS_ON,
+ -1, PD_ALWAYS_ON },
+ { "ca57-scu", RCAR_GEN3_PWRSR5, 0, R8A7795_PD_CA57_SCU,
+ R8A7795_PD_ALWAYS_ON, PD_SCU },
+ { "ca57-cpu0", RCAR_GEN3_PWRSR0, 0, R8A7795_PD_CA57_CPU0,
+ R8A7795_PD_CA57_SCU, PD_CPU_NOCR },
+ { "ca57-cpu1", RCAR_GEN3_PWRSR0, 1, R8A7795_PD_CA57_CPU1,
+ R8A7795_PD_CA57_SCU, PD_CPU_NOCR },
+ { "ca57-cpu2", RCAR_GEN3_PWRSR0, 2, R8A7795_PD_CA57_CPU2,
+ R8A7795_PD_CA57_SCU, PD_CPU_NOCR },
+ { "ca57-cpu3", RCAR_GEN3_PWRSR0, 3, R8A7795_PD_CA57_CPU3,
+ R8A7795_PD_CA57_SCU, PD_CPU_NOCR },
+ { "ca53-scu", RCAR_GEN3_PWRSR3, 0, R8A7795_PD_CA53_SCU,
+ R8A7795_PD_ALWAYS_ON, PD_SCU },
+ { "ca53-cpu0", RCAR_GEN3_PWRSR6, 0, R8A7795_PD_CA53_CPU0,
+ R8A7795_PD_CA53_SCU, PD_CPU_NOCR },
+ { "ca53-cpu1", RCAR_GEN3_PWRSR6, 1, R8A7795_PD_CA53_CPU1,
+ R8A7795_PD_CA53_SCU, PD_CPU_NOCR },
+ { "ca53-cpu2", RCAR_GEN3_PWRSR6, 2, R8A7795_PD_CA53_CPU2,
+ R8A7795_PD_CA53_SCU, PD_CPU_NOCR },
+ { "ca53-cpu3", RCAR_GEN3_PWRSR6, 3, R8A7795_PD_CA53_CPU3,
+ R8A7795_PD_CA53_SCU, PD_CPU_NOCR },
+ { "a3vp", RCAR_GEN3_PWRSR8, 0, R8A7795_PD_A3VP,
+ R8A7795_PD_ALWAYS_ON },
+ { "cr7", RCAR_GEN3_PWRSR7, 0, R8A7795_PD_CR7,
+ R8A7795_PD_ALWAYS_ON },
+ { "a3vc", RCAR_GEN3_PWRSR9, 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 },
- { "3dg-b", 0x100, 1, R8A7795_PD_3DG_B, R8A7795_PD_3DG_A },
- { "3dg-c", 0x100, 2, R8A7795_PD_3DG_C, R8A7795_PD_3DG_B },
- { "3dg-d", 0x100, 3, R8A7795_PD_3DG_D, R8A7795_PD_3DG_C },
- { "3dg-e", 0x100, 4, R8A7795_PD_3DG_E, R8A7795_PD_3DG_D },
- { "a3ir", 0x180, 0, R8A7795_PD_A3IR, R8A7795_PD_ALWAYS_ON },
+ { "a2vc0", RCAR_GEN3_PWRSR10, 0, R8A7795_PD_A2VC0,
+ R8A7795_PD_A3VC },
+ { "a2vc1", RCAR_GEN3_PWRSR10, 1, R8A7795_PD_A2VC1,
+ R8A7795_PD_A3VC },
+ { "3dg-a", RCAR_GEN3_PWRSR2, 0, R8A7795_PD_3DG_A,
+ R8A7795_PD_ALWAYS_ON },
+ { "3dg-b", RCAR_GEN3_PWRSR2, 1, R8A7795_PD_3DG_B,
+ R8A7795_PD_3DG_A },
+ { "3dg-c", RCAR_GEN3_PWRSR2, 2, R8A7795_PD_3DG_C,
+ R8A7795_PD_3DG_B },
+ { "3dg-d", RCAR_GEN3_PWRSR2, 3, R8A7795_PD_3DG_D,
+ R8A7795_PD_3DG_C },
+ { "3dg-e", RCAR_GEN3_PWRSR2, 4, R8A7795_PD_3DG_E,
+ R8A7795_PD_3DG_D },
+ { "a3ir", RCAR_GEN3_PWRSR4, 0, R8A7795_PD_A3IR,
+ R8A7795_PD_ALWAYS_ON },
};
--
2.11.0
