Hi, On Tue, 2021-08-10 at 17:58 +0800, Kate Hsuan wrote: > Signed-off-by: Kate Hsuan <hpa@xxxxxxxxxx> > --- > drivers/platform/x86/Kconfig | 43 ----------------- > -- > drivers/platform/x86/Makefile | 2 +- > drivers/platform/x86/intel/Kconfig | 1 + > drivers/platform/x86/intel/Makefile | 1 + > drivers/platform/x86/intel/punit/Kconfig | 10 +++++ > drivers/platform/x86/intel/punit/Makefile | 6 +++ > .../x86/{ => intel/punit}/intel_punit_ipc.c | 0 > 7 files changed, 19 insertions(+), 44 deletions(-) > create mode 100644 drivers/platform/x86/intel/punit/Kconfig > create mode 100644 drivers/platform/x86/intel/punit/Makefile > rename drivers/platform/x86/{ => intel/punit}/intel_punit_ipc.c > (100%) > > diff --git a/drivers/platform/x86/Kconfig > b/drivers/platform/x86/Kconfig > index b9a324ba17e3..00fa213e9adb 100644 > --- a/drivers/platform/x86/Kconfig > +++ b/drivers/platform/x86/Kconfig > @@ -1086,49 +1086,6 @@ config INTEL_UNCORE_FREQ_CONTROL > will be called intel-uncore-frequency. > > > - > -config INTEL_PMT_CLASS > - tristate > - help > - The Intel Platform Monitoring Technology (PMT) class driver > provides > - the basic sysfs interface and file hierarchy used by PMT > devices. > - > - For more information, see: > - <file:Documentation/ABI/testing/sysfs-class-intel_pmt> > - > - To compile this driver as a module, choose M here: the > module > - will be called intel_pmt_class. > - > -config INTEL_PMT_TELEMETRY > - tristate "Intel Platform Monitoring Technology (PMT) > Telemetry driver" > - depends on MFD_INTEL_PMT > - select INTEL_PMT_CLASS > - help > - The Intel Platform Monitory Technology (PMT) Telemetry > driver provides > - access to hardware telemetry metrics on devices that > support the > - feature. > - > - To compile this driver as a module, choose M here: the > module > - will be called intel_pmt_telemetry. > - > -config INTEL_PMT_CRASHLOG > - tristate "Intel Platform Monitoring Technology (PMT) Crashlog > driver" > - depends on MFD_INTEL_PMT > - select INTEL_PMT_CLASS > - help > - The Intel Platform Monitoring Technology (PMT) crashlog > driver provides > - access to hardware crashlog capabilities on devices that > support the > - feature. > - > - To compile this driver as a module, choose M here: the > module > - will be called intel_pmt_crashlog. > - Accidentally caught the above configs not part of P-Unit IPC driver. > -config INTEL_PUNIT_IPC > - tristate "Intel P-Unit IPC Driver" > - help > - This driver provides support for Intel P-Unit Mailbox IPC > mechanism, > - which is used to bridge the communications between kernel > and P-Unit. > - > config INTEL_SCU_IPC > bool > > diff --git a/drivers/platform/x86/Makefile > b/drivers/platform/x86/Makefile > index 1310b1ebc3f0..dbb62085e7f9 100644 > --- a/drivers/platform/x86/Makefile > +++ b/drivers/platform/x86/Makefile > @@ -124,7 +124,7 @@ obj- > $(CONFIG_INTEL_UNCORE_FREQ_CONTROL) += intel-uncore- > frequency.o > > > > -obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o > + > obj-$(CONFIG_INTEL_SCU_IPC) += intel_scu_ipc.o > obj-$(CONFIG_INTEL_SCU_PCI) += intel_scu_pcidrv.o > obj-$(CONFIG_INTEL_SCU_PLATFORM) += intel_scu_pltdrv.o > diff --git a/drivers/platform/x86/intel/Kconfig > b/drivers/platform/x86/intel/Kconfig > index 38bfca25940d..189a34226fe0 100644 > --- a/drivers/platform/x86/intel/Kconfig > +++ b/drivers/platform/x86/intel/Kconfig > @@ -26,6 +26,7 @@ source > "drivers/platform/x86/intel/chtdc_ti/Kconfig" > source "drivers/platform/x86/intel/mrfld/Kconfig" > source "drivers/platform/x86/intel/pmc_core/Kconfig" > source "drivers/platform/x86/intel/pmt/Kconfig" > +source "drivers/platform/x86/intel/punit/Kconfig" > > > endif # X86_PLATFORM_DRIVERS_INTEL > diff --git a/drivers/platform/x86/intel/Makefile > b/drivers/platform/x86/intel/Makefile > index 746bee1db055..9bd49a920900 100644 > --- a/drivers/platform/x86/intel/Makefile > +++ b/drivers/platform/x86/intel/Makefile > @@ -21,3 +21,4 @@ obj-$(CONFIG_INTEL_PMC_CORE) += pmc_core/ > obj-$(CONFIG_INTEL_PMT_CLASS) += pmt/ > obj-$(CONFIG_INTEL_PMT_TELEMETRY) += pmt/ > obj-$(CONFIG_INTEL_PMT_CRASHLOG) += pmt/ > +obj-$(CONFIG_INTEL_PUNIT_IPC) += punit/ > diff --git a/drivers/platform/x86/intel/punit/Kconfig > b/drivers/platform/x86/intel/punit/Kconfig > new file mode 100644 > index 000000000000..db56ef3bb086 > --- /dev/null > +++ b/drivers/platform/x86/intel/punit/Kconfig > @@ -0,0 +1,10 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# X86 Platform Specific Drivers > +# > + > +config INTEL_PUNIT_IPC > + tristate "Intel P-Unit IPC Driver" > + help > + This driver provides support for Intel P-Unit Mailbox IPC > mechanism, > + which is used to bridge the communications between kernel > and P-Unit. > diff --git a/drivers/platform/x86/intel/punit/Makefile > b/drivers/platform/x86/intel/punit/Makefile > new file mode 100644 > index 000000000000..f25284806f63 > --- /dev/null > +++ b/drivers/platform/x86/intel/punit/Makefile > @@ -0,0 +1,6 @@ > +# SPDX-License-Identifier: GPL-2.0-only > +# > +# X86 Platform Specific Drivers > +# > + > +obj-$(CONFIG_INTEL_PUNIT_IPC) += intel_punit_ipc.o > \ No newline at end of file > diff --git a/drivers/platform/x86/intel_punit_ipc.c > b/drivers/platform/x86/intel/punit/intel_punit_ipc.c > similarity index 100% > rename from drivers/platform/x86/intel_punit_ipc.c > rename to drivers/platform/x86/intel/punit/intel_punit_ipc.c