From patchwork Tue Jun 8 16:23:34 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307515 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id B5DB4C4743E for ; Tue, 8 Jun 2021 16:24:05 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id A4E2261249 for ; Tue, 8 Jun 2021 16:24:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232971AbhFHQZ5 (ORCPT ); Tue, 8 Jun 2021 12:25:57 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:22187 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232912AbhFHQZz (ORCPT ); Tue, 8 Jun 2021 12:25:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169441; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92YiPexxYpFlIHYIfUzcajyREjX7dCB4H6SLkcvlG4w=; b=OoTUOCzTntE4/52JgrQbUt6PaFcV0Al9SIySdWHfeI+AXXNnPtN1I5C6lGUTIPQpJppdz5 +oO+feg2g+os9vDK20Z7RWGC6p3taMtmSj4RrD3TKgy16jTS0Y7b85da7VS3KmnwRUf+Av PO+gH4LdEryxRlPmHSrUCSw1ymisx4k= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-548-nvNlvSG1Oqqujcc31MBrNQ-1; Tue, 08 Jun 2021 12:24:00 -0400 X-MC-Unique: nvNlvSG1Oqqujcc31MBrNQ-1 Received: by mail-ot1-f72.google.com with SMTP id q12-20020a9d664c0000b02903ec84bc44bbso4697723otm.5 for ; Tue, 08 Jun 2021 09:24:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=92YiPexxYpFlIHYIfUzcajyREjX7dCB4H6SLkcvlG4w=; b=FYLfDX5v/pKpjmypa28b1myx9RdW22kGi3p4R7kWiYzoh5Fz5G0Oz3p+UjqZtVWQIS IRe2HzA5kDLAnroP8KBlgV+dF22+7Hmds59GVSkhyS0Cg5wW4oCcDGuUb2uyzJdeZwNW RfU2TbCFWyqxabjGWXcWVkvK3d9bea8+JBX8LwKoNcPjMtyzADo1OEawAiPHhtvjWtMX mwl6fI/kYlTz8o+W2t38dkAH6qtxU50h9bcWweOR0CuklEmIFS1H+YGjqIjL1nkUnOIq 5KQcP9HRbmdd08FCuYBKnl7+5+DkcOAIsKZAuOBQ1LKHPKkTkSE/pibcCUc0Wc8Wbj2c SOgQ== X-Gm-Message-State: AOAM530T+5yXcLlIqY0DYgrikf5XYJVPmr7r/uXQAtLV7cYBE2wp8Kch 4/4nDLWcygbV8kIeLo4/Avkt98A3QTdtadhf5B2lsFRc2zpWo7bsR7V6TQTmOSrGzYt9sN9/k9c rPNIaTtuqumhSVHbYmuFI1g== X-Received: by 2002:a05:6830:1089:: with SMTP id y9mr4372917oto.372.1623169439460; Tue, 08 Jun 2021 09:23:59 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz+zhcHpGZNXOCJECV0D4K2Tn7MTHmVEPkEHnbcjgNLKB+Ils5kcjdRoG7MXU69h/dGP6xVkA== X-Received: by 2002:a05:6830:1089:: with SMTP id y9mr4372908oto.372.1623169439222; Tue, 08 Jun 2021 09:23:59 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.23.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:23:58 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 1/7] fpga: dfl: reorganize to subdir layout Date: Tue, 8 Jun 2021 09:23:34 -0700 Message-Id: <20210608162340.3010204-3-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608162340.3010204-1-trix@redhat.com> References: <20210608162340.3010204-1-trix@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix Create a dfl/ subdir Move dfl-* files to it. Add a Kconfig and Makefile Because FPGA_DFL is now used in dfl/Kconfig in a if/endif block, all the other configs in dfl/Kconfig implicitly depend on FPGA_DFL. So the explict dependence can be removed. Also since FPGA_DFL depends on HAS_IOMEM, it can be removed from the other configs. Signed-off-by: Tom Rix --- MAINTAINERS | 2 +- drivers/fpga/Kconfig | 80 +------------------- drivers/fpga/Makefile | 18 +---- drivers/fpga/dfl/Kconfig | 81 +++++++++++++++++++++ drivers/fpga/dfl/Makefile | 19 +++++ drivers/fpga/{ => dfl}/dfl-afu-dma-region.c | 0 drivers/fpga/{ => dfl}/dfl-afu-error.c | 0 drivers/fpga/{ => dfl}/dfl-afu-main.c | 0 drivers/fpga/{ => dfl}/dfl-afu-region.c | 0 drivers/fpga/{ => dfl}/dfl-afu.h | 0 drivers/fpga/{ => dfl}/dfl-fme-br.c | 0 drivers/fpga/{ => dfl}/dfl-fme-error.c | 0 drivers/fpga/{ => dfl}/dfl-fme-main.c | 0 drivers/fpga/{ => dfl}/dfl-fme-mgr.c | 0 drivers/fpga/{ => dfl}/dfl-fme-perf.c | 0 drivers/fpga/{ => dfl}/dfl-fme-pr.c | 0 drivers/fpga/{ => dfl}/dfl-fme-pr.h | 0 drivers/fpga/{ => dfl}/dfl-fme-region.c | 0 drivers/fpga/{ => dfl}/dfl-fme.h | 0 drivers/fpga/{ => dfl}/dfl-n3000-nios.c | 0 drivers/fpga/{ => dfl}/dfl-pci.c | 0 drivers/fpga/{ => dfl}/dfl.c | 0 drivers/fpga/{ => dfl}/dfl.h | 0 23 files changed, 103 insertions(+), 97 deletions(-) create mode 100644 drivers/fpga/dfl/Kconfig create mode 100644 drivers/fpga/dfl/Makefile rename drivers/fpga/{ => dfl}/dfl-afu-dma-region.c (100%) rename drivers/fpga/{ => dfl}/dfl-afu-error.c (100%) rename drivers/fpga/{ => dfl}/dfl-afu-main.c (100%) rename drivers/fpga/{ => dfl}/dfl-afu-region.c (100%) rename drivers/fpga/{ => dfl}/dfl-afu.h (100%) rename drivers/fpga/{ => dfl}/dfl-fme-br.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-error.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-main.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-mgr.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-perf.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-pr.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme-pr.h (100%) rename drivers/fpga/{ => dfl}/dfl-fme-region.c (100%) rename drivers/fpga/{ => dfl}/dfl-fme.h (100%) rename drivers/fpga/{ => dfl}/dfl-n3000-nios.c (100%) rename drivers/fpga/{ => dfl}/dfl-pci.c (100%) rename drivers/fpga/{ => dfl}/dfl.c (100%) rename drivers/fpga/{ => dfl}/dfl.h (100%) diff --git a/MAINTAINERS b/MAINTAINERS index 1be6895a143d2..46ef3af06ba53 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -7201,7 +7201,7 @@ L: linux-fpga@vger.kernel.org S: Maintained F: Documentation/ABI/testing/sysfs-bus-dfl* F: Documentation/fpga/dfl.rst -F: drivers/fpga/dfl* +F: drivers/fpga/dfl/ F: drivers/uio/uio_dfl.c F: include/linux/dfl.h F: include/uapi/linux/fpga-dfl.h diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 33e15058d0dc7..c427b25cc6f7e 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -145,85 +145,7 @@ config OF_FPGA_REGION Support for loading FPGA images by applying a Device Tree overlay. -config FPGA_DFL - tristate "FPGA Device Feature List (DFL) support" - select FPGA_BRIDGE - select FPGA_REGION - depends on HAS_IOMEM - help - Device Feature List (DFL) defines a feature list structure that - creates a linked list of feature headers within the MMIO space - to provide an extensible way of adding features for FPGA. - Driver can walk through the feature headers to enumerate feature - devices (e.g. FPGA Management Engine, Port and Accelerator - Function Unit) and their private features for target FPGA devices. - - Select this option to enable common support for Field-Programmable - Gate Array (FPGA) solutions which implement Device Feature List. - It provides enumeration APIs and feature device infrastructure. - -config FPGA_DFL_FME - tristate "FPGA DFL FME Driver" - depends on FPGA_DFL && HWMON && PERF_EVENTS - help - The FPGA Management Engine (FME) is a feature device implemented - under Device Feature List (DFL) framework. Select this option to - enable the platform device driver for FME which implements all - FPGA platform level management features. There shall be one FME - per DFL based FPGA device. - -config FPGA_DFL_FME_MGR - tristate "FPGA DFL FME Manager Driver" - depends on FPGA_DFL_FME && HAS_IOMEM - help - Say Y to enable FPGA Manager driver for FPGA Management Engine. - -config FPGA_DFL_FME_BRIDGE - tristate "FPGA DFL FME Bridge Driver" - depends on FPGA_DFL_FME && HAS_IOMEM - help - Say Y to enable FPGA Bridge driver for FPGA Management Engine. - -config FPGA_DFL_FME_REGION - tristate "FPGA DFL FME Region Driver" - depends on FPGA_DFL_FME && HAS_IOMEM - help - Say Y to enable FPGA Region driver for FPGA Management Engine. - -config FPGA_DFL_AFU - tristate "FPGA DFL AFU Driver" - depends on FPGA_DFL - help - This is the driver for FPGA Accelerated Function Unit (AFU) which - implements AFU and Port management features. A User AFU connects - to the FPGA infrastructure via a Port. There may be more than one - Port/AFU per DFL based FPGA device. - -config FPGA_DFL_NIOS_INTEL_PAC_N3000 - tristate "FPGA DFL NIOS Driver for Intel PAC N3000" - depends on FPGA_DFL - select REGMAP - help - This is the driver for the N3000 Nios private feature on Intel - PAC (Programmable Acceleration Card) N3000. It communicates - with the embedded Nios processor to configure the retimers on - the card. It also instantiates the SPI master (spi-altera) for - the card's BMC (Board Management Controller). - -config FPGA_DFL_PCI - tristate "FPGA DFL PCIe Device Driver" - depends on PCI && FPGA_DFL - help - Select this option to enable PCIe driver for PCIe-based - Field-Programmable Gate Array (FPGA) solutions which implement - the Device Feature List (DFL). This driver provides interfaces - for userspace applications to configure, enumerate, open and access - FPGA accelerators on the FPGA DFL devices, enables system level - management functions such as FPGA partial reconfiguration, power - management and virtualization with DFL framework and DFL feature - device drivers. - - To compile this as a module, choose M here. +source "drivers/fpga/dfl/Kconfig" config FPGA_MGR_ZYNQMP_FPGA tristate "Xilinx ZynqMP FPGA" diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 18dc9885883a2..bda74e54ce390 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -31,20 +31,4 @@ obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o obj-$(CONFIG_FPGA_REGION) += fpga-region.o obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o -# FPGA Device Feature List Support -obj-$(CONFIG_FPGA_DFL) += dfl.o -obj-$(CONFIG_FPGA_DFL_FME) += dfl-fme.o -obj-$(CONFIG_FPGA_DFL_FME_MGR) += dfl-fme-mgr.o -obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o -obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o -obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o - -dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o -dfl-fme-objs += dfl-fme-perf.o -dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o -dfl-afu-objs += dfl-afu-error.o - -obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o - -# Drivers for FPGAs which implement DFL -obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o +obj-$(CONFIG_FPGA_DFL) += dfl/ diff --git a/drivers/fpga/dfl/Kconfig b/drivers/fpga/dfl/Kconfig new file mode 100644 index 0000000000000..1f5ce42f63e44 --- /dev/null +++ b/drivers/fpga/dfl/Kconfig @@ -0,0 +1,81 @@ +config FPGA_DFL + tristate "FPGA Device Feature List (DFL) support" + select FPGA_BRIDGE + select FPGA_REGION + depends on HAS_IOMEM + help + Device Feature List (DFL) defines a feature list structure that + creates a linked list of feature headers within the MMIO space + to provide an extensible way of adding features for FPGA. + Driver can walk through the feature headers to enumerate feature + devices (e.g. FPGA Management Engine, Port and Accelerator + Function Unit) and their private features for target FPGA devices. + + Select this option to enable common support for Field-Programmable + Gate Array (FPGA) solutions which implement Device Feature List. + It provides enumeration APIs and feature device infrastructure. + +if FPGA_DFL + +config FPGA_DFL_FME + tristate "FPGA DFL FME Driver" + depends on HWMON && PERF_EVENTS + help + The FPGA Management Engine (FME) is a feature device implemented + under Device Feature List (DFL) framework. Select this option to + enable the platform device driver for FME which implements all + FPGA platform level management features. There shall be one FME + per DFL based FPGA device. + +config FPGA_DFL_FME_MGR + tristate "FPGA DFL FME Manager Driver" + depends on FPGA_DFL_FME + help + Say Y to enable FPGA Manager driver for FPGA Management Engine. + +config FPGA_DFL_FME_BRIDGE + tristate "FPGA DFL FME Bridge Driver" + depends on FPGA_DFL_FME + help + Say Y to enable FPGA Bridge driver for FPGA Management Engine. + +config FPGA_DFL_FME_REGION + tristate "FPGA DFL FME Region Driver" + depends on FPGA_DFL_FME + help + Say Y to enable FPGA Region driver for FPGA Management Engine. + +config FPGA_DFL_AFU + tristate "FPGA DFL AFU Driver" + help + This is the driver for FPGA Accelerated Function Unit (AFU) which + implements AFU and Port management features. A User AFU connects + to the FPGA infrastructure via a Port. There may be more than one + Port/AFU per DFL based FPGA device. + +config FPGA_DFL_NIOS_INTEL_PAC_N3000 + tristate "FPGA DFL NIOS Driver for Intel PAC N3000" + select REGMAP + help + This is the driver for the N3000 Nios private feature on Intel + PAC (Programmable Acceleration Card) N3000. It communicates + with the embedded Nios processor to configure the retimers on + the card. It also instantiates the SPI master (spi-altera) for + the card's BMC (Board Management Controller). + +config FPGA_DFL_PCI + tristate "FPGA DFL PCIe Device Driver" + depends on PCI + help + Select this option to enable PCIe driver for PCIe-based + Field-Programmable Gate Array (FPGA) solutions which implement + the Device Feature List (DFL). This driver provides interfaces + for userspace applications to configure, enumerate, open and access + FPGA accelerators on the FPGA DFL devices, enables system level + management functions such as FPGA partial reconfiguration, power + management and virtualization with DFL framework and DFL feature + device drivers. + + To compile this as a module, choose M here. + +endif #FPGA_DFL diff --git a/drivers/fpga/dfl/Makefile b/drivers/fpga/dfl/Makefile new file mode 100644 index 0000000000000..724792039026f --- /dev/null +++ b/drivers/fpga/dfl/Makefile @@ -0,0 +1,19 @@ +# SPDX-License-Identifier: GPL-2.0 +# +# FPGA Device Feature List (DFL) Support +obj-$(CONFIG_FPGA_DFL) += dfl.o +obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o +obj-$(CONFIG_FPGA_DFL_FME) += dfl-fme.o +obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o +obj-$(CONFIG_FPGA_DFL_FME_MGR) += dfl-fme-mgr.o +obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o +obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o +obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o + +dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o \ + dfl-fme-perf.o +dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o \ + dfl-afu-error.o + + + diff --git a/drivers/fpga/dfl-afu-dma-region.c b/drivers/fpga/dfl/dfl-afu-dma-region.c similarity index 100% rename from drivers/fpga/dfl-afu-dma-region.c rename to drivers/fpga/dfl/dfl-afu-dma-region.c diff --git a/drivers/fpga/dfl-afu-error.c b/drivers/fpga/dfl/dfl-afu-error.c similarity index 100% rename from drivers/fpga/dfl-afu-error.c rename to drivers/fpga/dfl/dfl-afu-error.c diff --git a/drivers/fpga/dfl-afu-main.c b/drivers/fpga/dfl/dfl-afu-main.c similarity index 100% rename from drivers/fpga/dfl-afu-main.c rename to drivers/fpga/dfl/dfl-afu-main.c diff --git a/drivers/fpga/dfl-afu-region.c b/drivers/fpga/dfl/dfl-afu-region.c similarity index 100% rename from drivers/fpga/dfl-afu-region.c rename to drivers/fpga/dfl/dfl-afu-region.c diff --git a/drivers/fpga/dfl-afu.h b/drivers/fpga/dfl/dfl-afu.h similarity index 100% rename from drivers/fpga/dfl-afu.h rename to drivers/fpga/dfl/dfl-afu.h diff --git a/drivers/fpga/dfl-fme-br.c b/drivers/fpga/dfl/dfl-fme-br.c similarity index 100% rename from drivers/fpga/dfl-fme-br.c rename to drivers/fpga/dfl/dfl-fme-br.c diff --git a/drivers/fpga/dfl-fme-error.c b/drivers/fpga/dfl/dfl-fme-error.c similarity index 100% rename from drivers/fpga/dfl-fme-error.c rename to drivers/fpga/dfl/dfl-fme-error.c diff --git a/drivers/fpga/dfl-fme-main.c b/drivers/fpga/dfl/dfl-fme-main.c similarity index 100% rename from drivers/fpga/dfl-fme-main.c rename to drivers/fpga/dfl/dfl-fme-main.c diff --git a/drivers/fpga/dfl-fme-mgr.c b/drivers/fpga/dfl/dfl-fme-mgr.c similarity index 100% rename from drivers/fpga/dfl-fme-mgr.c rename to drivers/fpga/dfl/dfl-fme-mgr.c diff --git a/drivers/fpga/dfl-fme-perf.c b/drivers/fpga/dfl/dfl-fme-perf.c similarity index 100% rename from drivers/fpga/dfl-fme-perf.c rename to drivers/fpga/dfl/dfl-fme-perf.c diff --git a/drivers/fpga/dfl-fme-pr.c b/drivers/fpga/dfl/dfl-fme-pr.c similarity index 100% rename from drivers/fpga/dfl-fme-pr.c rename to drivers/fpga/dfl/dfl-fme-pr.c diff --git a/drivers/fpga/dfl-fme-pr.h b/drivers/fpga/dfl/dfl-fme-pr.h similarity index 100% rename from drivers/fpga/dfl-fme-pr.h rename to drivers/fpga/dfl/dfl-fme-pr.h diff --git a/drivers/fpga/dfl-fme-region.c b/drivers/fpga/dfl/dfl-fme-region.c similarity index 100% rename from drivers/fpga/dfl-fme-region.c rename to drivers/fpga/dfl/dfl-fme-region.c diff --git a/drivers/fpga/dfl-fme.h b/drivers/fpga/dfl/dfl-fme.h similarity index 100% rename from drivers/fpga/dfl-fme.h rename to drivers/fpga/dfl/dfl-fme.h diff --git a/drivers/fpga/dfl-n3000-nios.c b/drivers/fpga/dfl/dfl-n3000-nios.c similarity index 100% rename from drivers/fpga/dfl-n3000-nios.c rename to drivers/fpga/dfl/dfl-n3000-nios.c diff --git a/drivers/fpga/dfl-pci.c b/drivers/fpga/dfl/dfl-pci.c similarity index 100% rename from drivers/fpga/dfl-pci.c rename to drivers/fpga/dfl/dfl-pci.c diff --git a/drivers/fpga/dfl.c b/drivers/fpga/dfl/dfl.c similarity index 100% rename from drivers/fpga/dfl.c rename to drivers/fpga/dfl/dfl.c diff --git a/drivers/fpga/dfl.h b/drivers/fpga/dfl/dfl.h similarity index 100% rename from drivers/fpga/dfl.h rename to drivers/fpga/dfl/dfl.h From patchwork Tue Jun 8 16:23:35 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307517 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2BEA5C48BD1 for ; Tue, 8 Jun 2021 16:24:08 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 106AB61359 for ; Tue, 8 Jun 2021 16:24:08 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232981AbhFHQZ7 (ORCPT ); Tue, 8 Jun 2021 12:25:59 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:39198 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233009AbhFHQZ6 (ORCPT ); Tue, 8 Jun 2021 12:25:58 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169445; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XvFqgoXbMqYdld4DmESpGVSZB3RoZyxfbp1QAtbqos0=; b=PIywsEiqrSMpZphfPOE3ET2d2yRmIfOu4KTGhBWu7aHFqGwe2uZ7saTOglqgheEGY2e+tS HhdmVK7BCZJr8rVCv0aCRIb2KBm9JLOIFjrKWUQDwkM2KsBQ7KomTH5Pp8gDT0wLZD607a CxxcKJEg/00w1xQPJKBjgGr1ksH936E= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-288-JyYNmgtUNCmEfpiZNeqrMg-1; Tue, 08 Jun 2021 12:24:03 -0400 X-MC-Unique: JyYNmgtUNCmEfpiZNeqrMg-1 Received: by mail-ot1-f72.google.com with SMTP id 59-20020a9d0dc10000b02902a57e382ca1so14296192ots.7 for ; Tue, 08 Jun 2021 09:24:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=XvFqgoXbMqYdld4DmESpGVSZB3RoZyxfbp1QAtbqos0=; b=WuOqT44SdTF+LTuEOZR8NcPFwdomTYBzst115kJwo1Yu+YN/7vfpvvo7+/+KRy5ZWE nVPNGOaekzLF4V5KScmMOiGNBTxPdw225uZbIVEaAdPK5lQTTAbUFKE2kNhEJnJ3AcB5 4hYALvoFPlL7ga+yljMMVd74ZzXVxud9gSqqTcpsDFeZMPGFXC4lnn6yLYHPOX7kxLxE q3uDhF8s6E4B+1+akVfZK8S8vKr8rrQgQHTVHLPGeyZ9gdx/+Ny7x0miJfmG58JUoMqA Cq/8TLQibgKa6avTOj6XYtApAw1wKsF3OOX0/iwz9ocS2CTJQ/KUWwmzTuifNqWqi5If JxfA== X-Gm-Message-State: AOAM530yOQ0EkKyjHQiI/IcdkA1//4btjsCQ6c+pQdnPpMMvm9OL1of2 wJsIObRjICN2XBUtILbBkE6wA2Iq0y9fBbkHh22zEF1zMcZWPGZVnhYtswCvOS80P9EF2sgIH66 toXeTVFweCdh4xEdpU3pxmw== X-Received: by 2002:a05:6830:1f05:: with SMTP id u5mr6319905otg.322.1623169441602; Tue, 08 Jun 2021 09:24:01 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy7E1xIoOHythPGryMK8OW5qp/eRfmgkPOl+Bw4viux2xt0BER4TIXDPNTI/HIFSkb+7TvFmw== X-Received: by 2002:a05:6830:1f05:: with SMTP id u5mr6319887otg.322.1623169441389; Tue, 08 Jun 2021 09:24:01 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.23.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:24:01 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 2/7] fpga: xilinx: reorganize to subdir layout Date: Tue, 8 Jun 2021 09:23:35 -0700 Message-Id: <20210608162340.3010204-4-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608162340.3010204-1-trix@redhat.com> References: <20210608162340.3010204-1-trix@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix Create a xilinx/ subdir Move xilinx-* and zynq* files to it. Add a Kconfig and Makefile Signed-off-by: Tom Rix --- drivers/fpga/Kconfig | 40 +--------------- drivers/fpga/Makefile | 5 +- drivers/fpga/xilinx/Kconfig | 48 +++++++++++++++++++ drivers/fpga/xilinx/Makefile | 8 ++++ .../fpga/{ => xilinx}/xilinx-pr-decoupler.c | 0 drivers/fpga/{ => xilinx}/xilinx-spi.c | 0 drivers/fpga/{ => xilinx}/zynq-fpga.c | 0 drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0 8 files changed, 58 insertions(+), 43 deletions(-) create mode 100644 drivers/fpga/xilinx/Kconfig create mode 100644 drivers/fpga/xilinx/Makefile rename drivers/fpga/{ => xilinx}/xilinx-pr-decoupler.c (100%) rename drivers/fpga/{ => xilinx}/xilinx-spi.c (100%) rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%) rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%) diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index c427b25cc6f7e..657703b41b06e 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -52,25 +52,12 @@ config FPGA_MGR_ALTERA_CVP FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. -config FPGA_MGR_ZYNQ_FPGA - tristate "Xilinx Zynq FPGA" - depends on ARCH_ZYNQ || COMPILE_TEST - help - FPGA manager driver support for Xilinx Zynq FPGAs. - config FPGA_MGR_STRATIX10_SOC tristate "Intel Stratix10 SoC FPGA Manager" depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) help FPGA manager driver support for the Intel Stratix10 SoC. -config FPGA_MGR_XILINX_SPI - tristate "Xilinx Configuration over Slave Serial (SPI)" - depends on SPI - help - FPGA manager driver support for Xilinx FPGA configuration - over slave serial interface. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI @@ -113,23 +100,6 @@ config ALTERA_FREEZE_BRIDGE isolate one region of the FPGA from the busses while that region is being reprogrammed. -config XILINX_PR_DECOUPLER - tristate "Xilinx LogiCORE PR Decoupler" - depends on FPGA_BRIDGE - depends on HAS_IOMEM - help - Say Y to enable drivers for Xilinx LogiCORE PR Decoupler - or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. - The PR Decoupler exists in the FPGA fabric to isolate one - region of the FPGA from the busses while that region is - being reprogrammed during partial reconfig. - The Dynamic Function eXchange AXI shutdown manager prevents - AXI traffic from passing through the bridge. The controller - safely handles AXI4MM and AXI4-Lite interfaces on a - Reconfigurable Partition when it is undergoing dynamic - reconfiguration, preventing the system deadlock that can - occur if AXI transactions are interrupted by DFX. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE @@ -146,14 +116,6 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/dfl/Kconfig" - -config FPGA_MGR_ZYNQMP_FPGA - tristate "Xilinx ZynqMP FPGA" - depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) - help - FPGA manager driver support for Xilinx ZynqMP FPGAs. - This driver uses the processor configuration port(PCAP) - to configure the programmable logic(PL) through PS - on ZynqMP SoC. +source "drivers/fpga/xilinx/Kconfig" endif # FPGA diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index bda74e54ce390..0868c7c4264d8 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -15,9 +15,6 @@ 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_FPGA_MGR_XILINX_SPI) += xilinx-spi.o -obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o -obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.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 @@ -25,10 +22,10 @@ obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o -obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o # High Level Interfaces obj-$(CONFIG_FPGA_REGION) += fpga-region.o obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_XILINX) += xilinx/ diff --git a/drivers/fpga/xilinx/Kconfig b/drivers/fpga/xilinx/Kconfig new file mode 100644 index 0000000000000..1ef0b6a34ae0c --- /dev/null +++ b/drivers/fpga/xilinx/Kconfig @@ -0,0 +1,48 @@ +config FPGA_XILINX + bool "Xilinx Devices" + default y + help + If you have a xilinx fpga, say Y. + +if FPGA_XILINX + +config FPGA_MGR_ZYNQ_FPGA + tristate "Xilinx Zynq FPGA" + depends on ARCH_ZYNQ || COMPILE_TEST + help + FPGA manager driver support for Xilinx Zynq FPGAs. + +config FPGA_MGR_ZYNQMP_FPGA + tristate "Xilinx ZynqMP FPGA" + depends on ZYNQMP_FIRMWARE || (!ZYNQMP_FIRMWARE && COMPILE_TEST) + help + FPGA manager driver support for Xilinx ZynqMP FPGAs. + This driver uses the processor configuration port(PCAP) + to configure the programmable logic(PL) through PS + on ZynqMP SoC. + +config XILINX_PR_DECOUPLER + tristate "Xilinx LogiCORE PR Decoupler" + depends on FPGA_BRIDGE + depends on HAS_IOMEM + help + Say Y to enable drivers for Xilinx LogiCORE PR Decoupler + or Xilinx Dynamic Function eXchnage AIX Shutdown Manager. + The PR Decoupler exists in the FPGA fabric to isolate one + region of the FPGA from the busses while that region is + being reprogrammed during partial reconfig. + The Dynamic Function eXchange AXI shutdown manager prevents + AXI traffic from passing through the bridge. The controller + safely handles AXI4MM and AXI4-Lite interfaces on a + Reconfigurable Partition when it is undergoing dynamic + reconfiguration, preventing the system deadlock that can + occur if AXI transactions are interrupted by DFX. + +config FPGA_MGR_XILINX_SPI + tristate "Xilinx Configuration over Slave Serial (SPI)" + depends on SPI + help + FPGA manager driver support for Xilinx FPGA configuration + over slave serial interface. + +endif #FPGA_XILINX diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile new file mode 100644 index 0000000000000..7bb7543412790 --- /dev/null +++ b/drivers/fpga/xilinx/Makefile @@ -0,0 +1,8 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o +obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o +obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o + + diff --git a/drivers/fpga/xilinx-pr-decoupler.c b/drivers/fpga/xilinx/xilinx-pr-decoupler.c similarity index 100% rename from drivers/fpga/xilinx-pr-decoupler.c rename to drivers/fpga/xilinx/xilinx-pr-decoupler.c diff --git a/drivers/fpga/xilinx-spi.c b/drivers/fpga/xilinx/xilinx-spi.c similarity index 100% rename from drivers/fpga/xilinx-spi.c rename to drivers/fpga/xilinx/xilinx-spi.c diff --git a/drivers/fpga/zynq-fpga.c b/drivers/fpga/xilinx/zynq-fpga.c similarity index 100% rename from drivers/fpga/zynq-fpga.c rename to drivers/fpga/xilinx/zynq-fpga.c diff --git a/drivers/fpga/zynqmp-fpga.c b/drivers/fpga/xilinx/zynqmp-fpga.c similarity index 100% rename from drivers/fpga/zynqmp-fpga.c rename to drivers/fpga/xilinx/zynqmp-fpga.c From patchwork Tue Jun 8 16:23:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307519 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 01D8BC4743D for ; Tue, 8 Jun 2021 16:24:17 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id DA2ED61351 for ; Tue, 8 Jun 2021 16:24:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232807AbhFHQ0I (ORCPT ); Tue, 8 Jun 2021 12:26:08 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:40147 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233093AbhFHQ0A (ORCPT ); Tue, 8 Jun 2021 12:26:00 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169447; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toAw5Xqv8MQJGP4owqqo3qaenoRchLuqhCbpOlut5Y4=; b=Mct0GZq6sAnha+4qnokkCSBm7l3qFR82YGkR+ThqvrZKXF3S4xMapArWJx4SvvDx58oAiX G1qy6iKfUJbuqan1MOTugt/EyJYQ6uLq91Ke/CyZPF1mnSflQUvP3vvByHqBZbCTMqBxW8 vUhldrpUoKazP8I8BFbc1nxFmZ8ueGU= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-274-ifBPvSp9N_u55BUpZGJcgg-1; Tue, 08 Jun 2021 12:24:05 -0400 X-MC-Unique: ifBPvSp9N_u55BUpZGJcgg-1 Received: by mail-ot1-f72.google.com with SMTP id i25-20020a9d4a990000b0290304f00e3e3aso14261105otf.15 for ; Tue, 08 Jun 2021 09:24:05 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=toAw5Xqv8MQJGP4owqqo3qaenoRchLuqhCbpOlut5Y4=; b=f6Re1tnXsLnocrKloy2tx5qSazaXpJwd6txVvqoPHNmO/7YD+AWbiix7daR98RwdTn yVhBwTyerW8O/Xs8jryhvZ+PECnj6QadBRPaAJgRzq2fahKFhDSabywMcRHbQOQAUwb2 qPfE5JyzZGriDjG16e8aK08MyYXhEU+3lCwPRm7A2e7M6QSsDJ/JD6zw35jr+YbTKbdH rIon5fOm9NV9+h0SDMUJ3DuZFp3gBNc+IUVomQCYFi04S74KeYoqOe3qoIkIQHbVkfoU bpjTvylXP3uaZSYr9BEHckc/F7gAPrQfRmbciJN/p5TRv6yF/7hxTG8guNDJDwMJwNqu Bm9A== X-Gm-Message-State: AOAM531y1bhR83GF/ABk9svbchfe7qhRv9UYrWFkpqpJ53aM4oiuc0Nh UbkTtlvcLmgp2XDlkJTV1zR201PjeVC3jIGGVpwRJw+qL3vPbSuPM8FiEHI3IVd2PcD/05jWlyQ QaxFp0/R4xSnTiMrxy75ejg== X-Received: by 2002:aca:618a:: with SMTP id v132mr3346243oib.144.1623169444271; Tue, 08 Jun 2021 09:24:04 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyW04vVXKt7PDcW9Ic3eTm6zC3e16yh85s5lg5uQQH1Z8uTlf+DTutR5jX5qQ/mLTrdeTk5Ug== X-Received: by 2002:aca:618a:: with SMTP id v132mr3346217oib.144.1623169444067; Tue, 08 Jun 2021 09:24:04 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.24.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:24:03 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 3/7] fpga: altera: reorganize to subdir layout Date: Tue, 8 Jun 2021 09:23:36 -0700 Message-Id: <20210608162340.3010204-5-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608162340.3010204-1-trix@redhat.com> References: <20210608162340.3010204-1-trix@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix Create a altera/ subdir Move altera-* and soc* ts73xx* files to it. Add a Kconfig and Makefile Signed-off-by: Tom Rix --- drivers/fpga/Kconfig | 70 +--------------- drivers/fpga/Makefile | 11 +-- drivers/fpga/altera/Kconfig | 79 +++++++++++++++++++ drivers/fpga/altera/Makefile | 12 +++ drivers/fpga/{ => altera}/altera-cvp.c | 0 drivers/fpga/{ => altera}/altera-fpga2sdram.c | 0 .../fpga/{ => altera}/altera-freeze-bridge.c | 0 drivers/fpga/{ => altera}/altera-hps2fpga.c | 0 .../{ => altera}/altera-pr-ip-core-plat.c | 0 drivers/fpga/{ => altera}/altera-pr-ip-core.c | 0 drivers/fpga/{ => altera}/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 15 files changed, 93 insertions(+), 79 deletions(-) create mode 100644 drivers/fpga/altera/Kconfig create mode 100644 drivers/fpga/altera/Makefile rename drivers/fpga/{ => altera}/altera-cvp.c (100%) rename drivers/fpga/{ => altera}/altera-fpga2sdram.c (100%) rename drivers/fpga/{ => altera}/altera-freeze-bridge.c (100%) rename drivers/fpga/{ => altera}/altera-hps2fpga.c (100%) rename drivers/fpga/{ => altera}/altera-pr-ip-core-plat.c (100%) rename drivers/fpga/{ => altera}/altera-pr-ip-core.c (100%) rename drivers/fpga/{ => altera}/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%) diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 657703b41b06e..885701b1356ad 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -12,52 +12,6 @@ menuconfig FPGA if FPGA -config FPGA_MGR_SOCFPGA - tristate "Altera SOCFPGA FPGA Manager" - depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST - help - FPGA manager driver support for Altera SOCFPGA. - -config FPGA_MGR_SOCFPGA_A10 - tristate "Altera SoCFPGA Arria10" - depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST - select REGMAP_MMIO - help - FPGA manager driver support for Altera Arria10 SoCFPGA. - -config ALTERA_PR_IP_CORE - tristate "Altera Partial Reconfiguration IP Core" - help - Core driver support for Altera Partial Reconfiguration IP component - -config ALTERA_PR_IP_CORE_PLAT - tristate "Platform support of Altera Partial Reconfiguration IP Core" - depends on ALTERA_PR_IP_CORE && OF && HAS_IOMEM - help - Platform driver support for Altera Partial Reconfiguration IP - component - -config FPGA_MGR_ALTERA_PS_SPI - tristate "Altera FPGA Passive Serial over SPI" - depends on SPI - select BITREVERSE - help - FPGA manager driver support for Altera Arria/Cyclone/Stratix - using the passive serial interface over SPI. - -config FPGA_MGR_ALTERA_CVP - tristate "Altera CvP FPGA Manager" - depends on PCI - help - FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, - Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. - -config FPGA_MGR_STRATIX10_SOC - tristate "Intel Stratix10 SoC FPGA Manager" - depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) - help - FPGA manager driver support for the Intel Stratix10 SoC. - config FPGA_MGR_ICE40_SPI tristate "Lattice iCE40 SPI" depends on OF && SPI @@ -71,35 +25,12 @@ config FPGA_MGR_MACHXO2_SPI FPGA manager driver support for Lattice MachXO2 configuration over slave SPI interface. -config FPGA_MGR_TS73XX - tristate "Technologic Systems TS-73xx SBC FPGA Manager" - depends on ARCH_EP93XX && MACH_TS72XX - help - FPGA manager driver support for the Altera Cyclone II FPGA - present on the TS-73xx SBC boards. - config FPGA_BRIDGE tristate "FPGA Bridge Framework" help Say Y here if you want to support bridges connected between host processors and FPGAs or between FPGAs. -config SOCFPGA_FPGA_BRIDGE - tristate "Altera SoCFPGA FPGA Bridges" - depends on ARCH_INTEL_SOCFPGA && FPGA_BRIDGE - help - Say Y to enable drivers for FPGA bridges for Altera SOCFPGA - devices. - -config ALTERA_FREEZE_BRIDGE - tristate "Altera FPGA Freeze Bridge" - depends on FPGA_BRIDGE && HAS_IOMEM - help - Say Y to enable drivers for Altera FPGA Freeze bridges. A - freeze bridge is a bridge that exists in the FPGA fabric to - isolate one region of the FPGA from the busses while that - region is being reprogrammed. - config FPGA_REGION tristate "FPGA Region" depends on FPGA_BRIDGE @@ -115,6 +46,7 @@ config OF_FPGA_REGION Support for loading FPGA images by applying a Device Tree overlay. +source "drivers/fpga/altera/Kconfig" source "drivers/fpga/dfl/Kconfig" source "drivers/fpga/xilinx/Kconfig" diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index 0868c7c4264d8..db83aeb997f24 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -7,25 +7,16 @@ obj-$(CONFIG_FPGA) += fpga-mgr.o # FPGA Manager Drivers -obj-$(CONFIG_FPGA_MGR_ALTERA_CVP) += altera-cvp.o -obj-$(CONFIG_FPGA_MGR_ALTERA_PS_SPI) += altera-ps-spi.o obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-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_ALTERA_PR_IP_CORE) += altera-pr-ip-core.o -obj-$(CONFIG_ALTERA_PR_IP_CORE_PLAT) += altera-pr-ip-core-plat.o # FPGA Bridge Drivers obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o -obj-$(CONFIG_SOCFPGA_FPGA_BRIDGE) += altera-hps2fpga.o altera-fpga2sdram.o -obj-$(CONFIG_ALTERA_FREEZE_BRIDGE) += altera-freeze-bridge.o # High Level Interfaces obj-$(CONFIG_FPGA_REGION) += fpga-region.o obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o +obj-$(CONFIG_FPGA_ALTERA) += altera/ obj-$(CONFIG_FPGA_DFL) += dfl/ obj-$(CONFIG_FPGA_XILINX) += xilinx/ diff --git a/drivers/fpga/altera/Kconfig b/drivers/fpga/altera/Kconfig new file mode 100644 index 0000000000000..87480445664f4 --- /dev/null +++ b/drivers/fpga/altera/Kconfig @@ -0,0 +1,79 @@ +config FPGA_ALTERA + bool "Altera Devices" + default y + help + If you have an altera fpga, say Y. + +if FPGA_ALTERA + +config FPGA_MGR_SOCFPGA + tristate "Altera SOCFPGA FPGA Manager" + depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST + help + FPGA manager driver support for Altera SOCFPGA. + +config FPGA_MGR_SOCFPGA_A10 + tristate "Altera SoCFPGA Arria10" + depends on ARCH_INTEL_SOCFPGA || COMPILE_TEST + select REGMAP_MMIO + help + FPGA manager driver support for Altera Arria10 SoCFPGA. + +config ALTERA_PR_IP_CORE + tristate "Altera Partial Reconfiguration IP Core" + help + Core driver support for Altera Partial Reconfiguration IP component + +config ALTERA_PR_IP_CORE_PLAT + tristate "Platform support of Altera Partial Reconfiguration IP Core" + depends on ALTERA_PR_IP_CORE && OF && HAS_IOMEM + help + Platform driver support for Altera Partial Reconfiguration IP + component + +config FPGA_MGR_ALTERA_PS_SPI + tristate "Altera FPGA Passive Serial over SPI" + depends on SPI + select BITREVERSE + help + FPGA manager driver support for Altera Arria/Cyclone/Stratix + using the passive serial interface over SPI. + +config FPGA_MGR_ALTERA_CVP + tristate "Altera CvP FPGA Manager" + depends on PCI + help + FPGA manager driver support for Arria-V, Cyclone-V, Stratix-V, + Arria 10 and Stratix10 Altera FPGAs using the CvP interface over PCIe. + +config FPGA_MGR_STRATIX10_SOC + tristate "Intel Stratix10 SoC FPGA Manager" + depends on (ARCH_INTEL_SOCFPGA && INTEL_STRATIX10_SERVICE) + help + FPGA manager driver support for the Intel Stratix10 SoC. + +config FPGA_MGR_TS73XX + tristate "Technologic Systems TS-73xx SBC FPGA Manager" + depends on ARCH_EP93XX && MACH_TS72XX + help + FPGA manager driver support for the Altera Cyclone II FPGA + present on the TS-73xx SBC boards. + +config ALTERA_FREEZE_BRIDGE + tristate "Altera FPGA Freeze Bridge" + depends on FPGA_BRIDGE && HAS_IOMEM + help + Say Y to enable drivers for Altera FPGA Freeze bridges. A + freeze bridge is a bridge that exists in the FPGA fabric to + isolate one region of the FPGA from the busses while that + region is being reprogrammed. + +config SOCFPGA_FPGA_BRIDGE + tristate "Altera SoCFPGA FPGA Bridges" + depends on ARCH_INTEL_SOCFPGA && FPGA_BRIDGE + help + Say Y to enable drivers for FPGA bridges for Altera SOCFPGA + devices. + +endif #FPGA_ALTERA + diff --git a/drivers/fpga/altera/Makefile b/drivers/fpga/altera/Makefile new file mode 100644 index 0000000000000..4d725c72fcbef --- /dev/null +++ b/drivers/fpga/altera/Makefile @@ -0,0 +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_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 diff --git a/drivers/fpga/altera-cvp.c b/drivers/fpga/altera/altera-cvp.c similarity index 100% rename from drivers/fpga/altera-cvp.c rename to drivers/fpga/altera/altera-cvp.c diff --git a/drivers/fpga/altera-fpga2sdram.c b/drivers/fpga/altera/altera-fpga2sdram.c similarity index 100% rename from drivers/fpga/altera-fpga2sdram.c rename to drivers/fpga/altera/altera-fpga2sdram.c diff --git a/drivers/fpga/altera-freeze-bridge.c b/drivers/fpga/altera/altera-freeze-bridge.c similarity index 100% rename from drivers/fpga/altera-freeze-bridge.c rename to drivers/fpga/altera/altera-freeze-bridge.c diff --git a/drivers/fpga/altera-hps2fpga.c b/drivers/fpga/altera/altera-hps2fpga.c similarity index 100% rename from drivers/fpga/altera-hps2fpga.c rename to drivers/fpga/altera/altera-hps2fpga.c diff --git a/drivers/fpga/altera-pr-ip-core-plat.c b/drivers/fpga/altera/altera-pr-ip-core-plat.c similarity index 100% rename from drivers/fpga/altera-pr-ip-core-plat.c rename to drivers/fpga/altera/altera-pr-ip-core-plat.c diff --git a/drivers/fpga/altera-pr-ip-core.c b/drivers/fpga/altera/altera-pr-ip-core.c similarity index 100% rename from drivers/fpga/altera-pr-ip-core.c rename to drivers/fpga/altera/altera-pr-ip-core.c diff --git a/drivers/fpga/altera-ps-spi.c b/drivers/fpga/altera/altera-ps-spi.c similarity index 100% rename from drivers/fpga/altera-ps-spi.c rename to drivers/fpga/altera/altera-ps-spi.c diff --git a/drivers/fpga/socfpga-a10.c b/drivers/fpga/altera/socfpga-a10.c similarity index 100% rename from drivers/fpga/socfpga-a10.c rename to drivers/fpga/altera/socfpga-a10.c diff --git a/drivers/fpga/socfpga.c b/drivers/fpga/altera/socfpga.c similarity index 100% rename from drivers/fpga/socfpga.c rename to drivers/fpga/altera/socfpga.c diff --git a/drivers/fpga/stratix10-soc.c b/drivers/fpga/altera/stratix10-soc.c similarity index 100% rename from drivers/fpga/stratix10-soc.c rename to drivers/fpga/altera/stratix10-soc.c diff --git a/drivers/fpga/ts73xx-fpga.c b/drivers/fpga/altera/ts73xx-fpga.c similarity index 100% rename from drivers/fpga/ts73xx-fpga.c rename to drivers/fpga/altera/ts73xx-fpga.c From patchwork Tue Jun 8 16:23:37 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307521 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3F5A4C4743E for ; Tue, 8 Jun 2021 16:24:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 2BE616136D for ; Tue, 8 Jun 2021 16:24:21 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233188AbhFHQ0N (ORCPT ); Tue, 8 Jun 2021 12:26:13 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:21555 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233322AbhFHQ0D (ORCPT ); Tue, 8 Jun 2021 12:26:03 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169450; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hE6HSHMIRX+gAlRokY5aHJhvIk3ZJblkRJXqZXARHDc=; b=PJSbjK0B6cDfWrguubf1BfQMkSyZqc0H6KbN17eD0eoEjKVgn+VSy6HrbQ07YtoBZMYOud OMOas5IfG3pHgGgMxHgHVk4Fy8arxTy4wCnKnhYUS7KKVvUjJh+Kn3jbz879FsFFYL5OlD 3A+cSR3Wyaqe2BPCfrUsDxuQqSx6EME= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-481-rz3j8HuWPCai3mF-RxWvbg-1; Tue, 08 Jun 2021 12:24:08 -0400 X-MC-Unique: rz3j8HuWPCai3mF-RxWvbg-1 Received: by mail-oi1-f197.google.com with SMTP id r19-20020acaa8130000b02901f41b1b235bso2765162oie.9 for ; Tue, 08 Jun 2021 09:24:08 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=hE6HSHMIRX+gAlRokY5aHJhvIk3ZJblkRJXqZXARHDc=; b=GAil/+IijGfSbv5vj/orhKONBZdElA4pKTPdShfpATZoKlW06DQ+n7yDaZONqT+EmX EX8zd1rLQlNj83rNTTWqKOSx+5q8+kirTIUYyr5rtjcHO3g3K7SUkpxNzi4BQUrMP9Hd VfO07Oix8hiTzOO/e6rQciDWT83ofyT6fUXOlCSxjvtXjve0dBTcJB1dLtHR8JImopg2 QjUx9Y/tYcp5Giy7x0UWkaiTFk8Awmf/rJv+7n+GV6AQ9gAlPdA7qZFKaiknMaoiNFzF mpqGpSjiN15DQRty8GPW6kFNmsVgAxYfvnBNR11gpIcN/k5FE3E1Y8VNickqAGaOaZYr bUfA== X-Gm-Message-State: AOAM53282dCBHUy/yXXjvd0GBlESkh3560cAWQ2dTkBhq0fzzdvvufdO /diQAzvle6AeRVwsybWLHWSdR0lABuMIBtFNaRxp0N+YA+XhPWFYV0Rqc3t1yE960KspW85lzpl SMA1aUzqG7aT28ZYUmrmihQ== X-Received: by 2002:a05:6808:55c:: with SMTP id i28mr3440182oig.66.1623169446384; Tue, 08 Jun 2021 09:24:06 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz871oBeLPJEBJQHL79uFGPE47JE/Fxob6zrZrwY6gtaALlSf91P0rx0V53f1omTZuqN8Zfig== X-Received: by 2002:a05:6808:55c:: with SMTP id i28mr3440166oig.66.1623169446230; Tue, 08 Jun 2021 09:24:06 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.24.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:24:05 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 4/7] fpga: lattice: reorganize to subdir layout Date: Tue, 8 Jun 2021 09:23:37 -0700 Message-Id: <20210608162340.3010204-6-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608162340.3010204-1-trix@redhat.com> References: <20210608162340.3010204-1-trix@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix Create a lattice/ subdir Move ice40* and machxo2* files to it. Add a Kconfig and Makefile Signed-off-by: Tom Rix --- drivers/fpga/Kconfig | 14 +------------- drivers/fpga/Makefile | 13 +++++-------- drivers/fpga/lattice/Kconfig | 22 ++++++++++++++++++++++ drivers/fpga/lattice/Makefile | 4 ++++ drivers/fpga/{ => lattice}/ice40-spi.c | 0 drivers/fpga/{ => lattice}/machxo2-spi.c | 0 6 files changed, 32 insertions(+), 21 deletions(-) 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%) diff --git a/drivers/fpga/Kconfig b/drivers/fpga/Kconfig index 885701b1356ad..0cce719d6af84 100644 --- a/drivers/fpga/Kconfig +++ b/drivers/fpga/Kconfig @@ -12,19 +12,6 @@ menuconfig FPGA if FPGA -config FPGA_MGR_ICE40_SPI - tristate "Lattice iCE40 SPI" - depends on OF && SPI - help - FPGA manager driver support for Lattice iCE40 FPGAs over SPI. - -config FPGA_MGR_MACHXO2_SPI - tristate "Lattice MachXO2 SPI" - depends on SPI - help - FPGA manager driver support for Lattice MachXO2 configuration - over slave SPI interface. - config FPGA_BRIDGE tristate "FPGA Bridge Framework" help @@ -47,6 +34,7 @@ config OF_FPGA_REGION overlay. source "drivers/fpga/altera/Kconfig" +source "drivers/fpga/lattice/Kconfig" source "drivers/fpga/dfl/Kconfig" source "drivers/fpga/xilinx/Kconfig" diff --git a/drivers/fpga/Makefile b/drivers/fpga/Makefile index db83aeb997f24..9197698201e3a 100644 --- a/drivers/fpga/Makefile +++ b/drivers/fpga/Makefile @@ -4,19 +4,16 @@ # # Core FPGA Manager Framework -obj-$(CONFIG_FPGA) += fpga-mgr.o - -# FPGA Manager Drivers -obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o -obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o +obj-$(CONFIG_FPGA) += fpga-mgr.o # FPGA Bridge Drivers -obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o +obj-$(CONFIG_FPGA_BRIDGE) += fpga-bridge.o # High Level Interfaces -obj-$(CONFIG_FPGA_REGION) += fpga-region.o -obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o +obj-$(CONFIG_FPGA_REGION) += fpga-region.o +obj-$(CONFIG_OF_FPGA_REGION) += of-fpga-region.o obj-$(CONFIG_FPGA_ALTERA) += altera/ obj-$(CONFIG_FPGA_DFL) += dfl/ +obj-$(CONFIG_FPGA_LATTICE) += lattice/ obj-$(CONFIG_FPGA_XILINX) += xilinx/ diff --git a/drivers/fpga/lattice/Kconfig b/drivers/fpga/lattice/Kconfig new file mode 100644 index 0000000000000..4619aac49ef57 --- /dev/null +++ b/drivers/fpga/lattice/Kconfig @@ -0,0 +1,22 @@ +config FPGA_LATTICE + bool "Lattice Devices" + default y + help + If you have a lattic fpga, say Y. + +if FPGA_LATTICE + +config FPGA_MGR_ICE40_SPI + tristate "Lattice iCE40 SPI" + depends on OF && SPI + help + FPGA manager driver support for Lattice iCE40 FPGAs over SPI. + +config FPGA_MGR_MACHXO2_SPI + tristate "Lattice MachXO2 SPI" + depends on SPI + help + FPGA manager driver support for Lattice MachXO2 configuration + over slave SPI interface. + +endif #FPGA_LATTICE diff --git a/drivers/fpga/lattice/Makefile b/drivers/fpga/lattice/Makefile new file mode 100644 index 0000000000000..42d01c1b61704 --- /dev/null +++ b/drivers/fpga/lattice/Makefile @@ -0,0 +1,4 @@ +# SPDX-License-Identifier: GPL-2.0 + +obj-$(CONFIG_FPGA_MGR_ICE40_SPI) += ice40-spi.o +obj-$(CONFIG_FPGA_MGR_MACHXO2_SPI) += machxo2-spi.o diff --git a/drivers/fpga/ice40-spi.c b/drivers/fpga/lattice/ice40-spi.c similarity index 100% rename from drivers/fpga/ice40-spi.c rename to drivers/fpga/lattice/ice40-spi.c diff --git a/drivers/fpga/machxo2-spi.c b/drivers/fpga/lattice/machxo2-spi.c similarity index 100% rename from drivers/fpga/machxo2-spi.c rename to drivers/fpga/lattice/machxo2-spi.c From patchwork Tue Jun 8 16:23:38 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307523 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E93E6C48BCD for ; Tue, 8 Jun 2021 16:24:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D04B06136D for ; Tue, 8 Jun 2021 16:24:22 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233533AbhFHQ0O (ORCPT ); Tue, 8 Jun 2021 12:26:14 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]:29770 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233539AbhFHQ0F (ORCPT ); Tue, 8 Jun 2021 12:26:05 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169451; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z30Ub+z2OjWJtR5c/iXeFpG9nHCwEt3UgVQc8aykjUY=; b=Mw9fBfrG05jtXtV+AKog9EcRKAVvMljmUBg47woD3XjYK/tHCHyKZchbC5Oy10ScEjGuUW QBrIks0bL61fA1EBGoh2zgj66lqZAUUNG9wbh6YIw2Sel1PfYTygDhBx2eTOPsiI6X69aQ OnJmKsmUoTShuTh7AxZRk969kYSBkLc= Received: from mail-ot1-f72.google.com (mail-ot1-f72.google.com [209.85.210.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-8-Ns2f26cHPom4cDwLuZnuOg-1; Tue, 08 Jun 2021 12:24:10 -0400 X-MC-Unique: Ns2f26cHPom4cDwLuZnuOg-1 Received: by mail-ot1-f72.google.com with SMTP id 108-20020a9d0bf50000b02903d55be6ada3so10976777oth.22 for ; Tue, 08 Jun 2021 09:24:10 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=z30Ub+z2OjWJtR5c/iXeFpG9nHCwEt3UgVQc8aykjUY=; b=aCzsTf90YHjvmqq6hOGGHsawYQS5rDMM5yBrfp7/eILgZ+hpMfxqmex1mox3V1lWn/ 1tSTx1OjGWWesHKoumyHV3s2hlTKct0k3xlOs4teA7aVO0lsrWUpR1axk+CDn0rArKfG rjYEfxBz+NfQ7YNZVU6Pc+8lFLmMVampQoWwDbe7EPF2/Gv7omTLthY0//pcq0eTYcDE sLjz6XvC1Ib/Qv0n2HSJmIdFVm/7OIDmd0rKuNUseTipwKRYuVUGPPhfhYiYE0SSedl/ Rxz2UbJ4N0NlG+NwzMp+nk4Q63a36v6KUiD7YjY8R8tryg53QoJfZMBz38lFrA7BZNTW 4qFA== X-Gm-Message-State: AOAM531k06ZKt0nOTuuSLwxiUILNfXujPzs+eLb75FAg9FprCNDIQiG9 eoSfppuK7dacIzy0EoaQOQxmPBDhJEnAKbJMG/CESk0fVIfsLqU9aiweE5AUqwQ24WgHZBmWMpK iI96t2W7L0qhfBBFLb6BdEw== X-Received: by 2002:aca:ed0f:: with SMTP id l15mr3327151oih.136.1623169448966; Tue, 08 Jun 2021 09:24:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx/wf90qvmJyOhl8IF/LUAuCtSuS57EK6CzmLJqOBLpGIE7vechP80vuJAMtMPctg+4J7fPcg== X-Received: by 2002:aca:ed0f:: with SMTP id l15mr3327130oih.136.1623169448735; Tue, 08 Jun 2021 09:24:08 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.24.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:24:08 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 5/7] fpga: dfl: remove dfl- prefix on files Date: Tue, 8 Jun 2021 09:23:38 -0700 Message-Id: <20210608162340.3010204-7-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210608162340.3010204-1-trix@redhat.com> References: <20210608162340.3010204-1-trix@redhat.com> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix It is not necessary to have a dfl- prefix on a file when the file is in a dfl/ subdir. Signed-off-by: Tom Rix --- Documentation/fpga/dfl.rst | 4 ++-- drivers/fpga/dfl/Makefile | 21 +++++++------------ ...{dfl-afu-dma-region.c => afu-dma-region.c} | 2 +- .../fpga/dfl/{dfl-afu-error.c => afu-error.c} | 2 +- .../fpga/dfl/{dfl-afu-main.c => afu-main.c} | 2 +- .../dfl/{dfl-afu-region.c => afu-region.c} | 2 +- drivers/fpga/dfl/{dfl-afu.h => afu.h} | 6 +++--- drivers/fpga/dfl/{dfl-fme-br.c => fme-br.c} | 2 +- .../fpga/dfl/{dfl-fme-error.c => fme-error.c} | 2 +- .../fpga/dfl/{dfl-fme-main.c => fme-main.c} | 2 +- drivers/fpga/dfl/{dfl-fme-mgr.c => fme-mgr.c} | 2 +- .../fpga/dfl/{dfl-fme-perf.c => fme-perf.c} | 2 +- drivers/fpga/dfl/{dfl-fme-pr.c => fme-pr.c} | 4 ++-- drivers/fpga/dfl/{dfl-fme-pr.h => fme-pr.h} | 6 +++--- .../dfl/{dfl-fme-region.c => fme-region.c} | 2 +- drivers/fpga/dfl/{dfl-fme.h => fme.h} | 6 +++--- .../dfl/{dfl-n3000-nios.c => n3000-nios.c} | 0 drivers/fpga/dfl/{dfl-pci.c => pci.c} | 0 18 files changed, 31 insertions(+), 36 deletions(-) rename drivers/fpga/dfl/{dfl-afu-dma-region.c => afu-dma-region.c} (99%) rename drivers/fpga/dfl/{dfl-afu-error.c => afu-error.c} (99%) rename drivers/fpga/dfl/{dfl-afu-main.c => afu-main.c} (99%) rename drivers/fpga/dfl/{dfl-afu-region.c => afu-region.c} (99%) rename drivers/fpga/dfl/{dfl-afu.h => afu.h} (98%) rename drivers/fpga/dfl/{dfl-fme-br.c => fme-br.c} (99%) rename drivers/fpga/dfl/{dfl-fme-error.c => fme-error.c} (99%) rename drivers/fpga/dfl/{dfl-fme-main.c => fme-main.c} (99%) rename drivers/fpga/dfl/{dfl-fme-mgr.c => fme-mgr.c} (99%) rename drivers/fpga/dfl/{dfl-fme-perf.c => fme-perf.c} (99%) rename drivers/fpga/dfl/{dfl-fme-pr.c => fme-pr.c} (99%) rename drivers/fpga/dfl/{dfl-fme-pr.h => fme-pr.h} (96%) rename drivers/fpga/dfl/{dfl-fme-region.c => fme-region.c} (98%) rename drivers/fpga/dfl/{dfl-fme.h => fme.h} (95%) rename drivers/fpga/dfl/{dfl-n3000-nios.c => n3000-nios.c} (100%) rename drivers/fpga/dfl/{dfl-pci.c => pci.c} (100%) diff --git a/Documentation/fpga/dfl.rst b/Documentation/fpga/dfl.rst index ccc33f199df2a..696ab63d9e6bf 100644 --- a/Documentation/fpga/dfl.rst +++ b/Documentation/fpga/dfl.rst @@ -210,7 +210,7 @@ device and etc. Its driver module is always loaded first once the device is created by the system. This driver plays an infrastructural role in the driver architecture. It locates the DFLs in the device memory, handles them and related resources to common interfaces from DFL framework for enumeration. -(Please refer to drivers/fpga/dfl.c for detailed enumeration APIs). +(Please refer to drivers/fpga/dfl/dfl.c for detailed enumeration APIs). The FPGA Management Engine (FME) driver is a platform driver which is loaded automatically after FME platform device creation from the DFL device module. It @@ -499,7 +499,7 @@ In some cases, we may need to add some new private features to existing FIUs framework, as each private feature will be parsed automatically and related mmio resources can be found under FIU platform device created by DFL framework. Developer only needs to provide a sub feature driver with matched feature id. -FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl-fme-pr.c) +FME Partial Reconfiguration Sub Feature driver (see drivers/fpga/dfl/fme-pr.c) could be a reference. Location of DFLs on a PCI Device diff --git a/drivers/fpga/dfl/Makefile b/drivers/fpga/dfl/Makefile index 724792039026f..29c9dbabd9f77 100644 --- a/drivers/fpga/dfl/Makefile +++ b/drivers/fpga/dfl/Makefile @@ -4,16 +4,11 @@ obj-$(CONFIG_FPGA_DFL) += dfl.o obj-$(CONFIG_FPGA_DFL_AFU) += dfl-afu.o obj-$(CONFIG_FPGA_DFL_FME) += dfl-fme.o -obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += dfl-fme-br.o -obj-$(CONFIG_FPGA_DFL_FME_MGR) += dfl-fme-mgr.o -obj-$(CONFIG_FPGA_DFL_FME_REGION) += dfl-fme-region.o -obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += dfl-n3000-nios.o -obj-$(CONFIG_FPGA_DFL_PCI) += dfl-pci.o - -dfl-fme-objs := dfl-fme-main.o dfl-fme-pr.o dfl-fme-error.o \ - dfl-fme-perf.o -dfl-afu-objs := dfl-afu-main.o dfl-afu-region.o dfl-afu-dma-region.o \ - dfl-afu-error.o - - - +obj-$(CONFIG_FPGA_DFL_FME_BRIDGE) += fme-br.o +obj-$(CONFIG_FPGA_DFL_FME_MGR) += fme-mgr.o +obj-$(CONFIG_FPGA_DFL_FME_REGION) += fme-region.o +obj-$(CONFIG_FPGA_DFL_NIOS_INTEL_PAC_N3000) += n3000-nios.o +obj-$(CONFIG_FPGA_DFL_PCI) += pci.o + +dfl-fme-objs := fme-main.o fme-pr.o fme-error.o fme-perf.o +dfl-afu-objs := afu-main.o afu-region.o afu-dma-region.o afu-error.o diff --git a/drivers/fpga/dfl/dfl-afu-dma-region.c b/drivers/fpga/dfl/afu-dma-region.c similarity index 99% rename from drivers/fpga/dfl/dfl-afu-dma-region.c rename to drivers/fpga/dfl/afu-dma-region.c index 02b60fde04305..1cf3acbdb0918 100644 --- a/drivers/fpga/dfl/dfl-afu-dma-region.c +++ b/drivers/fpga/dfl/afu-dma-region.c @@ -14,7 +14,7 @@ #include #include -#include "dfl-afu.h" +#include "afu.h" void afu_dma_region_init(struct dfl_feature_platform_data *pdata) { diff --git a/drivers/fpga/dfl/dfl-afu-error.c b/drivers/fpga/dfl/afu-error.c similarity index 99% rename from drivers/fpga/dfl/dfl-afu-error.c rename to drivers/fpga/dfl/afu-error.c index ab7be62173681..4e04a9de314d5 100644 --- a/drivers/fpga/dfl/dfl-afu-error.c +++ b/drivers/fpga/dfl/afu-error.c @@ -17,7 +17,7 @@ #include #include -#include "dfl-afu.h" +#include "afu.h" #define PORT_ERROR_MASK 0x8 #define PORT_ERROR 0x10 diff --git a/drivers/fpga/dfl/dfl-afu-main.c b/drivers/fpga/dfl/afu-main.c similarity index 99% rename from drivers/fpga/dfl/dfl-afu-main.c rename to drivers/fpga/dfl/afu-main.c index 7f621e96d3b8d..9681ab83c02ee 100644 --- a/drivers/fpga/dfl/dfl-afu-main.c +++ b/drivers/fpga/dfl/afu-main.c @@ -19,7 +19,7 @@ #include #include -#include "dfl-afu.h" +#include "afu.h" #define RST_POLL_INVL 10 /* us */ #define RST_POLL_TIMEOUT 1000 /* us */ diff --git a/drivers/fpga/dfl/dfl-afu-region.c b/drivers/fpga/dfl/afu-region.c similarity index 99% rename from drivers/fpga/dfl/dfl-afu-region.c rename to drivers/fpga/dfl/afu-region.c index 0804b7a0c2986..0efcdb2a388e3 100644 --- a/drivers/fpga/dfl/dfl-afu-region.c +++ b/drivers/fpga/dfl/afu-region.c @@ -8,7 +8,7 @@ * Wu Hao * Xiao Guangrong */ -#include "dfl-afu.h" +#include "afu.h" /** * afu_mmio_region_init - init function for afu mmio region support diff --git a/drivers/fpga/dfl/dfl-afu.h b/drivers/fpga/dfl/afu.h similarity index 98% rename from drivers/fpga/dfl/dfl-afu.h rename to drivers/fpga/dfl/afu.h index e5020e2b1f3df..1ea7945218d57 100644 --- a/drivers/fpga/dfl/dfl-afu.h +++ b/drivers/fpga/dfl/afu.h @@ -14,8 +14,8 @@ * Henry Mitchel */ -#ifndef __DFL_AFU_H -#define __DFL_AFU_H +#ifndef __AFU_H +#define __AFU_H #include @@ -106,4 +106,4 @@ extern const struct dfl_feature_ops port_err_ops; extern const struct dfl_feature_id port_err_id_table[]; extern const struct attribute_group port_err_group; -#endif /* __DFL_AFU_H */ +#endif /* __AFU_H */ diff --git a/drivers/fpga/dfl/dfl-fme-br.c b/drivers/fpga/dfl/fme-br.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-br.c rename to drivers/fpga/dfl/fme-br.c index 3ff9f3a687ce5..ee321903b2885 100644 --- a/drivers/fpga/dfl/dfl-fme-br.c +++ b/drivers/fpga/dfl/fme-br.c @@ -17,7 +17,7 @@ #include #include "dfl.h" -#include "dfl-fme-pr.h" +#include "fme-pr.h" struct fme_br_priv { struct dfl_fme_br_pdata *pdata; diff --git a/drivers/fpga/dfl/dfl-fme-error.c b/drivers/fpga/dfl/fme-error.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-error.c rename to drivers/fpga/dfl/fme-error.c index 51c2892ec06d5..97c94a87d053b 100644 --- a/drivers/fpga/dfl/dfl-fme-error.c +++ b/drivers/fpga/dfl/fme-error.c @@ -19,7 +19,7 @@ #include #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" #define FME_ERROR_MASK 0x8 #define FME_ERROR 0x10 diff --git a/drivers/fpga/dfl/dfl-fme-main.c b/drivers/fpga/dfl/fme-main.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-main.c rename to drivers/fpga/dfl/fme-main.c index 77ea04d4edbef..05676c5a623b1 100644 --- a/drivers/fpga/dfl/dfl-fme-main.c +++ b/drivers/fpga/dfl/fme-main.c @@ -22,7 +22,7 @@ #include #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" static ssize_t ports_num_show(struct device *dev, struct device_attribute *attr, char *buf) diff --git a/drivers/fpga/dfl/dfl-fme-mgr.c b/drivers/fpga/dfl/fme-mgr.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-mgr.c rename to drivers/fpga/dfl/fme-mgr.c index d5861d13b3069..ae2b45abbe3aa 100644 --- a/drivers/fpga/dfl/dfl-fme-mgr.c +++ b/drivers/fpga/dfl/fme-mgr.c @@ -22,7 +22,7 @@ #include #include -#include "dfl-fme-pr.h" +#include "fme-pr.h" /* FME Partial Reconfiguration Sub Feature Register Set */ #define FME_PR_DFH 0x0 diff --git a/drivers/fpga/dfl/dfl-fme-perf.c b/drivers/fpga/dfl/fme-perf.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-perf.c rename to drivers/fpga/dfl/fme-perf.c index 4299145ef347e..451d7b6e0ac1f 100644 --- a/drivers/fpga/dfl/dfl-fme-perf.c +++ b/drivers/fpga/dfl/fme-perf.c @@ -18,7 +18,7 @@ #include #include "dfl.h" -#include "dfl-fme.h" +#include "fme.h" /* * Performance Counter Registers for Cache. diff --git a/drivers/fpga/dfl/dfl-fme-pr.c b/drivers/fpga/dfl/fme-pr.c similarity index 99% rename from drivers/fpga/dfl/dfl-fme-pr.c rename to drivers/fpga/dfl/fme-pr.c index d61ce9a188792..aed4f061c0bf2 100644 --- a/drivers/fpga/dfl/dfl-fme-pr.c +++ b/drivers/fpga/dfl/fme-pr.c @@ -26,8 +26,8 @@ #include #include "dfl.h" -#include "dfl-fme.h" -#include "dfl-fme-pr.h" +#include "fme.h" +#include "fme-pr.h" static struct dfl_fme_region * dfl_fme_region_find_by_port_id(struct dfl_fme *fme, int port_id) diff --git a/drivers/fpga/dfl/dfl-fme-pr.h b/drivers/fpga/dfl/fme-pr.h similarity index 96% rename from drivers/fpga/dfl/dfl-fme-pr.h rename to drivers/fpga/dfl/fme-pr.h index 096a699089d30..65b33cdeaf80d 100644 --- a/drivers/fpga/dfl/dfl-fme-pr.h +++ b/drivers/fpga/dfl/fme-pr.h @@ -15,8 +15,8 @@ * Henry Mitchel */ -#ifndef __DFL_FME_PR_H -#define __DFL_FME_PR_H +#ifndef __FME_PR_H +#define __FME_PR_H #include @@ -81,4 +81,4 @@ struct dfl_fme_mgr_pdata { #define DFL_FPGA_FME_BRIDGE "dfl-fme-bridge" #define DFL_FPGA_FME_REGION "dfl-fme-region" -#endif /* __DFL_FME_PR_H */ +#endif /* __FME_PR_H */ diff --git a/drivers/fpga/dfl/dfl-fme-region.c b/drivers/fpga/dfl/fme-region.c similarity index 98% rename from drivers/fpga/dfl/dfl-fme-region.c rename to drivers/fpga/dfl/fme-region.c index 1eeb42af10122..412609ebad148 100644 --- a/drivers/fpga/dfl/dfl-fme-region.c +++ b/drivers/fpga/dfl/fme-region.c @@ -17,7 +17,7 @@ #include #include -#include "dfl-fme-pr.h" +#include "fme-pr.h" static int fme_region_get_bridges(struct fpga_region *region) { diff --git a/drivers/fpga/dfl/dfl-fme.h b/drivers/fpga/dfl/fme.h similarity index 95% rename from drivers/fpga/dfl/dfl-fme.h rename to drivers/fpga/dfl/fme.h index 4195dd68193e7..300b6cc5cb63f 100644 --- a/drivers/fpga/dfl/dfl-fme.h +++ b/drivers/fpga/dfl/fme.h @@ -15,8 +15,8 @@ * Henry Mitchel */ -#ifndef __DFL_FME_H -#define __DFL_FME_H +#ifndef __FME_H +#define __FME_H /** * struct dfl_fme - dfl fme private data @@ -41,4 +41,4 @@ extern const struct attribute_group fme_global_err_group; extern const struct dfl_feature_ops fme_perf_ops; extern const struct dfl_feature_id fme_perf_id_table[]; -#endif /* __DFL_FME_H */ +#endif /* __FME_H */ diff --git a/drivers/fpga/dfl/dfl-n3000-nios.c b/drivers/fpga/dfl/n3000-nios.c similarity index 100% rename from drivers/fpga/dfl/dfl-n3000-nios.c rename to drivers/fpga/dfl/n3000-nios.c diff --git a/drivers/fpga/dfl/dfl-pci.c b/drivers/fpga/dfl/pci.c similarity index 100% rename from drivers/fpga/dfl/dfl-pci.c rename to drivers/fpga/dfl/pci.c From patchwork Tue Jun 8 16:25:51 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307525 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5803FC47082 for ; Tue, 8 Jun 2021 16:26:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3C40A6128E for ; Tue, 8 Jun 2021 16:26:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231675AbhFHQ1z (ORCPT ); Tue, 8 Jun 2021 12:27:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:30812 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231947AbhFHQ1z (ORCPT ); Tue, 8 Jun 2021 12:27:55 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169561; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=qViXgyeh1dlyqh22Awn1t3CyyorftxIelVJ9ElQQ5YY=; b=Pk6X2DE99bOV29E/nG9AuhXiSdtuYnuGkEnFk8vL54h1ZBp1zHxyCi+pq2RTl7okdb9dx4 rjI5u4XOfnz00xDv7nHVjqdcy1XDLXJLcryfPoqwHYRquEbNrPuh5dsFBW4ECeZEJDQIfS HyQTVZytZlFX8BNbmFCxPpKgu5wncIQ= Received: from mail-ot1-f70.google.com (mail-ot1-f70.google.com [209.85.210.70]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-121-YMs5n-ucMkmuLgIkyghCMw-1; Tue, 08 Jun 2021 12:26:00 -0400 X-MC-Unique: YMs5n-ucMkmuLgIkyghCMw-1 Received: by mail-ot1-f70.google.com with SMTP id c10-20020a9d75ca0000b02903f63362f6f3so1301635otl.1 for ; Tue, 08 Jun 2021 09:26:00 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=qViXgyeh1dlyqh22Awn1t3CyyorftxIelVJ9ElQQ5YY=; b=cd7DBP8wv72ISjgbrjmDKnJ6Cgk5pdethd4adHJqb3xow7sZpdcTwoBc74RGuiTX8M LoWOlDxyMYI1XD5yEh5uhQ4eHocrZesSTOee4rtphkA9ukWU9W4bqMPr2madLuUSG2DL LU61zZR+9cYIgO/Z7junjTzh03UzyinCODPiOnmRIYJRKw9EfJjdmIUYg4RxCCNT9Wz/ wkPrEIKTM+al8roRe9awHIhIzZ76ZeNrvei/N2pNZH7Q2/bwjFuwCiQtPL1kCv2AGOxF Z8wD/Icn0Kz6TKSm28HKyNFm5sgJrH30b7BZxQXoYvjFL4nSt3BqR46bLR2/44uqlddR uaFA== X-Gm-Message-State: AOAM532P0uCVtRykR6yFzZjTRY2XYmxc4NcgVLf51ejnUxklAVKcRIik Zzm6Q8rkE8gw/X2mhrwG1/24tU03Neov4r/8HdtNtp/0zHebon8lNyh0sW20FojpZ2bulgstbH+ JUDF7KudE+IFO6tk9qK29Cw== X-Received: by 2002:a05:6808:128a:: with SMTP id a10mr3395844oiw.161.1623169558853; Tue, 08 Jun 2021 09:25:58 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwdkIBlwY+O+Je+hrmiURYYe8KcG1gsS80R38FWHS4/03wkKj44epRlChJ09Yaxd9P5lAXdKw== X-Received: by 2002:a05:6808:128a:: with SMTP id a10mr3395828oiw.161.1623169558739; Tue, 08 Jun 2021 09:25:58 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id b26sm2831550otf.69.2021.06.08.09.25.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:25:58 -0700 (PDT) From: trix@redhat.com To: mdf@kernel.org, michal.simek@xilinx.com, nava.manne@xilinx.com, gregkh@linuxfoundation.org, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH 6/7] fpga: xilinx: remove xilinx- prefix on files Date: Tue, 8 Jun 2021 09:25:51 -0700 Message-Id: <20210608162551.3010533-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix It is not necessary to have a xilinx- prefix on a file when the file is in a xilinx/ subdir. Signed-off-by: Tom Rix --- drivers/fpga/xilinx/Makefile | 4 ++-- drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} | 0 drivers/fpga/xilinx/{xilinx-spi.c => spi.c} | 0 3 files changed, 2 insertions(+), 2 deletions(-) rename drivers/fpga/xilinx/{xilinx-pr-decoupler.c => pr-decoupler.c} (100%) rename drivers/fpga/xilinx/{xilinx-spi.c => spi.c} (100%) diff --git a/drivers/fpga/xilinx/Makefile b/drivers/fpga/xilinx/Makefile index 7bb7543412790..4ac727d03e140 100644 --- a/drivers/fpga/xilinx/Makefile +++ b/drivers/fpga/xilinx/Makefile @@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_XILINX_PR_DECOUPLER) += xilinx-pr-decoupler.o -obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += xilinx-spi.o +obj-$(CONFIG_XILINX_PR_DECOUPLER) += pr-decoupler.o +obj-$(CONFIG_FPGA_MGR_XILINX_SPI) += spi.o obj-$(CONFIG_FPGA_MGR_ZYNQ_FPGA) += zynq-fpga.o obj-$(CONFIG_FPGA_MGR_ZYNQMP_FPGA) += zynqmp-fpga.o diff --git a/drivers/fpga/xilinx/xilinx-pr-decoupler.c b/drivers/fpga/xilinx/pr-decoupler.c similarity index 100% rename from drivers/fpga/xilinx/xilinx-pr-decoupler.c rename to drivers/fpga/xilinx/pr-decoupler.c diff --git a/drivers/fpga/xilinx/xilinx-spi.c b/drivers/fpga/xilinx/spi.c similarity index 100% rename from drivers/fpga/xilinx/xilinx-spi.c rename to drivers/fpga/xilinx/spi.c From patchwork Tue Jun 8 16:26:23 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307527 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-18.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 5CD21C47082 for ; Tue, 8 Jun 2021 16:26:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 424F86128A for ; Tue, 8 Jun 2021 16:26:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233792AbhFHQ21 (ORCPT ); Tue, 8 Jun 2021 12:28:27 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:31022 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232773AbhFHQ2Z (ORCPT ); Tue, 8 Jun 2021 12:28:25 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169591; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=GMoGoh2HRdMM9sJwX6YN1+PVxLx5DD2e1fp3oIQPxak=; b=DMH4wsv5CU+2Go4G58DmTZmKqnCHwjkRezJIjgYNziIopV3RFfpszipmcDCuVuMHeeWkv+ A7rqGW0/XAe/fXtcSUsUzp8+nsOpVbieLYmm3pa+p5+ZY9t6BIeGyuqoxf6HGgtX0PCqZF YZwauNR8XUsZk+ieEatN3Quj/dG51n4= Received: from mail-oi1-f198.google.com (mail-oi1-f198.google.com [209.85.167.198]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-345-AbMF6TkuNxGi14yg_omBRQ-1; Tue, 08 Jun 2021 12:26:29 -0400 X-MC-Unique: AbMF6TkuNxGi14yg_omBRQ-1 Received: by mail-oi1-f198.google.com with SMTP id q41-20020a0568082029b02901f4500c63c4so1400746oiw.22 for ; Tue, 08 Jun 2021 09:26:28 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=GMoGoh2HRdMM9sJwX6YN1+PVxLx5DD2e1fp3oIQPxak=; b=GTRxEO37TzmKm6187TQHpA3w+PubyMNf0J7FiZWymvsjZn1CayKftmLfMcN1l+2MSs O39hfibGeRse7lM8IwctE3KuMi3nD+MUPKgaMclZIKhHaVTsLdxHDxH/2LlOJcRFFcO+ MGyEo44uGxYqkf+e4Y5WQBGxKVBpvG/7/awgT0rgqBBrDdCz851Etn5Yz6zftNnfjern xd6jt8UAugLPelt3h7Fi2Ryay6JezdhnqcVVpfHrrCMqnBXut61AQkU7ebyIGMSfQkRA SdNxtbO7doognN15YB2GZXDkDWEuOm/AE6x7bIOldtFwivYgtBoBokvgRjPgHvof0FlI c3Lw== X-Gm-Message-State: AOAM532j5pPqw6ror7wO4QghVIaK26vb+/8w9Ldr03ZK5fL6CufEsBM2 qcnxukOjL15aVhifhVqGSxLJ9VMyaBtrWoXOGE2HPOLs0w3Q/3Pdo2KP5H9Ii9kO0ItEk2VJYKr 72gsD01cJIQB1Z32APbANig== X-Received: by 2002:aca:db46:: with SMTP id s67mr3305701oig.42.1623169587275; Tue, 08 Jun 2021 09:26:27 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx9n4hvPaztcd6hSoy6zw5fuAdVUK8+k9iGgUYp8X8lcdjpV7RkpIpcqFrv43ITWqN+CM4Hww== X-Received: by 2002:aca:db46:: with SMTP id s67mr3305691oig.42.1623169587106; Tue, 08 Jun 2021 09:26:27 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id q1sm2944185oog.46.2021.06.08.09.26.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:26:26 -0700 (PDT) From: trix@redhat.com To: mdf@kernel.org, fpacheco@redhat.com, gregkh@linuxfoundation.org Cc: linux-fpga@vger.kernel.org, linux-kernel@vger.kernel.org, Tom Rix Subject: [PATCH 7/7] fpga: altera: remove altera- prefix on files Date: Tue, 8 Jun 2021 09:26:23 -0700 Message-Id: <20210608162623.3010726-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix 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 --- 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