| Message ID | 1481306510-7471-3-git-send-email-irina.tirdea@intel.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
I have been told I have to send my comments here instead of our internal ML. I didn't fast enough to comment that during v5. So do it right now. On Fri, Dec 9, 2016 at 8:01 PM, Irina Tirdea <irina.tirdea@intel.com> wrote: > The pmc_atom driver does not contain any architecture specific > code. It only enables the SOC Power Management Controller Driver SOC -> SoC Driver -> 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 No, it's not a *platform data*. Other that that looks good to me.
On Tue, Dec 13, 2016 at 01:43:31AM +0200, Andy Shevchenko wrote: > I have been told I have to send my comments here instead of our > internal ML. I didn't fast enough to comment that during v5. So do it > right now. > > On Fri, Dec 9, 2016 at 8:01 PM, Irina Tirdea <irina.tirdea@intel.com> wrote: > > The pmc_atom driver does not contain any architecture specific > > code. It only enables the SOC Power Management Controller Driver > > SOC -> SoC > Driver -> 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 > > No, it's not a *platform data*. > > Other that that looks good to me. Where would you recommend instead? It needs a place to serve both acpi_lpss.c and pmc_atom.c. The include/linux/platform_data/x86 location doesn't seem too strange as it supports a "platform" driver in the sense that pmc_atom is a platform driver.
On Fri, Dec 16, 2016 at 8:20 PM, Darren Hart <dvhart@infradead.org> wrote: > On Tue, Dec 13, 2016 at 01:43:31AM +0200, Andy Shevchenko wrote: >> I have been told I have to send my comments here instead of our >> internal ML. I didn't fast enough to comment that during v5. So do it >> right now. >> > {arch/x86/include/asm => include/linux/platform_data/x86}/pmc_atom.h | 0 >> >> No, it's not a *platform data*. >> >> Other that that looks good to me. > > Where would you recommend instead? It needs a place to serve both acpi_lpss.c > and pmc_atom.c. The include/linux/platform_data/x86 location doesn't seem too > strange as it supports a "platform" driver in the sense that pmc_atom is a > platform driver. include/linux/x86 ?
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
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%)