Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

arch/x86/platform/atom: Move pmc_atom to drivers/platform/x86

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>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Acked-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: Stephen Boyd <sboyd@codeaurora.org>

authored by

Irina Tirdea and committed by
Stephen Boyd
80a7581f 1141d9d0

+11 -12
-4
arch/x86/Kconfig
··· 2789 2789 bool 2790 2790 depends on STA2X11 2791 2791 2792 - config PMC_ATOM 2793 - def_bool y 2794 - depends on PCI 2795 - 2796 2792 source "net/Kconfig" 2797 2793 2798 2794 source "drivers/Kconfig"
arch/x86/include/asm/pmc_atom.h include/linux/platform_data/x86/pmc_atom.h
-1
arch/x86/platform/atom/Makefile
··· 1 - obj-$(CONFIG_PMC_ATOM) += pmc_atom.o 2 1 obj-$(CONFIG_PUNIT_ATOM_DEBUG) += punit_atom_debug.o
+5 -6
arch/x86/platform/atom/pmc_atom.c drivers/platform/x86/pmc_atom.c
··· 15 15 16 16 #define pr_fmt(fmt) KBUILD_MODNAME ": " fmt 17 17 18 - #include <linux/init.h> 19 - #include <linux/pci.h> 20 - #include <linux/device.h> 21 18 #include <linux/debugfs.h> 22 - #include <linux/seq_file.h> 19 + #include <linux/device.h> 20 + #include <linux/init.h> 23 21 #include <linux/io.h> 24 - 25 - #include <asm/pmc_atom.h> 22 + #include <linux/platform_data/x86/pmc_atom.h> 23 + #include <linux/pci.h> 24 + #include <linux/seq_file.h> 26 25 27 26 struct pmc_bit_map { 28 27 const char *name;
+1 -1
drivers/acpi/acpi_lpss.c
··· 18 18 #include <linux/mutex.h> 19 19 #include <linux/platform_device.h> 20 20 #include <linux/platform_data/clk-lpss.h> 21 + #include <linux/platform_data/x86/pmc_atom.h> 21 22 #include <linux/pm_domain.h> 22 23 #include <linux/pm_runtime.h> 23 24 #include <linux/delay.h> ··· 32 31 #include <asm/cpu_device_id.h> 33 32 #include <asm/intel-family.h> 34 33 #include <asm/iosf_mbi.h> 35 - #include <asm/pmc_atom.h> 36 34 37 35 #define LPSS_ADDR(desc) ((unsigned long)&desc) 38 36
+4
drivers/platform/x86/Kconfig
··· 1077 1077 cables and fans on the wide range Mellanox IB and Ethernet systems. 1078 1078 1079 1079 endif # X86_PLATFORM_DEVICES 1080 + 1081 + config PMC_ATOM 1082 + def_bool y 1083 + depends on PCI
+1
drivers/platform/x86/Makefile
··· 74 74 intel_telemetry_pltdrv.o \ 75 75 intel_telemetry_debugfs.o 76 76 obj-$(CONFIG_INTEL_PMC_CORE) += intel_pmc_core.o 77 + obj-$(CONFIG_PMC_ATOM) += pmc_atom.o 77 78 obj-$(CONFIG_MLX_PLATFORM) += mlx-platform.o 78 79 obj-$(CONFIG_MLX_CPLD_PLATFORM) += mlxcpld-hotplug.o