]> git.karo-electronics.de Git - karo-tx-linux.git/blobdiff - arch/arm/mach-exynos/pm.c
Merge tag 'trace-fixes-3.16' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...
[karo-tx-linux.git] / arch / arm / mach-exynos / pm.c
index 202ca73e49c4f257e65bd201e9bf511cf979ee6f..18646b7e226b2ba9bdf154e6ccee188b6cb7d211 100644 (file)
 #include <asm/suspend.h>
 
 #include <plat/pm-common.h>
-#include <plat/pll.h>
 #include <plat/regs-srom.h>
 
 #include <mach/map.h>
 
 #include "common.h"
 #include "regs-pmu.h"
+#include "regs-sys.h"
 
 /**
  * struct exynos_wkup_irq - Exynos GIC to PMU IRQ mapping
@@ -100,78 +100,16 @@ static int exynos_irq_set_wake(struct irq_data *data, unsigned int state)
        return -ENOENT;
 }
 
-/**
- * exynos_core_power_down : power down the specified cpu
- * @cpu : the cpu to power down
- *
- * Power down the specified cpu. The sequence must be finished by a
- * call to cpu_do_idle()
- *
- */
-void exynos_cpu_power_down(int cpu)
-{
-       __raw_writel(0, EXYNOS_ARM_CORE_CONFIGURATION(cpu));
-}
-
-/**
- * exynos_cpu_power_up : power up the specified cpu
- * @cpu : the cpu to power up
- *
- * Power up the specified cpu
- */
-void exynos_cpu_power_up(int cpu)
-{
-       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                    EXYNOS_ARM_CORE_CONFIGURATION(cpu));
-}
-
-/**
- * exynos_cpu_power_state : returns the power state of the cpu
- * @cpu : the cpu to retrieve the power state from
- *
- */
-int exynos_cpu_power_state(int cpu)
-{
-       return (__raw_readl(EXYNOS_ARM_CORE_STATUS(cpu)) &
-                       S5P_CORE_LOCAL_PWR_EN);
-}
-
-/**
- * exynos_cluster_power_down : power down the specified cluster
- * @cluster : the cluster to power down
- */
-void exynos_cluster_power_down(int cluster)
-{
-       __raw_writel(0, EXYNOS_COMMON_CONFIGURATION(cluster));
-}
-
-/**
- * exynos_cluster_power_up : power up the specified cluster
- * @cluster : the cluster to power up
- */
-void exynos_cluster_power_up(int cluster)
-{
-       __raw_writel(S5P_CORE_LOCAL_PWR_EN,
-                    EXYNOS_COMMON_CONFIGURATION(cluster));
-}
-
-/**
- * exynos_cluster_power_state : returns the power state of the cluster
- * @cluster : the cluster to retrieve the power state from
- *
- */
-int exynos_cluster_power_state(int cluster)
-{
-       return (__raw_readl(EXYNOS_COMMON_STATUS(cluster)) &
-                       S5P_CORE_LOCAL_PWR_EN);
-}
-
 #define EXYNOS_BOOT_VECTOR_ADDR        (samsung_rev() == EXYNOS4210_REV_1_1 ? \
-                       S5P_INFORM7 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
-                       (sysram_base_addr + 0x24) : S5P_INFORM0))
+                       pmu_base_addr + S5P_INFORM7 : \
+                       (samsung_rev() == EXYNOS4210_REV_1_0 ? \
+                       (sysram_base_addr + 0x24) : \
+                       pmu_base_addr + S5P_INFORM0))
 #define EXYNOS_BOOT_VECTOR_FLAG        (samsung_rev() == EXYNOS4210_REV_1_1 ? \
-                       S5P_INFORM6 : (samsung_rev() == EXYNOS4210_REV_1_0 ? \
-                       (sysram_base_addr + 0x20) : S5P_INFORM1))
+                       pmu_base_addr + S5P_INFORM6 : \
+                       (samsung_rev() == EXYNOS4210_REV_1_0 ? \
+                       (sysram_base_addr + 0x20) : \
+                       pmu_base_addr + S5P_INFORM1))
 
 #define S5P_CHECK_AFTR  0xFCBA0D10
 #define S5P_CHECK_SLEEP 0x00000BAD
@@ -179,7 +117,7 @@ int exynos_cluster_power_state(int cluster)
 /* Ext-GIC nIRQ/nFIQ is the only wakeup source in AFTR */
 static void exynos_set_wakeupmask(long mask)
 {
-       __raw_writel(mask, S5P_WAKEUP_MASK);
+       pmu_raw_writel(mask, S5P_WAKEUP_MASK);
 }
 
 static void exynos_cpu_set_boot_vector(long flags)
@@ -256,27 +194,27 @@ static void exynos_pm_prepare(void)
        unsigned int tmp;
 
        /* Set wake-up mask registers */
