Commit 80a7581f authored by Irina Tirdea's avatar Irina Tirdea Committed by Stephen Boyd
Browse files

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: default avatarIrina Tirdea <irina.tirdea@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Signed-off-by: default avatarStephen Boyd <sboyd@codeaurora.org>
parent 1141d9d0

arch/x86/Kconfig

+0 −4
Original line number Original line Diff line number Diff line
@@ -2789,10 +2789,6 @@ config X86_DMA_REMAP 
	bool

	bool

	depends on STA2X11

	depends on STA2X11





config PMC_ATOM

	def_bool y

        depends on PCI



source "net/Kconfig"

source "net/Kconfig"





source "drivers/Kconfig"

source "drivers/Kconfig"

arch/x86/platform/atom/Makefile

+0 −1
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_PMC_ATOM)		+= pmc_atom.o

obj-$(CONFIG_PUNIT_ATOM_DEBUG)	+= punit_atom_debug.o
 
obj-$(CONFIG_PUNIT_ATOM_DEBUG)	+= punit_atom_debug.o

drivers/acpi/acpi_lpss.c

+1 −1
Original line number Original line Diff line number Diff line
@@ -18,6 +18,7 @@ 
#include <linux/mutex.h>

#include <linux/mutex.h>

#include <linux/platform_device.h>

#include <linux/platform_device.h>

#include <linux/platform_data/clk-lpss.h>

#include <linux/platform_data/clk-lpss.h>

#include <linux/platform_data/x86/pmc_atom.h>

#include <linux/pm_domain.h>

#include <linux/pm_domain.h>

#include <linux/pm_runtime.h>

#include <linux/pm_runtime.h>

#include <linux/delay.h>

#include <linux/delay.h>
@@ -31,7 +32,6 @@ ACPI_MODULE_NAME("acpi_lpss"); 
#include <asm/cpu_device_id.h>

#include <asm/cpu_device_id.h>

#include <asm/intel-family.h>

#include <asm/intel-family.h>

#include <asm/iosf_mbi.h>

#include <asm/iosf_mbi.h>

#include <asm/pmc_atom.h>





#define LPSS_ADDR(desc) ((unsigned long)&desc)

#define LPSS_ADDR(desc) ((unsigned long)&desc)

drivers/platform/x86/Kconfig

+4 −0
Original line number Original line Diff line number Diff line
@@ -1077,3 +1077,7 @@ config MLX_CPLD_PLATFORM 
	  cables and fans on the wide range Mellanox IB and Ethernet systems.

	  cables and fans on the wide range Mellanox IB and Ethernet systems.





endif # X86_PLATFORM_DEVICES

endif # X86_PLATFORM_DEVICES



config PMC_ATOM

       def_bool y

       depends on PCI

drivers/platform/x86/Makefile

+1 −0
Original line number Original line Diff line number Diff line
@@ -74,5 +74,6 @@ obj-$(CONFIG_INTEL_TELEMETRY) += intel_telemetry_core.o \ 
				   intel_telemetry_pltdrv.o \

				   intel_telemetry_pltdrv.o \

				   intel_telemetry_debugfs.o

				   intel_telemetry_debugfs.o

obj-$(CONFIG_INTEL_PMC_CORE)    += intel_pmc_core.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_PLATFORM)	+= mlx-platform.o

obj-$(CONFIG_MLX_CPLD_PLATFORM)	+= mlxcpld-hotplug.o
 
obj-$(CONFIG_MLX_CPLD_PLATFORM)	+= mlxcpld-hotplug.o

CRA Git | Maintained and supported by SUSTech CRA and CCSE