ARM: shmobile: Break out R-Car SYSC PM code

Break out the R-Car SYSC power management code from
the r8a7779 SoC code. With this new shared R-Car SYSC
code base it is possible to hook in Generation 2 SoCs
as well.

Signed-off-by: Magnus Damm <damm@opensource.se>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>

1 files changed, 7 insertions, 124 deletions

diff --git a/arch/arm/mach-shmobile/pm-r8a7779.c b/arch/arm/mach-shmobile/pm-r8a7779.c
index d50a8e9b94a4..d6fe189b2df6 100644
--- a/arch/arm/mach-shmobile/pm-r8a7779.c
+++ b/arch/arm/mach-shmobile/pm-r8a7779.c
@@ -20,132 +20,22 @@
 #include <linux/console.h>
 #include <asm/io.h>
 #include <mach/common.h>
+#include <mach/pm-rcar.h>
 #include <mach/r8a7779.h>
 
-static void __iomem *r8a7779_sysc_base;
-
 /* SYSC */
-#define SYSCSR 0x00
-#define SYSCISR 0x04
-#define SYSCISCR 0x08
 #define SYSCIER 0x0c
 #define SYSCIMR 0x10
-#define PWRSR0 0x40
-#define PWRSR1 0x80
-#define PWRSR2 0xc0
-#define PWRSR3 0x100
-#define PWRSR4 0x140
-
-#define PWRSR_OFFS 0x00
-#define PWROFFCR_OFFS 0x04
-#define PWRONCR_OFFS 0x0c
-#define PWRER_OFFS 0x14
-
-#define SYSCSR_RETRIES 100
-#define SYSCSR_DELAY_US 1
-
-#define SYSCISR_RETRIES 1000
-#define SYSCISR_DELAY_US 1
 
 #if defined(CONFIG_PM) || defined(CONFIG_SMP)
 
-static DEFINE_SPINLOCK(r8a7779_sysc_lock); /* SMP CPUs + I/O devices */
-
-static int r8a7779_sysc_pwr_on_off(struct r8a7779_pm_ch *r8a7779_ch,
-                                   int sr_bit, int reg_offs)
-{
-        int k;
-
-        for (k = 0; k < SYSCSR_RETRIES; k++) {
-                if (ioread32(r8a7779_sysc_base + SYSCSR) & (1 << sr_bit))
-                        break;
-                udelay(SYSCSR_DELAY_US);
-        }
-
-        if (k == SYSCSR_RETRIES)
-                return -EAGAIN;
-
-        iowrite32(1 << r8a7779_ch->chan_bit,
-                  r8a7779_sysc_base + r8a7779_ch->chan_offs + reg_offs);
-
-        return 0;
-}
-
-static int r8a7779_sysc_pwr_off(struct r8a7779_pm_ch *r8a7779_ch)
-{
-        return r8a7779_sysc_pwr_on_off(r8a7779_ch, 0, PWROFFCR_OFFS);
-}
-
-static int r8a7779_sysc_pwr_on(struct r8a7779_pm_ch *r8a7779_ch)
-{
-        return r8a7779_sysc_pwr_on_off(r8a7779_ch, 1, PWRONCR_OFFS);
-}
-
-static int r8a7779_sysc_update(struct r8a7779_pm_ch *r8a7779_ch,
-                               int (*on_off_fn)(struct r8a7779_pm_ch *))
-{
-        unsigned int isr_mask = 1 << r8a7779_ch->isr_bit;
-        unsigned int chan_mask = 1 << r8a7779_ch->chan_bit;
-        unsigned int status;
-        unsigned long flags;
-        int ret = 0;
-        int k;
-
-        spin_lock_irqsave(&r8a7779_sysc_lock, flags);
-
-        iowrite32(isr_mask, r8a7779_sysc_base + SYSCISCR);
-
-        do {
-                ret = on_off_fn(r8a7779_ch);
-                if (ret)
-                        goto out;
-
-                status = ioread32(r8a7779_sysc_base +
-                                  r8a7779_ch->chan_offs + PWRER_OFFS);
-        } while (status & chan_mask);
-
-        for (k = 0; k < SYSCISR_RETRIES; k++) {
-                if (ioread32(r8a7779_sysc_base + SYSCISR) & isr_mask)
-                        break;
-                udelay(SYSCISR_DELAY_US);
-        }
-
-        if (k == SYSCISR_RETRIES)
-                ret = -EIO;
-
-        iowrite32(isr_mask, r8a7779_sysc_base + SYSCISCR);
-
- out:
-        spin_unlock_irqrestore(&r8a7779_sysc_lock, flags);
-
-        pr_debug("r8a7779 power domain %d: %02x %02x %02x %02x %02x -> %d\n",
-                 r8a7779_ch->isr_bit, ioread32(r8a7779_sysc_base + PWRSR0),
-                 ioread32(r8a7779_sysc_base + PWRSR1),
-                 ioread32(r8a7779_sysc_base + PWRSR2),
-                 ioread32(r8a7779_sysc_base + PWRSR3),
-                 ioread32(r8a7779_sysc_base + PWRSR4), ret);
-        return ret;
-}
-
-int r8a7779_sysc_power_down(struct r8a7779_pm_ch *r8a7779_ch)
-{
-        return r8a7779_sysc_update(r8a7779_ch, r8a7779_sysc_pwr_off);
-}
-
-int r8a7779_sysc_power_up(struct r8a7779_pm_ch *r8a7779_ch)
-{
-        return r8a7779_sysc_update(r8a7779_ch, r8a7779_sysc_pwr_on);
-}
-
 static void __init r8a7779_sysc_init(void)
 {
-        r8a7779_sysc_base = ioremap_nocache(0xffd85000, PAGE_SIZE);
-        if (!r8a7779_sysc_base)
-                panic("unable to ioremap r8a7779 SYSC hardware block\n");
+        void __iomem *base = rcar_sysc_init(0xffd85000);
 
         /* enable all interrupt sources, but do not use interrupt handler */
-        iowrite32(0x0131000e, r8a7779_sysc_base + SYSCIER);
-        iowrite32(0, r8a7779_sysc_base + SYSCIMR);
+        iowrite32(0x0131000e, base + SYSCIER);
+        iowrite32(0, base + SYSCIMR);
 }
 
 #else /* CONFIG_PM || CONFIG_SMP */
@@ -158,24 +48,17 @@ static inline void r8a7779_sysc_init(void) {}
 
 static int pd_power_down(struct generic_pm_domain *genpd)
 {
-        return r8a7779_sysc_power_down(to_r8a7779_ch(genpd));
+        return rcar_sysc_power_down(to_r8a7779_ch(genpd));
 }
 
 static int pd_power_up(struct generic_pm_domain *genpd)
 {
-        return r8a7779_sysc_power_up(to_r8a7779_ch(genpd));
+        return rcar_sysc_power_up(to_r8a7779_ch(genpd));
 }
 
 static bool pd_is_off(struct generic_pm_domain *genpd)
 {
-        struct r8a7779_pm_ch *r8a7779_ch = to_r8a7779_ch(genpd);
-        unsigned int st;
-
-        st = ioread32(r8a7779_sysc_base + r8a7779_ch->chan_offs + PWRSR_OFFS);
-        if (st & (1 << r8a7779_ch->chan_bit))
-                return true;
-
-        return false;
+        return rcar_sysc_power_is_off(to_r8a7779_ch(genpd));
 }
 
 static bool pd_active_wakeup(struct device *dev)