@@ -1100,16 +1100,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
@@ -119,7 +119,6 @@ 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/
@@ -62,4 +62,14 @@ config INTEL_PUNIT_IPC
This driver provides support for Intel P-Unit Mailbox IPC mechanism,
which is used to bridge the communications between kernel and P-Unit.
+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
@@ -21,3 +21,7 @@ intel_mrfld_pwrbtn-y := mrfld_pwrbtn.o
obj-$(CONFIG_INTEL_MRFLD_PWRBTN) += intel_mrfld_pwrbtn.o
intel_punit_ipc-y := punit_ipc.o
obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o
+
+# Intel Uncore drivers
+intel_ips-y := ips.o
+obj-$(CONFIG_INTEL_IPS) += intel_ips.o
similarity index 99%
rename from drivers/platform/x86/intel_ips.c
rename to drivers/platform/x86/intel/ips.c
@@ -62,7 +62,8 @@
#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>