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

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@redhat.com>
---
 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


  parent reply	other threads:[~2021-08-19  3:31 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-08-19  3:29 [PATCH v3 00/20] Intel platform driver code movement Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 01/20] platform/x86: intel_bxtwc_tmu: Move to intel sub-directory Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 02/20] platform/x86: intel_chtdc_ti_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 03/20] platform/x86: intel_mrfld_pwrbtn: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 04/20] platform/x86: intel_punit_ipc: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 05/20] platform/x86: intel_pmc_core: " Kate Hsuan
2021-08-19  8:37   ` Hans de Goede
2021-08-19 12:05   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 06/20] platform/x86: intel_scu: " Kate Hsuan
2021-08-19  8:48   ` Hans de Goede
2021-08-19 12:08   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 07/20] platform/x86: intel_telemetry: " Kate Hsuan
2021-08-19 12:11   ` Andy Shevchenko
2021-08-19  3:29 ` Kate Hsuan [this message]
2021-08-19  3:29 ` [PATCH v3 09/20] platform/x86: intel-rst: " Kate Hsuan
2021-08-19 12:13   ` Andy Shevchenko
2021-08-19  3:29 ` [PATCH v3 10/20] platform/x86: intel-smartconnect: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 11/20] platform/x86: intel_turbo_max_3: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 12/20] platform/x86: intel-uncore-frequency: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 13/20] platform/x86: intel_speed_select_if: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 14/20] platform/x86: intel_atomisp2_led: " Kate Hsuan
2021-08-19  9:08   ` Hans de Goede
2021-08-19  3:29 ` [PATCH v3 15/20] platform/x86: intel-hid: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 16/20] platform/x86: intel_int0002_vgpio: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 17/20] platform/x86: intel_oaktrail: " Kate Hsuan
2021-08-19  3:29 ` [PATCH v3 18/20] platform/x86: intel-vbtn: " Kate Hsuan
2021-08-19  3:30 ` [PATCH v3 19/20] platform/x86: intel-wmi-sbl-fw-updat: " Kate Hsuan
2021-08-19  3:30 ` [PATCH v3 20/20] platform/x86: intel-wmi-thunderbolt: " Kate Hsuan
2021-08-19  9:29   ` Hans de Goede
2021-08-19 10:47 ` [PATCH v3 00/20] Intel platform driver code movement Hans de Goede
2021-08-19 12:03   ` Andy Shevchenko
2021-08-19 12:14     ` Andy Shevchenko
2021-08-19 12:46       ` Andy Shevchenko
2021-08-19 13:31       ` Hans de Goede
2021-08-19 13:34         ` Hans de Goede
2021-08-19 14:01           ` Andy Shevchenko
2021-08-19 14:08             ` 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=20210819033001.20136-9-hpa@redhat.com \
    --to=hpa@redhat.com \
    --cc=Dell.Client.Kernel@dell.com \
    --cc=acelan.kao@canonical.com \
    --cc=alex.hung@canonical.com \
    --cc=david.e.box@linux.intel.com \
    --cc=hdegoede@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 \
    --cc=sujith.thomas@intel.com \
    --subject='Re: [PATCH v3 08/20] platform/x86: intel_ips: Move to intel sub-directory' \
    /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

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).