All of lore.kernel.org
 help / color / mirror / Atom feed
From: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
To: Hans de Goede <hdegoede@redhat.com>,
	Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
	Kate Hsuan <hpa@redhat.com>,
	Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>,
	linux-kernel@vger.kernel.org,
	platform-driver-x86@vger.kernel.org, Dell.Client.Kernel@dell.com
Cc: Mark Gross <mgross@linux.intel.com>,
	Alex Hung <alex.hung@canonical.com>,
	Rajneesh Bhardwaj <irenic.rajneesh@gmail.com>,
	David E Box <david.e.box@intel.com>,
	Zha Qipeng <qipeng.zha@intel.com>,
	Mika Westerberg <mika.westerberg@linux.intel.com>,
	"David E. Box" <david.e.box@linux.intel.com>,
	AceLan Kao <acelan.kao@canonical.com>,
	Jithu Joseph <jithu.joseph@intel.com>,
	Maurice Ma <maurice.ma@intel.com>
Subject: [PATCH v4 08/21] platform/x86: intel_ips: Move to intel sub-directory
Date: Thu, 19 Aug 2021 19:37:22 +0300	[thread overview]
Message-ID: <20210819163735.81803-9-andriy.shevchenko@linux.intel.com> (raw)
In-Reply-To: <20210819163735.81803-1-andriy.shevchenko@linux.intel.com>

From: Kate Hsuan <hpa@redhat.com>

Move Intel IPS driver to intel sub-directory to improve readability
and rename it from intel_ips.c to ips.c.

The header file is deliberately left untouched and will be moved
as part of DRM subsystem development.

Signed-off-by: Kate Hsuan <hpa@redhat.com>
Reviewed-by: Hans de Goede <hdegoede@redhat.com>
Signed-off-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
---
 drivers/platform/x86/Kconfig                      | 10 ----------
 drivers/platform/x86/Makefile                     |  1 -
 drivers/platform/x86/intel/Kconfig                | 10 ++++++++++
 drivers/platform/x86/intel/Makefile               |  4 ++++
 drivers/platform/x86/{intel_ips.c => intel/ips.c} |  3 ++-
 5 files changed, 16 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 b6e32551a8f5..27af97d1407a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -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
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index 633cc14eba2c..fef347925d81 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -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/
diff --git a/drivers/platform/x86/intel/Kconfig b/drivers/platform/x86/intel/Kconfig
index bedd3bdb0662..5f1dc8b1a874 100644
--- a/drivers/platform/x86/intel/Kconfig
+++ b/drivers/platform/x86/intel/Kconfig
@@ -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
diff --git a/drivers/platform/x86/intel/Makefile b/drivers/platform/x86/intel/Makefile
index d446771dbff2..77cb50b90e67 100644
--- a/drivers/platform/x86/intel/Makefile
+++ b/drivers/platform/x86/intel/Makefile
@@ -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
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..0c86bdbcc5d5 100644
--- a/drivers/platform/x86/intel_ips.c
+++ b/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>
 
-- 
2.32.0


  parent reply	other threads:[~2021-08-19 16:38 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19 16:37 [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 01/21] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 02/21] platform/x86: intel_chtdc_ti_pwrbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 03/21] platform/x86: intel_mrfld_pwrbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 04/21] platform/x86: intel_punit_ipc: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 05/21] platform/x86: intel_pmc_core: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 06/21] platform/x86: intel_scu: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 07/21] platform/x86: intel_telemetry: " Andy Shevchenko
2021-08-19 16:37 ` Andy Shevchenko [this message]
2021-08-19 16:37 ` [PATCH v4 09/21] platform/x86: intel-rst: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 10/21] platform/x86: intel-smartconnect: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 11/21] platform/x86: intel_turbo_max_3: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 12/21] platform/x86: intel-uncore-frequency: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 13/21] platform/x86: intel_speed_select_if: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 14/21] platform/x86: intel_atomisp2: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 15/21] platform/x86: intel-hid: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 16/21] platform/x86: intel_int0002_vgpio: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 17/21] platform/x86: intel_oaktrail: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 18/21] platform/x86: intel-vbtn: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 19/21] platform/x86: intel-wmi-sbl-fw-update: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 20/21] platform/x86: intel-wmi-thunderbolt: " Andy Shevchenko
2021-08-19 16:37 ` [PATCH v4 21/21] platform/x86/intel: scu: Fix doc of intel_scu_ipc_dev_command_with_size() Andy Shevchenko
2021-08-19 17:46 ` [PATCH v4 00/21] platform/x86: Intel platform driver code movement Andy Shevchenko
2021-08-19 18:46 ` Hans de Goede
2021-08-20 10:12   ` Andy Shevchenko
2021-08-20 10:22     ` Hans de Goede

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20210819163735.81803-9-andriy.shevchenko@linux.intel.com \
    --to=andriy.shevchenko@linux.intel.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=david.e.box@intel.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hdegoede@redhat.com \
    --cc=hpa@redhat.com \
    --cc=irenic.rajneesh@gmail.com \
    --cc=jithu.joseph@intel.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=maurice.ma@intel.com \
    --cc=mgross@linux.intel.com \
    --cc=mika.westerberg@linux.intel.com \
    --cc=platform-driver-x86@vger.kernel.org \
    --cc=qipeng.zha@intel.com \
    --cc=srinivas.pandruvada@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.