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 | 7 +++++++
drivers/platform/x86/{intel_ips.c => intel/ips.c} | 0
5 files changed, 18 insertions(+), 11 deletions(-)
rename drivers/platform/x86/{intel_ips.c => intel/ips.c} (100%)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index fdc8b4c259ee..eca113f6dd0c 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1109,16 +1109,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 bd9754dfa37d..fdbaaf9486df 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -120,7 +120,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 fb409f044e27..300fc8bbc907 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 51ea5ee1f833..adb61cf3a387 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -25,3 +25,10 @@ obj-$(CONFIG_INTEL_SCU_WDT) += scu/
obj-$(CONFIG_INTEL_SCU_IPC_UTIL) += scu/
obj-$(CONFIG_INTEL_TELEMETRY) += telemetry/
+# Intel uncore drivers
+CFLAGS_ips.o := -I./drivers/platform/x86
+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 100%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips.c
--
2.31.1
