ARM: shmobile: R-Mobile: Store SYSC base address in rmobile_pm_domain

Replace the hardcoded addresses for accessing the SYSC PM domain
registers by register offsets, relative to the SYSC base address stored
in struct rmobile_pm_domain.

In the future, the SYSC base address will come from DT.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Reviewed-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

1 files changed, 11 insertions, 0 deletions

diff --git a/arch/arm/mach-shmobile/pm-sh7372.c b/arch/arm/mach-shmobile/pm-sh7372.c
index 0e37da654ed5..c0293ae4b013 100644
--- a/arch/arm/mach-shmobile/pm-sh7372.c
+++ b/arch/arm/mach-shmobile/pm-sh7372.c
@@ -45,6 +45,8 @@
 #define PLLC01STPCR IOMEM(0xe61500c8)
 
 /* SYSC */
+#define SYSC_BASE IOMEM(0xe6180000)
+
 #define SBAR IOMEM(0xe6180020)
 #define WUPRMSK IOMEM(0xe6180028)
 #define WUPSMSK IOMEM(0xe618002c)
@@ -118,24 +120,28 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
                 .genpd.name = "A4LC",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 1,
         },
         {
                 .genpd.name = "A4MP",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 2,
         },
         {
                 .genpd.name = "D4",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 3,
         },
         {
                 .genpd.name = "A4R",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 5,
                 .suspend = sh7372_a4r_pd_suspend,
                 .resume = sh7372_intcs_resume,
@@ -144,18 +150,21 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
                 .genpd.name = "A3RV",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 6,
         },
         {
                 .genpd.name = "A3RI",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 8,
         },
         {
                 .genpd.name = "A4S",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 10,
                 .gov = &pm_domain_always_on_gov,
                 .no_debug = true,
@@ -166,6 +175,7 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
                 .genpd.name = "A3SP",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 11,
                 .gov = &pm_domain_always_on_gov,
                 .no_debug = true,
@@ -175,6 +185,7 @@ static struct rmobile_pm_domain sh7372_pm_domains[] = {
                 .genpd.name = "A3SG",
                 .genpd.power_on_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
                 .genpd.power_off_latency_ns = PM_DOMAIN_ON_OFF_LATENCY_NS,
+                .base = SYSC_BASE,
                 .bit_shift = 13,
         },
 };