Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bdf97013 authored by Dan Williams's avatar Dan Williams
Browse files

nfit: move to nfit/ sub-directory 



With the arrival of x86-machine-check support the nfit driver will add a
(conditionally-compiled) source file.  Prepare for this by moving all
nfit source to drivers/acpi/nfit/.  This is pure code movement, no
functional changes.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 37b137ff

drivers/acpi/Kconfig

+1 −26
Original line number Original line Diff line number Diff line
@@ -447,32 +447,7 @@ config ACPI_REDUCED_HARDWARE_ONLY 




	  If you are unsure what to do, do not enable this option.

	  If you are unsure what to do, do not enable this option.





config ACPI_NFIT

source "drivers/acpi/nfit/Kconfig"

	tristate "ACPI NVDIMM Firmware Interface Table (NFIT)"

	depends on PHYS_ADDR_T_64BIT

	depends on BLK_DEV

	depends on ARCH_HAS_MMIO_FLUSH

	select LIBNVDIMM

	help

	  Infrastructure to probe ACPI 6 compliant platforms for

	  NVDIMMs (NFIT) and register a libnvdimm device tree.  In

	  addition to storage devices this also enables libnvdimm to pass

	  ACPI._DSM messages for platform/dimm configuration.



	  To compile this driver as a module, choose M here:

	  the module will be called nfit.



config ACPI_NFIT_DEBUG

	bool "NFIT DSM debug"

	depends on ACPI_NFIT

	depends on DYNAMIC_DEBUG

	default n

	help

	  Enabling this option causes the nfit driver to dump the

	  input and output buffers of _DSM operations on the ACPI0012

	  device and its children.  This can be very verbose, so leave

	  it disabled unless you are debugging a hardware / firmware

	  issue.





source "drivers/acpi/apei/Kconfig"

source "drivers/acpi/apei/Kconfig"

drivers/acpi/Makefile

+1 −1
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ obj-$(CONFIG_ACPI_PCI_SLOT) += pci_slot.o 
obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o

obj-$(CONFIG_ACPI_PROCESSOR)	+= processor.o

obj-$(CONFIG_ACPI)		+= container.o

obj-$(CONFIG_ACPI)		+= container.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_THERMAL)	+= thermal.o

obj-$(CONFIG_ACPI_NFIT)		+= nfit.o

obj-$(CONFIG_ACPI_NFIT)		+= nfit/

obj-$(CONFIG_ACPI)		+= acpi_memhotplug.o

obj-$(CONFIG_ACPI)		+= acpi_memhotplug.o

obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o

obj-$(CONFIG_ACPI_HOTPLUG_IOAPIC) += ioapic.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

obj-$(CONFIG_ACPI_BATTERY)	+= battery.o

drivers/acpi/nfit/Kconfig

0 → 100644
+26 −0
Original line number Original line Diff line number Diff line 
config ACPI_NFIT

	tristate "ACPI NVDIMM Firmware Interface Table (NFIT)"

	depends on PHYS_ADDR_T_64BIT

	depends on BLK_DEV

	depends on ARCH_HAS_MMIO_FLUSH

	select LIBNVDIMM

	help

	  Infrastructure to probe ACPI 6 compliant platforms for

	  NVDIMMs (NFIT) and register a libnvdimm device tree.  In

	  addition to storage devices this also enables libnvdimm to pass

	  ACPI._DSM messages for platform/dimm configuration.



	  To compile this driver as a module, choose M here:

	  the module will be called nfit.



config ACPI_NFIT_DEBUG

	bool "NFIT DSM debug"

	depends on ACPI_NFIT

	depends on DYNAMIC_DEBUG

	default n

	help

	  Enabling this option causes the nfit driver to dump the

	  input and output buffers of _DSM operations on the ACPI0012

	  device and its children.  This can be very verbose, so leave

	  it disabled unless you are debugging a hardware / firmware

	  issue.

drivers/acpi/nfit/Makefile

0 → 100644
+2 −0
Original line number Original line Diff line number Diff line 
obj-$(CONFIG_ACPI_NFIT) := nfit.o

nfit-y := core.o

drivers/acpi/nfit.c→drivers/acpi/nfit/core.c

+0 −0

File moved.

View file