-       __raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
-       __raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
+       pmu_raw_writel(exynos_get_eint_wake_mask(), S5P_EINT_WAKEUP_MASK);
+       pmu_raw_writel(exynos_irqwake_intmask & ~(1 << 31), S5P_WAKEUP_MASK);
 
        s3c_pm_do_save(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
        if (soc_is_exynos5250()) {
                s3c_pm_do_save(exynos5_sys_save, ARRAY_SIZE(exynos5_sys_save));
                /* Disable USE_RETENTION of JPEG_MEM_OPTION */
-               tmp = __raw_readl(EXYNOS5_JPEG_MEM_OPTION);
+               tmp = pmu_raw_readl(EXYNOS5_JPEG_MEM_OPTION);
                tmp &= ~EXYNOS5_OPTION_USE_RETENTION;
-               __raw_writel(tmp, EXYNOS5_JPEG_MEM_OPTION);
+               pmu_raw_writel(tmp, EXYNOS5_JPEG_MEM_OPTION);
        }
 
        /* Set value of power down register for sleep mode */
 
        exynos_sys_powerdown_conf(SYS_SLEEP);
-       __raw_writel(S5P_CHECK_SLEEP, S5P_INFORM1);
+       pmu_raw_writel(S5P_CHECK_SLEEP, S5P_INFORM1);
 
        /* ensure at least INFORM0 has the resume address */
 
-       __raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);
+       pmu_raw_writel(virt_to_phys(exynos_cpu_resume), S5P_INFORM0);
 }
 
 static void exynos_pm_central_suspend(void)
@@ -284,9 +222,9 @@ static void exynos_pm_central_suspend(void)
        unsigned long tmp;
 
        /* Setting Central Sequence Register for power down mode */
-       tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
+       tmp = pmu_raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
        tmp &= ~S5P_CENTRAL_LOWPWR_CFG;
-       __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+       pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
 }
 
 static int exynos_pm_suspend(void)
@@ -298,9 +236,9 @@ static int exynos_pm_suspend(void)
        /* Setting SEQ_OPTION register */
 
        tmp = (S5P_USE_STANDBY_WFI0 | S5P_USE_STANDBY_WFE0);
-       __raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
+       pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_OPTION);
 
-       if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+       if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                exynos_cpu_save_register();
 
        return 0;
@@ -316,12 +254,12 @@ static int exynos_pm_central_resume(void)
         * S5P_CENTRAL_LOWPWR_CFG bit will not be set automatically
         * in this situation.
         */
-       tmp = __raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
+       tmp = pmu_raw_readl(S5P_CENTRAL_SEQ_CONFIGURATION);
        if (!(tmp & S5P_CENTRAL_LOWPWR_CFG)) {
                tmp |= S5P_CENTRAL_LOWPWR_CFG;
-               __raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
+               pmu_raw_writel(tmp, S5P_CENTRAL_SEQ_CONFIGURATION);
                /* clear the wakeup state register */
-               __raw_writel(0x0, S5P_WAKEUP_STAT);
+               pmu_raw_writel(0x0, S5P_WAKEUP_STAT);
                /* No need to perform below restore code */
                return -1;
        }
@@ -334,18 +272,18 @@ static void exynos_pm_resume(void)
        if (exynos_pm_central_resume())
                goto early_wakeup;
 
-       if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+       if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                exynos_cpu_restore_register();
 
        /* For release retention */
 
-       __raw_writel((1 << 28), S5P_PAD_RET_MAUDIO_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_GPIO_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_UART_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_MMCA_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_MMCB_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_EBIA_OPTION);
-       __raw_writel((1 << 28), S5P_PAD_RET_EBIB_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_MAUDIO_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_GPIO_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_UART_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_MMCA_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_MMCB_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_EBIA_OPTION);
+       pmu_raw_writel((1 << 28), S5P_PAD_RET_EBIB_OPTION);
 
        if (soc_is_exynos5250())
                s3c_pm_do_restore(exynos5_sys_save,
@@ -353,13 +291,13 @@ static void exynos_pm_resume(void)
 
        s3c_pm_do_restore_core(exynos_core_save, ARRAY_SIZE(exynos_core_save));
 
-       if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+       if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                scu_enable(S5P_VA_SCU);
 
 early_wakeup:
 
        /* Clear SLEEP mode set in INFORM1 */
-       __raw_writel(0x0, S5P_INFORM1);
+       pmu_raw_writel(0x0, S5P_INFORM1);
 
        return;
 }
@@ -403,7 +341,7 @@ static int exynos_suspend_enter(suspend_state_t state)
        s3c_pm_restore_uarts();
 
        S3C_PMDBG("%s: wakeup stat: %08x\n", __func__,
-                       __raw_readl(S5P_WAKEUP_STAT));
+                       pmu_raw_readl(S5P_WAKEUP_STAT));
 
        s3c_pm_check_restore();
 
@@ -440,15 +378,14 @@ static int exynos_cpu_pm_notifier(struct notifier_block *self,
        case CPU_PM_ENTER:
                if (cpu == 0) {
                        exynos_pm_central_suspend();
-                       if (read_cpuid_part_number() == ARM_CPU_PART_CORTEX_A9)
+                       if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9)
                                exynos_cpu_save_register();
                }
                break;
 
        case CPU_PM_EXIT:
                if (cpu == 0) {
-                       if (read_cpuid_part_number() ==
-                                       ARM_CPU_PART_CORTEX_A9) {
+                       if (read_cpuid_part() == ARM_CPU_PART_CORTEX_A9) {
                                scu_enable(S5P_VA_SCU);
                                exynos_cpu_restore_register();
                        }
@@ -474,9 +411,9 @@ void __init exynos_pm_init(void)
        gic_arch_extn.irq_set_wake = exynos_irq_set_wake;
 
        /* All wakeup disable */
-       tmp = __raw_readl(S5P_WAKEUP_MASK);
+       tmp = pmu_raw_readl(S5P_WAKEUP_MASK);
        tmp |= ((0xFF << 8) | (0x1F << 1));
-       __raw_writel(tmp, S5P_WAKEUP_MASK);
+       pmu_raw_writel(tmp, S5P_WAKEUP_MASK);
 
        register_syscore_ops(&exynos_pm_syscore_ops);
        suspend_set_ops(&exynos_suspend_ops);