* [PATCH 7/7] fpga: altera: remove altera- prefix on files
@ 2021-06-08 16:26 trix
2021-06-09 10:00 ` Greg KH
0 siblings, 1 reply; 4+ messages in thread
From: trix @ 2021-06-08 16:26 UTC (permalink / raw)
To: mdf, fpacheco, gregkh; +Cc: linux-fpga, linux-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
It is not necessary to have an altera- prefix on a file
when the file is in an altera/ subdir.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/altera/Makefile | 12 ++++++------
drivers/fpga/altera/{altera-cvp.c => cvp.c} | 0
.../altera/{altera-fpga2sdram.c => fpga2sdram.c} | 0
.../{altera-freeze-bridge.c => freeze-bridge.c} | 0
.../fpga/altera/{altera-hps2fpga.c => hps2fpga.c} | 0
.../{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} | 0
.../altera/{altera-pr-ip-core.c => pr-ip-core.c} | 0
drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} | 0
8 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/fpga/altera/{altera-cvp.c => cvp.c} (100%)
rename drivers/fpga/altera/{altera-fpga2sdram.c => fpga2sdram.c} (100%)
rename drivers/fpga/altera/{altera-freeze-bridge.c => freeze-bridge.c} (100%)
rename drivers/fpga/altera/{altera-hps2fpga.c => hps2fpga.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core.c => pr-ip-core.c} (100%)
rename drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} (100%)
diff --git a/drivers/fpga/altera/Makefile b/drivers/fpga/altera/Makefile
index 4d725c72fcbef..c2d626cd1f540 100644
--- a/drivers/fpga/altera/Makefile
+++ b/drivers/fpga/altera/Makefile
@@ -1,12 +1,12 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o
+obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += freeze-bridge.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE) += pr-ip-core.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += pr-ip-core-plat.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += cvp.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += ps-spi.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o
obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o
obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o
-obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o
+obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += hps2fpga.o fpga2sdram.o
diff --git a/drivers/fpga/altera/altera-cvp.c b/drivers/fpga/altera/cvp.c
similarity index 100%
rename from drivers/fpga/altera/altera-cvp.c
rename to drivers/fpga/altera/cvp.c
diff --git a/drivers/fpga/altera/altera-fpga2sdram.c b/drivers/fpga/altera/fpga2sdram.c
similarity index 100%
rename from drivers/fpga/altera/altera-fpga2sdram.c
rename to drivers/fpga/altera/fpga2sdram.c
diff --git a/drivers/fpga/altera/altera-freeze-bridge.c b/drivers/fpga/altera/freeze-bridge.c
similarity index 100%
rename from drivers/fpga/altera/altera-freeze-bridge.c
rename to drivers/fpga/altera/freeze-bridge.c
diff --git a/drivers/fpga/altera/altera-hps2fpga.c b/drivers/fpga/altera/hps2fpga.c
similarity index 100%
rename from drivers/fpga/altera/altera-hps2fpga.c
rename to drivers/fpga/altera/hps2fpga.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core-plat.c b/drivers/fpga/altera/pr-ip-core-plat.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core-plat.c
rename to drivers/fpga/altera/pr-ip-core-plat.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core.c b/drivers/fpga/altera/pr-ip-core.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core.c
rename to drivers/fpga/altera/pr-ip-core.c
diff --git a/drivers/fpga/altera/altera-ps-spi.c b/drivers/fpga/altera/ps-spi.c
similarity index 100%
rename from drivers/fpga/altera/altera-ps-spi.c
rename to drivers/fpga/altera/ps-spi.c
--
2.26.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* Re: [PATCH 7/7] fpga: altera: remove altera- prefix on files
2021-06-08 16:26 [PATCH 7/7] fpga: altera: remove altera- prefix on files trix
@ 2021-06-09 10:00 ` Greg KH
0 siblings, 0 replies; 4+ messages in thread
From: Greg KH @ 2021-06-09 10:00 UTC (permalink / raw)
To: trix; +Cc: mdf, fpacheco, linux-fpga, linux-kernel
On Tue, Jun 08, 2021 at 09:26:23AM -0700, trix@redhat.com wrote:
> From: Tom Rix <trix@redhat.com>
>
> It is not necessary to have an altera- prefix on a file
> when the file is in an altera/ subdir.
>
> Signed-off-by: Tom Rix <trix@redhat.com>
> ---
> drivers/fpga/altera/Makefile | 12 ++++++------
> drivers/fpga/altera/{altera-cvp.c => cvp.c} | 0
> .../altera/{altera-fpga2sdram.c => fpga2sdram.c} | 0
> .../{altera-freeze-bridge.c => freeze-bridge.c} | 0
> .../fpga/altera/{altera-hps2fpga.c => hps2fpga.c} | 0
> .../{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} | 0
> .../altera/{altera-pr-ip-core.c => pr-ip-core.c} | 0
> drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} | 0
> 8 files changed, 6 insertions(+), 6 deletions(-)
> rename drivers/fpga/altera/{altera-cvp.c => cvp.c} (100%)
> rename drivers/fpga/altera/{altera-fpga2sdram.c => fpga2sdram.c} (100%)
> rename drivers/fpga/altera/{altera-freeze-bridge.c => freeze-bridge.c} (100%)
> rename drivers/fpga/altera/{altera-hps2fpga.c => hps2fpga.c} (100%)
> rename drivers/fpga/altera/{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} (100%)
> rename drivers/fpga/altera/{altera-pr-ip-core.c => pr-ip-core.c} (100%)
> rename drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} (100%)
>
> diff --git a/drivers/fpga/altera/Makefile b/drivers/fpga/altera/Makefile
> index 4d725c72fcbef..c2d626cd1f540 100644
> --- a/drivers/fpga/altera/Makefile
> +++ b/drivers/fpga/altera/Makefile
> @@ -1,12 +1,12 @@
> # SPDX-License-Identifier: GPL-2.0
>
> -obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o
> -obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o
> -obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o
> -obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o
> -obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o
> +obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += freeze-bridge.o
> +obj-$(CONFIG_ALTERA_PR_IP_CORE) += pr-ip-core.o
> +obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += pr-ip-core-plat.o
> +obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += cvp.o
> +obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += ps-spi.o
> obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o
> obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o
> obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o
> obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o
> -obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o
> +obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += hps2fpga.o fpga2sdram.o
Same issue here, you are renaming the resulting module for no good
reason. Please never do that unless you mean to, AND, you document why
you are doing so in the changelog text.
thanks,
greg k-h
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 0/7] fpga: reorganize to subdirs
@ 2021-06-09 13:21 trix
2021-06-09 13:21 ` trix
0 siblings, 1 reply; 4+ messages in thread
From: trix @ 2021-06-09 13:21 UTC (permalink / raw)
To: hao.wu, mdf, corbet, michal.simek
Cc: linux-fpga, linux-doc, linux-kernel, linux-arm-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
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@redhat.com/
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
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH 7/7] fpga: altera: remove altera- prefix on files
2021-06-09 13:21 [PATCH 0/7] fpga: reorganize to subdirs trix
@ 2021-06-09 13:21 ` trix
0 siblings, 0 replies; 4+ messages in thread
From: trix @ 2021-06-09 13:21 UTC (permalink / raw)
To: hao.wu, mdf, corbet, michal.simek
Cc: linux-fpga, linux-doc, linux-kernel, linux-arm-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
It is not necessary to have an altera- prefix on a file
when the file is in an altera/ subdir.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/altera/Makefile | 12 ++++++------
drivers/fpga/altera/{altera-cvp.c => cvp.c} | 0
.../altera/{altera-fpga2sdram.c => fpga2sdram.c} | 0
.../{altera-freeze-bridge.c => freeze-bridge.c} | 0
.../fpga/altera/{altera-hps2fpga.c => hps2fpga.c} | 0
.../{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} | 0
.../altera/{altera-pr-ip-core.c => pr-ip-core.c} | 0
drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} | 0
8 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/fpga/altera/{altera-cvp.c => cvp.c} (100%)
rename drivers/fpga/altera/{altera-fpga2sdram.c => fpga2sdram.c} (100%)
rename drivers/fpga/altera/{altera-freeze-bridge.c => freeze-bridge.c} (100%)
rename drivers/fpga/altera/{altera-hps2fpga.c => hps2fpga.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core.c => pr-ip-core.c} (100%)
rename drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} (100%)
diff --git a/drivers/fpga/altera/Makefile b/drivers/fpga/altera/Makefile
index 4d725c72fcbef..c2d626cd1f540 100644
--- a/drivers/fpga/altera/Makefile
+++ b/drivers/fpga/altera/Makefile
@@ -1,12 +1,12 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o
+obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += freeze-bridge.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE) += pr-ip-core.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += pr-ip-core-plat.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += cvp.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += ps-spi.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o
obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o
obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o
-obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o
+obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += hps2fpga.o fpga2sdram.o
diff --git a/drivers/fpga/altera/altera-cvp.c b/drivers/fpga/altera/cvp.c
similarity index 100%
rename from drivers/fpga/altera/altera-cvp.c
rename to drivers/fpga/altera/cvp.c
diff --git a/drivers/fpga/altera/altera-fpga2sdram.c b/drivers/fpga/altera/fpga2sdram.c
similarity index 100%
rename from drivers/fpga/altera/altera-fpga2sdram.c
rename to drivers/fpga/altera/fpga2sdram.c
diff --git a/drivers/fpga/altera/altera-freeze-bridge.c b/drivers/fpga/altera/freeze-bridge.c
similarity index 100%
rename from drivers/fpga/altera/altera-freeze-bridge.c
rename to drivers/fpga/altera/freeze-bridge.c
diff --git a/drivers/fpga/altera/altera-hps2fpga.c b/drivers/fpga/altera/hps2fpga.c
similarity index 100%
rename from drivers/fpga/altera/altera-hps2fpga.c
rename to drivers/fpga/altera/hps2fpga.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core-plat.c b/drivers/fpga/altera/pr-ip-core-plat.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core-plat.c
rename to drivers/fpga/altera/pr-ip-core-plat.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core.c b/drivers/fpga/altera/pr-ip-core.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core.c
rename to drivers/fpga/altera/pr-ip-core.c
diff --git a/drivers/fpga/altera/altera-ps-spi.c b/drivers/fpga/altera/ps-spi.c
similarity index 100%
rename from drivers/fpga/altera/altera-ps-spi.c
rename to drivers/fpga/altera/ps-spi.c
--
2.26.3
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [PATCH 7/7] fpga: altera: remove altera- prefix on files
@ 2021-06-09 13:21 ` trix
0 siblings, 0 replies; 4+ messages in thread
From: trix @ 2021-06-09 13:21 UTC (permalink / raw)
To: hao.wu, mdf, corbet, michal.simek
Cc: linux-fpga, linux-doc, linux-kernel, linux-arm-kernel, Tom Rix
From: Tom Rix <trix@redhat.com>
It is not necessary to have an altera- prefix on a file
when the file is in an altera/ subdir.
Signed-off-by: Tom Rix <trix@redhat.com>
---
drivers/fpga/altera/Makefile | 12 ++++++------
drivers/fpga/altera/{altera-cvp.c => cvp.c} | 0
.../altera/{altera-fpga2sdram.c => fpga2sdram.c} | 0
.../{altera-freeze-bridge.c => freeze-bridge.c} | 0
.../fpga/altera/{altera-hps2fpga.c => hps2fpga.c} | 0
.../{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} | 0
.../altera/{altera-pr-ip-core.c => pr-ip-core.c} | 0
drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} | 0
8 files changed, 6 insertions(+), 6 deletions(-)
rename drivers/fpga/altera/{altera-cvp.c => cvp.c} (100%)
rename drivers/fpga/altera/{altera-fpga2sdram.c => fpga2sdram.c} (100%)
rename drivers/fpga/altera/{altera-freeze-bridge.c => freeze-bridge.c} (100%)
rename drivers/fpga/altera/{altera-hps2fpga.c => hps2fpga.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core-plat.c => pr-ip-core-plat.c} (100%)
rename drivers/fpga/altera/{altera-pr-ip-core.c => pr-ip-core.c} (100%)
rename drivers/fpga/altera/{altera-ps-spi.c => ps-spi.c} (100%)
diff --git a/drivers/fpga/altera/Makefile b/drivers/fpga/altera/Makefile
index 4d725c72fcbef..c2d626cd1f540 100644
--- a/drivers/fpga/altera/Makefile
+++ b/drivers/fpga/altera/Makefile
@@ -1,12 +1,12 @@
# SPDX-License-Identifier: GPL-2.0
-obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o
-obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o
-obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o
+obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += freeze-bridge.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE) += pr-ip-core.o
+obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += pr-ip-core-plat.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += cvp.o
+obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += ps-spi.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA) += socfpga.o
obj-$(CONFIG_FPGA_MGR_SOCFPGA_A10) += socfpga-a10.o
obj-$(CONFIG_FPGA_MGR_STRATIX10_SOC) += stratix10-soc.o
obj-$(CONFIG_FPGA_MGR_TS73XX) += ts73xx-fpga.o
-obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o
+obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += hps2fpga.o fpga2sdram.o
diff --git a/drivers/fpga/altera/altera-cvp.c b/drivers/fpga/altera/cvp.c
similarity index 100%
rename from drivers/fpga/altera/altera-cvp.c
rename to drivers/fpga/altera/cvp.c
diff --git a/drivers/fpga/altera/altera-fpga2sdram.c b/drivers/fpga/altera/fpga2sdram.c
similarity index 100%
rename from drivers/fpga/altera/altera-fpga2sdram.c
rename to drivers/fpga/altera/fpga2sdram.c
diff --git a/drivers/fpga/altera/altera-freeze-bridge.c b/drivers/fpga/altera/freeze-bridge.c
similarity index 100%
rename from drivers/fpga/altera/altera-freeze-bridge.c
rename to drivers/fpga/altera/freeze-bridge.c
diff --git a/drivers/fpga/altera/altera-hps2fpga.c b/drivers/fpga/altera/hps2fpga.c
similarity index 100%
rename from drivers/fpga/altera/altera-hps2fpga.c
rename to drivers/fpga/altera/hps2fpga.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core-plat.c b/drivers/fpga/altera/pr-ip-core-plat.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core-plat.c
rename to drivers/fpga/altera/pr-ip-core-plat.c
diff --git a/drivers/fpga/altera/altera-pr-ip-core.c b/drivers/fpga/altera/pr-ip-core.c
similarity index 100%
rename from drivers/fpga/altera/altera-pr-ip-core.c
rename to drivers/fpga/altera/pr-ip-core.c
diff --git a/drivers/fpga/altera/altera-ps-spi.c b/drivers/fpga/altera/ps-spi.c
similarity index 100%
rename from drivers/fpga/altera/altera-ps-spi.c
rename to drivers/fpga/altera/ps-spi.c
--
2.26.3
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-06-09 14:04 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-06-08 16:26 [PATCH 7/7] fpga: altera: remove altera- prefix on files trix
2021-06-09 10:00 ` Greg KH
2021-06-09 13:21 [PATCH 0/7] fpga: reorganize to subdirs trix
2021-06-09 13:21 ` [PATCH 7/7] fpga: altera: remove altera- prefix on files trix
2021-06-09 13:21 ` trix
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.