[COMMON] CPUPM: change header file name of power management

Change-Id: I4dc2c39d118e16cb81a768d6d3d79ad91e058f93
Signed-off-by: lakkyung.jung <lakkyung.jung@samsung.com>

diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
index 79eb15eb600f33b04eaffa8c1319305a336fa0a6..651bf4c8f65ec7b3e1d2e61ab0984eefc4b1f122 100644 (file)
--- a/drivers/i2c/busses/i2c-exynos5.c
+++ b/drivers/i2c/busses/i2c-exynos5.c
@@ -30,10 +30,10 @@
 #include "../../pinctrl/core.h"
 #include "i2c-exynos5.h"
 
+#ifdef CONFIG_CPU_IDLE
 #ifdef CONFIG_ARM64_EXYNOS_CPUIDLE
-#include <soc/samsung/exynos-powermode.h>
+#include <soc/samsung/exynos-cpupm.h>
 #endif
-#ifdef CONFIG_CPU_IDLE
 #include <soc/samsung/exynos-pm.h>
 #endif
 

diff --git a/drivers/soc/samsung/exynos-cpupm.c b/drivers/soc/samsung/exynos-cpupm.c
index 6e5d97b1ee73ae81cf595d844b3eff0001c6caa6..fc2c7affab0878bb2cb567ef34977ab6d9860fb7 100644 (file)
--- a/drivers/soc/samsung/exynos-cpupm.c
+++ b/drivers/soc/samsung/exynos-cpupm.c
@@ -16,7 +16,7 @@
 #include <linux/cpuidle_profiler.h>
 
 #include <soc/samsung/exynos-cpupm.h>
-//#include <soc/samsung/exynos-powermode.h>
+#include <soc/samsung/exynos-powermode.h>
 #include <soc/samsung/cal-if.h>
 #include <soc/samsung/exynos-pmu.h>
 

diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
index a3379b23bdb7b9eeb022626350dd804a0a6cd1cc..8dd8c6ff08f2c3d7c3ce47b76d7c66f77b73cad0 100644 (file)
--- a/drivers/spi/spi-s3c64xx.c
+++ b/drivers/spi/spi-s3c64xx.c
@@ -28,7 +28,6 @@
 #include <linux/gpio.h>
 #include <linux/of.h>
 #include <linux/of_gpio.h>
-#include <soc/samsung/exynos-powermode.h>
 
 #include <linux/platform_data/spi-s3c64xx.h>
 
@@ -36,6 +35,7 @@
 
 #ifdef CONFIG_CPU_IDLE
 #include <soc/samsung/exynos-pm.h>
+#include <soc/samsung/exynos-cpupm.h>
 #endif
 
 #include "../pinctrl/core.h"

diff --git a/drivers/video/fbdev/exynos/dpu20/displayport_drv.c b/drivers/video/fbdev/exynos/dpu20/displayport_drv.c
index e15bb9176fccd72a722fc0b175725b6c381d8f03..9cd552ae3bb61e5414dce74a1f3b19ed81496ff2 100644 (file)
--- a/drivers/video/fbdev/exynos/dpu20/displayport_drv.c
+++ b/drivers/video/fbdev/exynos/dpu20/displayport_drv.c
@@ -29,7 +29,7 @@
 #include <linux/regulator/consumer.h>
 #include <media/v4l2-dv-timings.h>
 #if defined(CONFIG_CPU_IDLE)
-#include <soc/samsung/exynos-powermode.h>
+#include <soc/samsung/exynos-cpupm.h>
 #endif
 #if defined(CONFIG_SND_SOC_SAMSUNG_DISPLAYPORT)
 #include <sound/samsung/dp_ado.h>

diff --git a/include/soc/samsung/exynos-pd.h b/include/soc/samsung/exynos-pd.h
index f07ff3d1216448a7ebda1003ddd7e8733e5d7eac..9389e62264c0ca59e7a12511b160e727dbe7b875 100644 (file)
--- a/include/soc/samsung/exynos-pd.h
+++ b/include/soc/samsung/exynos-pd.h
@@ -31,7 +31,7 @@
 #include <linux/mfd/samsung/core.h>
 #include <soc/samsung/bcm.h>
 
-#include <soc/samsung/exynos-powermode.h>
+#include <soc/samsung/exynos-cpupm.h>
 #include <soc/samsung/exynos-devfreq.h>
 #include <dt-bindings/power/exynos-power.h>