[PATCH 0/7] fpga: reorganize to subdirs
From: trix
Date: Tue Jun 08 2021 - 12:24:06 EST
From: Tom Rix <trix@xxxxxxxxxx>
The incoming xrt patchset has a toplevel subdir xrt/
The current fpga/ uses a single dir with filename prefixes to subdivide owners
For consistency, there should be only one way to organize the fpga/ dir.
Because the subdir model scales better, refactor to use it.
The discussion wrt xrt is here:
https://lore.kernel.org/linux-fpga/68e85a4f-4a10-1ff9-0443-aa565878c855@xxxxxxxxxx/
Follow drivers/net/ethernet/ which has control configs
NET_VENDOR_BLA that map to drivers/net/ethernet/bla
Since fpgas do not have many vendors, drop the 'VENDOR' and use
FPGA_BLA.
There are several new subdirs
altera/
dfl/
lattice/
xilinx/
Each subdir has a Kconfig that has a new/reused
if FPGA_BLA
... existing configs ...
endif FPGA_BLA
Which is sourced into the main fpga/Kconfig
Each subdir has a Makefile whose transversal is controlled in the
fpga/Makefile by
obj-$(CONFIG_FPGA_BLA) += bla/
For many of the moved files, they had a prefix bla-* that matched their
new subdir dir name bla/. Those filename are overspecified. So they
were simplified by removing the 'bla-' prefix. If they were *.h files
their guards were also changed.
Some cleanup to arrange thing alphabetically and make fpga/Makefile's
whitespace look more like net/'s
Tom Rix (7):
fpga: dfl: reorganize to subdir layout
fpga: xilinx: reorganize to subdir layout
fpga: altera: reorganize to subdir layout
fpga: lattice: reorganize to subdir layout
fpga: dfl: remove dfl- prefix on files
fpga: xilinx: remove xilinx- prefix on files
fpga: altera: remove altera- prefix on files
Documentation/fpga/dfl.rst | 4 +-
MAINTAINERS | 2 +-
drivers/fpga/Kconfig | 204 +-----------------
drivers/fpga/Makefile | 47 +---
drivers/fpga/altera/Kconfig | 79 +++++++
drivers/fpga/altera/Makefile | 12 ++
drivers/fpga/{altera-cvp.c => altera/cvp.c} | 0
.../fpga2sdram.c} | 0
.../freeze-bridge.c} | 0
.../{altera-hps2fpga.c => altera/hps2fpga.c} | 0
.../pr-ip-core-plat.c} | 0
.../pr-ip-core.c} | 0
.../fpga/{altera-ps-spi.c => altera/ps-spi.c} | 0
drivers/fpga/{ => altera}/socfpga-a10.c | 0
drivers/fpga/{ => altera}/socfpga.c | 0
drivers/fpga/{ => altera}/stratix10-soc.c | 0
drivers/fpga/{ => altera}/ts73xx-fpga.c | 0
drivers/fpga/dfl/Kconfig | 80 +++++++
drivers/fpga/dfl/Makefile | 17 ++
.../afu-dma-region.c} | 2 +-
.../fpga/{dfl-afu-error.c => dfl/afu-error.c} | 2 +-
.../fpga/{dfl-afu-main.c => dfl/afu-main.c} | 2 +-
.../{dfl-afu-region.c => dfl/afu-region.c} | 2 +-
drivers/fpga/{dfl-afu.h => dfl/afu.h} | 6 +-
drivers/fpga/{ => dfl}/dfl.c | 0
drivers/fpga/{ => dfl}/dfl.h | 0
drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} | 2 +-
.../fpga/{dfl-fme-error.c => dfl/fme-error.c} | 2 +-
.../fpga/{dfl-fme-main.c => dfl/fme-main.c} | 2 +-
drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} | 2 +-
.../fpga/{dfl-fme-perf.c => dfl/fme-perf.c} | 2 +-
drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} | 4 +-
drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} | 6 +-
.../{dfl-fme-region.c => dfl/fme-region.c} | 2 +-
drivers/fpga/{dfl-fme.h => dfl/fme.h} | 6 +-
.../{dfl-n3000-nios.c => dfl/n3000-nios.c} | 0
drivers/fpga/{dfl-pci.c => dfl/pci.c} | 0
drivers/fpga/lattice/Kconfig | 22 ++
drivers/fpga/lattice/Makefile | 4 +
drivers/fpga/{ => lattice}/ice40-spi.c | 0
drivers/fpga/{ => lattice}/machxo2-spi.c | 0
drivers/fpga/xilinx/Kconfig | 48 +++++
drivers/fpga/xilinx/Makefile | 8 +
.../pr-decoupler.c} | 0
drivers/fpga/{xilinx-spi.c => xilinx/spi.c} | 0
drivers/fpga/{ => xilinx}/zynq-fpga.c | 0
drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0
47 files changed, 306 insertions(+), 263 deletions(-)
create mode 100644 drivers/fpga/altera/Kconfig
create mode 100644 drivers/fpga/altera/Makefile
rename drivers/fpga/{altera-cvp.c => altera/cvp.c} (100%)
rename drivers/fpga/{altera-fpga2sdram.c => altera/fpga2sdram.c} (100%)
rename drivers/fpga/{altera-freeze-bridge.c => altera/freeze-bridge.c} (100%)
rename drivers/fpga/{altera-hps2fpga.c => altera/hps2fpga.c} (100%)
rename drivers/fpga/{altera-pr-ip-core-plat.c => altera/pr-ip-core-plat.c} (100%)
rename drivers/fpga/{altera-pr-ip-core.c => altera/pr-ip-core.c} (100%)
rename drivers/fpga/{altera-ps-spi.c => altera/ps-spi.c} (100%)
rename drivers/fpga/{ => altera}/socfpga-a10.c (100%)
rename drivers/fpga/{ => altera}/socfpga.c (100%)
rename drivers/fpga/{ => altera}/stratix10-soc.c (100%)
rename drivers/fpga/{ => altera}/ts73xx-fpga.c (100%)
create mode 100644 drivers/fpga/dfl/Kconfig
create mode 100644 drivers/fpga/dfl/Makefile
rename drivers/fpga/{dfl-afu-dma-region.c => dfl/afu-dma-region.c} (99%)
rename drivers/fpga/{dfl-afu-error.c => dfl/afu-error.c} (99%)
rename drivers/fpga/{dfl-afu-main.c => dfl/afu-main.c} (99%)
rename drivers/fpga/{dfl-afu-region.c => dfl/afu-region.c} (99%)
rename drivers/fpga/{dfl-afu.h => dfl/afu.h} (98%)
rename drivers/fpga/{ => dfl}/dfl.c (100%)
rename drivers/fpga/{ => dfl}/dfl.h (100%)
rename drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} (99%)
rename drivers/fpga/{dfl-fme-error.c => dfl/fme-error.c} (99%)
rename drivers/fpga/{dfl-fme-main.c => dfl/fme-main.c} (99%)
rename drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} (99%)
rename drivers/fpga/{dfl-fme-perf.c => dfl/fme-perf.c} (99%)
rename drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} (99%)
rename drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} (96%)
rename drivers/fpga/{dfl-fme-region.c => dfl/fme-region.c} (98%)
rename drivers/fpga/{dfl-fme.h => dfl/fme.h} (95%)
rename drivers/fpga/{dfl-n3000-nios.c => dfl/n3000-nios.c} (100%)
rename drivers/fpga/{dfl-pci.c => dfl/pci.c} (100%)
create mode 100644 drivers/fpga/lattice/Kconfig
create mode 100644 drivers/fpga/lattice/Makefile
rename drivers/fpga/{ => lattice}/ice40-spi.c (100%)
rename drivers/fpga/{ => lattice}/machxo2-spi.c (100%)
create mode 100644 drivers/fpga/xilinx/Kconfig
create mode 100644 drivers/fpga/xilinx/Makefile
rename drivers/fpga/{xilinx-pr-decoupler.c => xilinx/pr-decoupler.c} (100%)
rename drivers/fpga/{xilinx-spi.c => xilinx/spi.c} (100%)
rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%)
rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%)
--
2.26.3