Move intel_ips to intel sub-directory to improve readability
and rename it from intel_ips.c to ips.c
Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx>
---
drivers/platform/x86/Kconfig | 10 ----------
drivers/platform/x86/Makefile | 2 +-
drivers/platform/x86/intel/Kconfig | 10 ++++++++++
drivers/platform/x86/intel/Makefile | 6 ++++++
drivers/platform/x86/{intel_ips.c => intel/ips.c} | 2 +-
5 files changed, 18 insertions(+), 12 deletions(-)
rename drivers/platform/x86/{intel_ips.c => intel/ips.c} (99%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 4750ce36c4d5..5201a0e95b58 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1099,16 +1099,6 @@ config INTEL_IMR
If you are running on a Galileo/Quark say Y here.
-config INTEL_IPS
- tristate "Intel Intelligent Power Sharing"
- depends on ACPI && PCI
- help
- Intel Calpella platforms support dynamic power sharing between the
- CPU and GPU, maximizing performance in a given TDP. This driver,
- along with the CPU frequency and i915 drivers, provides that
- functionality. If in doubt, say Y here; it will only load on
- supported platforms.
-
config INTEL_RST
tristate "Intel Rapid Start Technology Driver"
depends on ACPI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 6210833289a1..9c5b7bf63187 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -119,7 +119,7 @@ obj-$(CONFIG_TOUCHSCREEN_DMI) += touchscreen_dmi.o
obj-$(CONFIG_WIRELESS_HOTKEY) += wireless-hotkey.o
# Intel uncore drivers
-obj-$(CONFIG_INTEL_IPS) += intel_ips.o
+
obj-$(CONFIG_INTEL_RST) += intel-rst.o
obj-$(CONFIG_INTEL_SMARTCONNECT) += intel-smartconnect.o
obj-$(CONFIG_INTEL_SPEED_SELECT_INTERFACE) += intel_speed_select_if/
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index b1b89cd14efc..388e669c9eb9 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -62,4 +62,14 @@ source "drivers/platform/x86/intel/pmc/Kconfig"
source "drivers/platform/x86/intel/scu/Kconfig"
source "drivers/platform/x86/intel/telemetry/Kconfig"
+config INTEL_IPS
+ tristate "Intel Intelligent Power Sharing"
+ depends on ACPI && PCI
+ help
+ Intel Calpella platforms support dynamic power sharing between the
+ CPU and GPU, maximizing performance in a given TDP. This driver,
+ along with the CPU frequency and i915 drivers, provides that
+ functionality. If in doubt, say Y here; it will only load on
+ supported platforms.
+
endif # X86_PLATFORM_DRIVERS_INTEL
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index 834c9ff2e1f6..59cb6be2703e 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -25,3 +25,9 @@ obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
+# Intel uncore drivers
+intel_ips-y := ips.o
+obj-$(CONFIG_INTEL_IPS) += intel_ips.o
+
+
+
diff --git a/drivers/platform/x86/intel_ips.c b/drivers/platform/x86/intel/ips.c
similarity index 99%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips.c
index 4dfdbfca6841..15254cd9042f 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/drivers/platform/x86/intel/ips.c
@@ -62,7 +62,7 @@
#include <drm/i915_drm.h>
#include <asm/msr.h>
#include <asm/processor.h>
-#include "intel_ips.h"
+#include "../intel_ips.h"
#include <linux/io-64-nonatomic-lo-hi.h>
--
2.31.1
