Move include files in separate commit, so leave them alone for now.
Cc: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
Cc: Frederic Barrat <fbarrat@xxxxxxxxxxxxx>
Cc: Andrew Donnellan <andrew.donnellan@xxxxxxxxxxx>
Cc: Arnd Bergmann <arnd@xxxxxxxx>
Signed-off-by: Olof Johansson <olof@xxxxxxxxx>
---
MAINTAINERS | 2 +-
drivers/accel/Kconfig | 2 ++
drivers/accel/Makefile | 1 +
drivers/{misc => accel}/cxl/Kconfig | 0
drivers/{misc => accel}/cxl/Makefile | 0
drivers/{misc => accel}/cxl/api.c | 0
drivers/{misc => accel}/cxl/base.c | 0
drivers/{misc => accel}/cxl/context.c | 0
drivers/{misc => accel}/cxl/cxl.h | 0
drivers/{misc => accel}/cxl/cxllib.c | 0
drivers/{misc => accel}/cxl/debugfs.c | 0
drivers/{misc => accel}/cxl/fault.c | 0
drivers/{misc => accel}/cxl/file.c | 0
drivers/{misc => accel}/cxl/flash.c | 0
drivers/{misc => accel}/cxl/guest.c | 0
drivers/{misc => accel}/cxl/hcalls.c | 0
drivers/{misc => accel}/cxl/hcalls.h | 0
drivers/{misc => accel}/cxl/irq.c | 0
drivers/{misc => accel}/cxl/main.c | 0
drivers/{misc => accel}/cxl/native.c | 0
drivers/{misc => accel}/cxl/of.c | 0
drivers/{misc => accel}/cxl/pci.c | 0
drivers/{misc => accel}/cxl/sysfs.c | 0
drivers/{misc => accel}/cxl/trace.c | 0
drivers/{misc => accel}/cxl/trace.h | 0
drivers/{misc => accel}/cxl/vphb.c | 0
drivers/misc/Kconfig | 1 -
drivers/misc/Makefile | 1 -
28 files changed, 4 insertions(+), 3 deletions(-)
rename drivers/{misc => accel}/cxl/Kconfig (100%)
rename drivers/{misc => accel}/cxl/Makefile (100%)
rename drivers/{misc => accel}/cxl/api.c (100%)
rename drivers/{misc => accel}/cxl/base.c (100%)
rename drivers/{misc => accel}/cxl/context.c (100%)
rename drivers/{misc => accel}/cxl/cxl.h (100%)
rename drivers/{misc => accel}/cxl/cxllib.c (100%)
rename drivers/{misc => accel}/cxl/debugfs.c (100%)
rename drivers/{misc => accel}/cxl/fault.c (100%)
rename drivers/{misc => accel}/cxl/file.c (100%)
rename drivers/{misc => accel}/cxl/flash.c (100%)
rename drivers/{misc => accel}/cxl/guest.c (100%)
rename drivers/{misc => accel}/cxl/hcalls.c (100%)
rename drivers/{misc => accel}/cxl/hcalls.h (100%)
rename drivers/{misc => accel}/cxl/irq.c (100%)
rename drivers/{misc => accel}/cxl/main.c (100%)
rename drivers/{misc => accel}/cxl/native.c (100%)
rename drivers/{misc => accel}/cxl/of.c (100%)
rename drivers/{misc => accel}/cxl/pci.c (100%)
rename drivers/{misc => accel}/cxl/sysfs.c (100%)
rename drivers/{misc => accel}/cxl/trace.c (100%)
rename drivers/{misc => accel}/cxl/trace.h (100%)
rename drivers/{misc => accel}/cxl/vphb.c (100%)
diff --git a/MAINTAINERS b/MAINTAINERS
index 8a9bbaf8f6e90..93fbfed6e6915 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -4214,7 +4214,7 @@ M: Andrew Donnellan <andrew.donnellan@xxxxxxxxxxx>
L: linuxppc-dev@xxxxxxxxxxxxxxxx
S: Supported
F: arch/powerpc/platforms/powernv/pci-cxl.c
-F: drivers/misc/cxl/
+F: drivers/accel/cxl/
F: include/misc/cxl*
F: include/uapi/misc/cxl.h
F: Documentation/powerpc/cxl.txt
diff --git a/drivers/accel/Kconfig b/drivers/accel/Kconfig
index 13b36c0398895..c0754448efdf0 100644
--- a/drivers/accel/Kconfig
+++ b/drivers/accel/Kconfig
@@ -13,4 +13,6 @@ if ACCEL
comment "HW Accellerator drivers"
+source "drivers/accel/cxl/Kconfig"
+
endif
diff --git a/drivers/accel/Makefile b/drivers/accel/Makefile
index 343bbb8f45a14..752a54e227ad7 100644
--- a/drivers/accel/Makefile
+++ b/drivers/accel/Makefile
@@ -3,3 +3,4 @@
# Makefile for accel devices
#
+obj-$(CONFIG_CXL_BASE) += cxl/
diff --git a/drivers/misc/cxl/Kconfig b/drivers/accel/cxl/Kconfig
similarity index 100%
rename from drivers/misc/cxl/Kconfig
rename to drivers/accel/cxl/Kconfig
diff --git a/drivers/misc/cxl/Makefile b/drivers/accel/cxl/Makefile
similarity index 100%
rename from drivers/misc/cxl/Makefile
rename to drivers/accel/cxl/Makefile
diff --git a/drivers/misc/cxl/api.c b/drivers/accel/cxl/api.c
similarity index 100%
rename from drivers/misc/cxl/api.c
rename to drivers/accel/cxl/api.c
diff --git a/drivers/misc/cxl/base.c b/drivers/accel/cxl/base.c
similarity index 100%
rename from drivers/misc/cxl/base.c
rename to drivers/accel/cxl/base.c
diff --git a/drivers/misc/cxl/context.c b/drivers/accel/cxl/context.c
similarity index 100%
rename from drivers/misc/cxl/context.c
rename to drivers/accel/cxl/context.c
diff --git a/drivers/misc/cxl/cxl.h b/drivers/accel/cxl/cxl.h
similarity index 100%
rename from drivers/misc/cxl/cxl.h
rename to drivers/accel/cxl/cxl.h
diff --git a/drivers/misc/cxl/cxllib.c b/drivers/accel/cxl/cxllib.c
similarity index 100%
rename from drivers/misc/cxl/cxllib.c
rename to drivers/accel/cxl/cxllib.c
diff --git a/drivers/misc/cxl/debugfs.c b/drivers/accel/cxl/debugfs.c
similarity index 100%
rename from drivers/misc/cxl/debugfs.c
rename to drivers/accel/cxl/debugfs.c
diff --git a/drivers/misc/cxl/fault.c b/drivers/accel/cxl/fault.c
similarity index 100%
rename from drivers/misc/cxl/fault.c
rename to drivers/accel/cxl/fault.c
diff --git a/drivers/misc/cxl/file.c b/drivers/accel/cxl/file.c
similarity index 100%
rename from drivers/misc/cxl/file.c
rename to drivers/accel/cxl/file.c
diff --git a/drivers/misc/cxl/flash.c b/drivers/accel/cxl/flash.c
similarity index 100%
rename from drivers/misc/cxl/flash.c
rename to drivers/accel/cxl/flash.c
diff --git a/drivers/misc/cxl/guest.c b/drivers/accel/cxl/guest.c
similarity index 100%
rename from drivers/misc/cxl/guest.c
rename to drivers/accel/cxl/guest.c
diff --git a/drivers/misc/cxl/hcalls.c b/drivers/accel/cxl/hcalls.c
similarity index 100%
rename from drivers/misc/cxl/hcalls.c
rename to drivers/accel/cxl/hcalls.c
diff --git a/drivers/misc/cxl/hcalls.h b/drivers/accel/cxl/hcalls.h
similarity index 100%
rename from drivers/misc/cxl/hcalls.h
rename to drivers/accel/cxl/hcalls.h
diff --git a/drivers/misc/cxl/irq.c b/drivers/accel/cxl/irq.c
similarity index 100%
rename from drivers/misc/cxl/irq.c
rename to drivers/accel/cxl/irq.c
diff --git a/drivers/misc/cxl/main.c b/drivers/accel/cxl/main.c
similarity index 100%
rename from drivers/misc/cxl/main.c
rename to drivers/accel/cxl/main.c
diff --git a/drivers/misc/cxl/native.c b/drivers/accel/cxl/native.c
similarity index 100%
rename from drivers/misc/cxl/native.c
rename to drivers/accel/cxl/native.c
diff --git a/drivers/misc/cxl/of.c b/drivers/accel/cxl/of.c
similarity index 100%
rename from drivers/misc/cxl/of.c
rename to drivers/accel/cxl/of.c
diff --git a/drivers/misc/cxl/pci.c b/drivers/accel/cxl/pci.c
similarity index 100%
rename from drivers/misc/cxl/pci.c
rename to drivers/accel/cxl/pci.c
diff --git a/drivers/misc/cxl/sysfs.c b/drivers/accel/cxl/sysfs.c
similarity index 100%
rename from drivers/misc/cxl/sysfs.c
rename to drivers/accel/cxl/sysfs.c
diff --git a/drivers/misc/cxl/trace.c b/drivers/accel/cxl/trace.c
similarity index 100%
rename from drivers/misc/cxl/trace.c
rename to drivers/accel/cxl/trace.c
diff --git a/drivers/misc/cxl/trace.h b/drivers/accel/cxl/trace.h
similarity index 100%
rename from drivers/misc/cxl/trace.h
rename to drivers/accel/cxl/trace.h
diff --git a/drivers/misc/cxl/vphb.c b/drivers/accel/cxl/vphb.c
similarity index 100%
rename from drivers/misc/cxl/vphb.c
rename to drivers/accel/cxl/vphb.c
diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index f417b06e11c51..02153382d67b6 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -532,7 +532,6 @@ source "drivers/misc/vmw_vmci/Kconfig"
source "drivers/misc/mic/Kconfig"
source "drivers/misc/genwqe/Kconfig"
source "drivers/misc/echo/Kconfig"
-source "drivers/misc/cxl/Kconfig"
source "drivers/misc/ocxl/Kconfig"
source "drivers/misc/cardreader/Kconfig"
endmenu
diff --git a/drivers/misc/Makefile b/drivers/misc/Makefile
index e39ccbbc1b3a8..72fa4fc42a2d6 100644
--- a/drivers/misc/Makefile
+++ b/drivers/misc/Makefile
@@ -52,7 +52,6 @@ obj-y += mic/
obj-$(CONFIG_GENWQE) += genwqe/
obj-$(CONFIG_ECHO) += echo/
obj-$(CONFIG_VEXPRESS_SYSCFG) += vexpress-syscfg.o
-obj-$(CONFIG_CXL_BASE) += cxl/
obj-$(CONFIG_ASPEED_LPC_CTRL) += aspeed-lpc-ctrl.o
obj-$(CONFIG_ASPEED_LPC_SNOOP) += aspeed-lpc-snoop.o
obj-$(CONFIG_PCI_ENDPOINT_TEST) += pci_endpoint_test.o
--
2.11.0
