From: lakkyung.jung <lakkyung.jung@samsung.com>
Date: Mon, 21 May 2018 10:21:47 +0000 (+0900)
Subject: [COMMON] CPUPM: change header file name of power management
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=b0008f337765ad27eae76c65541c4014a684662f;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

[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 79eb15eb600f..651bf4c8f65e 100644
--- 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 6e5d97b1ee73..fc2c7affab08 100644
--- 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 a3379b23bdb7..8dd8c6ff08f2 100644
--- 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 e15bb9176fcc..9cd552ae3bb6 100644
--- 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 f07ff3d12164..9389e62264c0 100644
--- 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>