Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]
Groups > linux.kernel > #1539587
| From | Irina Tirdea <irina.tirdea@intel.com> |
|---|---|
| Newsgroups | linux.kernel |
| Subject | [PATCH v6 2/3] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 |
| Date | 2016-12-09 19:10 +0100 |
| Message-ID | <sMxMl-6wk-33@gated-at.bofh.it> (permalink) |
| References | <sMxMl-6wk-27@gated-at.bofh.it> |
| Organization | linux.* mail to news gateway |
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.
Signed-off-by: Irina Tirdea <irina.tirdea@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 | 3 +--
{arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h | 0
7 files changed, 7 insertions(+), 8 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 bada636..5a009f0 100644
--- a/arch/x86/Kconfig
+++ b/arch/x86/Kconfig
@@ -2753,10 +2753,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 373657f..3e4c566 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 @@
#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 b8a21d7..21dce1e 100644
--- a/drivers/platform/x86/Kconfig
+++ b/drivers/platform/x86/Kconfig
@@ -1028,3 +1028,7 @@ config INTEL_TELEMETRY
directly via debugfs files. Various tools may use
this interface for SoC state monitoring.
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 2efa86d..8568d74 100644
--- a/drivers/platform/x86/Makefile
+++ b/drivers/platform/x86/Makefile
@@ -71,3 +71,4 @@ 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
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..b53fbc1 100644
--- a/arch/x86/platform/atom/pmc_atom.c
+++ b/drivers/platform/x86/pmc_atom.c
@@ -21,8 +21,7 @@
#include <linux/debugfs.h>
#include <linux/seq_file.h>
#include <linux/io.h>
-
-#include <asm/pmc_atom.h>
+#include <linux/platform_data/x86/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
--
1.9.1
Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread
[PATCH v6 0/3] Add platform clock for BayTrail platforms Irina Tirdea <irina.tirdea@intel.com> - 2016-12-09 19:10 +0100
[PATCH v6 2/3] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 Irina Tirdea <irina.tirdea@intel.com> - 2016-12-09 19:10 +0100
Re: [PATCH v6 2/3] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-13 00:50 +0100
Re: [PATCH v6 2/3] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 Darren Hart <dvhart@infradead.org> - 2016-12-16 19:30 +0100
Re: [PATCH v6 2/3] arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86 Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-16 19:40 +0100
[PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Irina Tirdea <irina.tirdea@intel.com> - 2016-12-09 19:10 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-13 00:40 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> - 2016-12-13 01:20 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-13 01:30 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Darren Hart <dvhart@infradead.org> - 2016-12-16 19:40 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-16 19:50 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Darren Hart <dvhart@infradead.org> - 2016-12-16 20:30 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-16 23:30 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Darren Hart <dvhart@infradead.org> - 2016-12-17 00:00 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Mark Brown <broonie@kernel.org> - 2016-12-19 12:10 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-13 02:20 +0100
Re: [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Stephen Boyd <sboyd@codeaurora.org> - 2016-12-14 00:30 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> - 2016-12-16 06:20 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-16 09:50 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> - 2016-12-16 16:00 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Stephen Boyd <sboyd@codeaurora.org> - 2016-12-17 02:40 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-17 15:00 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> - 2016-12-19 17:20 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Stephen Boyd <sboyd@codeaurora.org> - 2016-12-22 00:10 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> - 2016-12-22 02:10 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Stephen Boyd <sboyd@codeaurora.org> - 2016-12-22 19:30 +0100
Re: [alsa-devel] [PATCH v6 1/3] clk: x86: Add Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-22 19:50 +0100
[PATCH v6 3/3] platform/x86: Enable Atom PMC platform clocks Irina Tirdea <irina.tirdea@intel.com> - 2016-12-09 19:10 +0100
Re: [PATCH v6 3/3] platform/x86: Enable Atom PMC platform clocks Andy Shevchenko <andy.shevchenko@gmail.com> - 2016-12-13 01:10 +0100
csiph-web