From: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
To: linux-clk@vger.kernel.org, x86@kernel.org,
platform-driver-x86@vger.kernel.org,
Stephen Boyd <sboyd@codeaurora.org>,
Darren Hart <dvhart@infradead.org>,
Thomas Gleixner <tglx@linutronix.de>
Cc: alsa-devel@alsa-project.org,
Irina Tirdea <irina.tirdea@intel.com>,
Michael Turquette <mturquette@baylibre.com>,
"Rafael J . Wysocki" <rjw@rjwysocki.net>,
Takashi Iwai <tiwai@suse.com>,
linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org,
Ingo Molnar <mingo@redhat.com>, Mark Brown <broonie@kernel.org>,
"H . Peter Anvin" <hpa@zytor.com>, Len Brown <lenb@kernel.org>,
Andy Shevchenko <andriy.shevchenko@linux.intel.com>,
Vinod Koul <vinod.koul@intel.com>,
Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Subject: [PATCH v8 3/5] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86
Date: Mon, 23 Jan 2017 12:07:43 -0600 [thread overview]
Message-ID: <1485194865-10400-4-git-send-email-pierre-louis.bossart@linux.intel.com> (raw)
In-Reply-To: <1485194865-10400-1-git-send-email-pierre-louis.bossart@linux.intel.com>
From: Irina Tirdea <irina.tirdea@intel.com>
The pmc_atom driver does not contain any architecture specific
code. It only enables the SoC Power Management Controller driver
for BayTrail and CherryTrail platforms.
Move the pmc_atom driver from arch/x86/platform/atom to
drivers/platform/x86. Also clean-up and reorder include files by
alphabetical order in pmc_atom.h
Signed-off-by: Irina Tirdea <irina.tirdea@intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
---
arch/x86/Kconfig | 4 ----
arch/x86/platform/atom/Makefile | 1 -
drivers/acpi/acpi_lpss.c | 2 +-
drivers/platform/x86/Kconfig | 4 ++++
drivers/platform/x86/Makefile | 1 +
{arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c | 9 ++++-----
.../include/asm => include/linux/platform_data/x86}/pmc_atom.h | 0
7 files changed, 10 insertions(+), 11 deletions(-)
rename {arch/x86/platform/atom => drivers/platform/x86}/pmc_atom.c (99%)
rename {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h (100%)
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig
index e487493..7b4f178 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2789,10 +2789,6 @@ config X86_DMA_REMAP
bool
depends on STA2X11
-config PMC_ATOM
- def_bool y
- depends on PCI
-
source "net/Kconfig"
source "drivers/Kconfig"
diff --git a/arch/x86/platform/atom/Makefile b/arch/x86/platform/atom/Makefile
index 40983f5..57be88f 100644
--- a/arch/x86/platform/atom/Makefile
+++ b/arch/x86/platform/atom/Makefile
@@ -1,2 +1 @@
-obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
obj-$(CONFIG_PUNIT_ATOM_DEBUG) += punit_atom_debug.o
diff --git a/drivers/acpi/acpi_lpss.c b/drivers/acpi/acpi_lpss.c
index 8ea836c..90d112a 100644
--- a/drivers/acpi/acpi_lpss.c
+++ b/drivers/acpi/acpi_lpss.c
@@ -18,6 +18,7 @@
#include <linux/mutex.h>
#include <linux/platform_device.h>
#include <linux/platform_data/clk-lpss.h>
+#include <linux/platform_data/x86/pmc_atom.h>
#include <linux/pm_domain.h>
#include <linux/pm_runtime.h>
#include <linux/delay.h>
@@ -31,7 +32,6 @@ ACPI_MODULE_NAME("acpi_lpss");
#include <asm/cpu_device_id.h>
#include <asm/intel-family.h>
#include <asm/iosf_mbi.h>
-#include <asm/pmc_atom.h>
#define LPSS_ADDR(desc) ((unsigned long)&desc)
diff --git a/drivers/platform/x86/Kconfig b/drivers/platform/x86/Kconfig
index 59aa8e3..8b1988a 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1077,3 +1077,7 @@ config MLX_CPLD_PLATFORM
cables and fans on the wide range Mellanox IB and Ethernet systems.
endif # X86_PLATFORM_DEVICES
+
+config PMC_ATOM
+ def_bool y
+ depends on PCI
diff --git a/drivers/platform/x86/Makefile b/drivers/platform/x86/Makefile
index d4111f0..49ee7ef 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -74,5 +74,6 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \
intel_telemetry_pltdrv.o \
intel_telemetry_debugfs.o
obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o
+obj-$(CONFIG_PMC_ATOM) += pmc_atom.o
obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o
obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o
diff --git a/arch/x86/platform/atom/pmc_atom.c b/drivers/platform/x86/pmc_atom.c
similarity index 99%
rename from arch/x86/platform/atom/pmc_atom.c
rename to drivers/platform/x86/pmc_atom.c
index 964ff4f..e1dfb1b 100644
--- a/arch/x86/platform/atom/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -15,14 +15,13 @@
#define pr_fmt(fmt) KBUILD_MODNAME ": " fmt
+#include <linux/debugfs.h>
+#include <linux/device.h>
#include <linux/init.h>
+#include <linux/io.h>
+#include <linux/platform_data/x86/pmc_atom.h>
#include <linux/pci.h>
-#include <linux/device.h>
-#include <linux/debugfs.h>
#include <linux/seq_file.h>
-#include <linux/io.h>
-
-#include <asm/pmc_atom.h>
struct pmc_bit_map {
const char *name;
diff --git a/arch/x86/include/asm/pmc_atom.h b/include/linux/platform_data/x86/pmc_atom.h
similarity index 100%
rename from arch/x86/include/asm/pmc_atom.h
rename to include/linux/platform_data/x86/pmc_atom.h
--
2.7.4
next prev parent reply other threads:[~2017-01-23 18:07 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-01-23 18:07 [PATCH v8 0/5] Add platform clock for BayTrail platforms Pierre-Louis Bossart
2017-01-23 18:07 ` [PATCH v8 1/5] clk: Make x86/ conditional on CONFIG_COMMON_CLK Pierre-Louis Bossart
2017-01-27 0:22 ` Stephen Boyd
2017-01-23 18:07 ` [PATCH v8 2/5] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart
2017-01-27 0:22 ` Stephen Boyd
2017-01-23 18:07 ` Pierre-Louis Bossart [this message]
2017-01-23 18:07 ` [PATCH v8 4/5] platform/x86: Enable " Pierre-Louis Bossart
2017-01-27 0:23 ` Stephen Boyd
2017-07-10 10:19 ` Enric Balletbo Serra
2017-01-23 18:07 ` [PATCH v8 5/5] platform/x86: fix typo in comment Pierre-Louis Bossart
2017-01-27 0:23 ` Stephen Boyd
2017-01-23 21:47 ` [PATCH v8 0/5] Add platform clock for BayTrail platforms Andy Shevchenko
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=1485194865-10400-4-git-send-email-pierre-louis.bossart@linux.intel.com \
--to=pierre-louis.bossart@linux.intel.com \
--cc=alsa-devel@alsa-project.org \
--cc=andriy.shevchenko@linux.intel.com \
--cc=broonie@kernel.org \
--cc=dvhart@infradead.org \
--cc=hpa@zytor.com \
--cc=irina.tirdea@intel.com \
--cc=lenb@kernel.org \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=mingo@redhat.com \
--cc=mturquette@baylibre.com \
--cc=platform-driver-x86@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=sboyd@codeaurora.org \
--cc=tglx@linutronix.de \
--cc=tiwai@suse.com \
--cc=vinod.koul@intel.com \
--cc=x86@kernel.org \
/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 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).