From patchwork Wed Jun 9 13:21:45 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310169 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 2CF20C48BCD for ; Wed, 9 Jun 2021 13:54:15 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id ED35A61182 for ; Wed, 9 Jun 2021 13:54:14 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org ED35A61182 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=qYQw75ph/x4z/p6VUZSLmnDbgHCgEbn/6yu9+cTfK9k=; b=eZB3CWzSU9q/CL +Z+CFa3932DKkm+6zknTUMHMvwe0yyqIa8qQ9wT9PAogno0Di0gSMqzuIUwBBmi09dkuP+KxUPlZu jxjdWAMYLW54nQDA6kYZ94cwFZJITGy0FQ2foIe33/Lm4X5mOSprtkN+4gFtnzW2ej1ul8DNSEexu XTb1gB9XH2LZiX7GcSUm+jZUeRZiRxlG7nGjQHBeWXc/uccvly8pVUuei4iI7yG/IkCU+hGFptt4W gvAbFUIDqOJCR5+w0HBBDfWeYxuIyqWvrgr0xUup4rgd6RQcHIzpZRE/QFfnwfseQBgxTrhRghPbV 0FOQax0tVXcY2eIHEpxg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqycm-00E7rn-UX; Wed, 09 Jun 2021 13:52:05 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyAl-00DylR-TK for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:10 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623244986; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=92YiPexxYpFlIHYIfUzcajyREjX7dCB4H6SLkcvlG4w=; b=RQed8xDM+M94VRPpnxLoMTvPKuqi5ytzIc54EDpR1lhnhmy4bbMt2fQYMbazRXRacl2W4M whmWAAqGGeeDk4sYAJkBr8GqjfJNjvU/U/gv307OVaOpR0xR2zGTgBQmC0xA8455VPzS4x FD44bT/mZ2BF2wGcI5xJyuwzH/EBsRc= 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-448-lGLK7afQPMCuh5_fdbxgdw-1; Wed, 09 Jun 2021 09:23:05 -0400 X-MC-Unique: lGLK7afQPMCuh5_fdbxgdw-1 Received: by mail-ot1-f72.google.com with SMTP id 19-20020a9d04130000b02903cb28b38d0aso14891114otc.19 for ; Wed, 09 Jun 2021 06:23: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=92YiPexxYpFlIHYIfUzcajyREjX7dCB4H6SLkcvlG4w=; b=hQwx3pUj6tsLcjINI1CJ1zrCcvYEVzgPrq0rgNYQZf6lyfuOkL1heX6nX2a8xxU0uV ml/yFGeGlVWCGy4DlLJhJFb3BlmNjCmHfBV3zJiFNqT5P5Slj8j4IwxY1ImJUCdzOAN+ v7Kp/aYQGn7X8//q1ei5uYg1ObUinoat0Grlkc1KApWHXZYK4jbGhPIfPOHIPV1HUekd PZnQN5BxFZUW792vMOFFuCfiDf9joaDeTyPhnqGdM4EiRsO99SttH5DTANzVifZLR9ws RjZJ0BuShHax9ZKS28h5xJ7zCQL1DYCh0BsjO4PifNKsAgUPcQ+x9DLWzDGorOUmV4d0 Ezcg== X-Gm-Message-State: AOAM5333z7naszAXHS1VJ8v8AkZnvDhuWEpzSCtNBbuI6AataPrlOe04 4Fin2Rh47RqPbpkgif24ud7EYWaqOWdCxJlYEsRchQQhO2pgi98b5vY/YAoMOr8ox36ZcMUvb46 CP9yjEqP6NKHBdPW7igxISuANdWg5aSJ7VhM= X-Received: by 2002:a9d:6f88:: with SMTP id h8mr2735064otq.73.1623244985016; Wed, 09 Jun 2021 06:23:05 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwPMIpjxRX4dadpgXM5m40PYb26wDF4WHHQmibOXeVOj7sfKA78mnLLazA+DThMByerKnUIJw== X-Received: by 2002:a9d:6f88:: with SMTP id h8mr2735042otq.73.1623244984756; Wed, 09 Jun 2021 06:23: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 21sm3165654otd.21.2021.06.09.06.23.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:04 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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: Wed, 9 Jun 2021 06:21:45 -0700 Message-Id: <20210609132151.3081379-3-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062308_129069_0AA7FC6B X-CRM114-Status: GOOD ( 24.63 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21:46 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310171 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 1824CC48BCF for ; Wed, 9 Jun 2021 13:56:06 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id DF97761351 for ; Wed, 9 Jun 2021 13:56:05 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org DF97761351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=wfa4yJFAS1/vAMP6w69AKwNwQfmHCjz87P8AxT87Fhw=; b=EPTUp7qC8sGivR 1JNAgbeiIzTv2GFShhFl7LN8nfrrQRglvCNIsTsM1hHsR02mqA+kCmZa5KaQcQsnOiaeYPzoHNLLF 3ke6GBXX+X2LwOMcZcQERusnftoUYB/ddnbcOpEo18BloHXozkxwcK0NaZScEJFZK7eWdrG4s2tzo 7dMSTzhoSF1OCssGe69mlOC7rZtaZeloRnyy+vQJkqiOugrYEWYlY5OT/cADUSoJZ+Q+HT8BQ3bJ4 r5BxaOi1EVpieYWxBNf7RE4vwFe4KBtW8JeKNi1TcHwRouzfswnrd3MFMZD+rnY0UBqimstp8briu bwLc9T8Vr3u2tIXbyCfA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyeC-00E8LC-DL; Wed, 09 Jun 2021 13:53:34 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyAp-00DymU-AA for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:13 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623244990; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=XvFqgoXbMqYdld4DmESpGVSZB3RoZyxfbp1QAtbqos0=; b=g0VO3uIO2a6ijfvO1y8lxd8HT7CS7p1AaUmK29WW4VYSj1c+ZKMGknH0FsUOKluMIKRnpx ARYiKYH4lt++EkvyQyYXuq5eS3JSOIGL7pPGsa4F6J4DCZsKkz3mF1neZ/X2RM5yAc0Tpp HENM43AjusHp0JN6q+ztG/96Sdx+kDA= Received: from mail-ot1-f69.google.com (mail-ot1-f69.google.com [209.85.210.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-232-MNq2PqyBNCqhoEq919IQMg-1; Wed, 09 Jun 2021 09:23:09 -0400 X-MC-Unique: MNq2PqyBNCqhoEq919IQMg-1 Received: by mail-ot1-f69.google.com with SMTP id 10-20020a9d0f0a0000b02903c030760be3so4067086ott.4 for ; Wed, 09 Jun 2021 06:23:09 -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=KJ7KUSjO5yBJTHrhpwrgjfqMjOr1aD/5ixqqCvDEARm/QX9MnT2X0759WKRev3C85m Pp9gCFojYno6LLajVAFugN4FG3qhwLwSlGgaQ6iNIhKMPC/twuYrAEUHmzI3jKq7/Yiq di1tlowgXBy54hwn2sk2Rbko672wqRovk6qK+qkTcDiO/42NfbOXFvGReq+AR60qZcKx fSFhDonK7fNiRdIsdbe/MfoedqITl1WMhjhKCf21DauhDQnEUuc+KRQEp2k77ZwkhBxm iJKZMBGRuimHhQbt1jbKn97qplvL/I+J0b4WibrPUnHPzhIldK6Y56qnHrr/xROFMjS0 xUTQ== X-Gm-Message-State: AOAM5325jtpg0bpWm2/s0sZMG4pNpPHx6aC7YdHn7chrVTFZvI+E8iix bpUIgDjb0WmP2YOw0T3XA/jMqRq+gcWyGrmJRNQU974gEs4JOZwhQzQL8UJtlgptYmmRKoQGn5z uDV9irSq7TzzC+E+DgPw94MjKebcRh8TfSrA= X-Received: by 2002:a9d:17c5:: with SMTP id j63mr22568502otj.369.1623244988225; Wed, 09 Jun 2021 06:23:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz7QRjBg+gi5RVOVaFJZtZGRHgUKmOXOl/EGosz1au0ojize/ADUAoiEJmP2WB1Tnm7Sq0yVw== X-Received: by 2002:a9d:17c5:: with SMTP id j63mr22568483otj.369.1623244988022; Wed, 09 Jun 2021 06:23: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 21sm3165654otd.21.2021.06.09.06.23.06 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:07 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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: Wed, 9 Jun 2021 06:21:46 -0700 Message-Id: <20210609132151.3081379-4-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062311_474332_3078F91A X-CRM114-Status: GOOD ( 18.88 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21:47 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310181 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=-16.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,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 7FF8DC48BCD for ; Wed, 9 Jun 2021 13:59:21 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 47FFA61364 for ; Wed, 9 Jun 2021 13:59:21 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 47FFA61364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=MSSJbmLUPwDYIA8mQNz+iUOC5qf7fwbVNi+xGW4ih7U=; b=zTHan99QfTmfAq ntFdy4nAkuacmcSHDbFTBRoKrH3FgNhq/opuk9WAq/LShDJ+EPVlFK0TLzFNxZOzi+kKeXYCo5j1H XnD/zMG09yw26q0xR2HBKHxeHTz6sQ8OjccP7V1zGFXhU2FO18MRpjSPgxZ55BW3qkUzhn5hYd+LW 4voKEB8sPop3N5LdCXi4+7qSQzVHTVKgO1FxhBJNzRKhgvfJEl3a8k0HVVEeISaWr/OqJOuNsl3eA pygEKxqfnSXdsoO89GPxLaM9vP6waqJEb13FxhPli70HoqdPB1CNkFrytr0J8d+M17a4/Ui7zmOmj A4LMrs8jbmH+IxO4zH/w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyhC-00E9KV-8t; Wed, 09 Jun 2021 13:56:39 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyAt-00Dynx-E2 for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:18 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623244994; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=toAw5Xqv8MQJGP4owqqo3qaenoRchLuqhCbpOlut5Y4=; b=X6q6PaxA3sBmMOBuAFjoPJKvRf6AH7OFv1vSpf23RHhYXAeBlFk2FqopXNmV1vZZQ6D6mh haOvsXHMEgRMbm3eN+gP8alG/AuGHn1MrPKXlI30xzf/1cYcs0g0dWyAFAaVAALYnVD6ae qBASSZ6DrE+4CdU2PZiEb8+KZxbqcd8= Received: from mail-oi1-f199.google.com (mail-oi1-f199.google.com [209.85.167.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-380-wDxVBCqXN4C18GOoA380VA-1; Wed, 09 Jun 2021 09:23:13 -0400 X-MC-Unique: wDxVBCqXN4C18GOoA380VA-1 Received: by mail-oi1-f199.google.com with SMTP id x125-20020aca31830000b02901f1c37dd8c9so828233oix.8 for ; Wed, 09 Jun 2021 06:23:13 -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=f10IswAentybaFr23kxLmACFXCzlMo9t0BQHLGLbLWz/yUzqLMmkJSvz/KY3VWAD6z bFNXACI1reyQLhxzfRKNdatXdE7GZrex6DwQpC1W0CpFqIppdbHZ/6/BVyg/gcQfOz8x AUBk13Cb83wOEC/MfndxFnhrKTd9TPLQ59D0d6jJ3dh+68GJ51DCFy8EBjelJ/kNI6nu PvXpVhc8/ySNUZJzl8UyDqjRh2idaxq/j0fJH4n7RU5Jv0O9YoTw46bqwWXNfjxbjBYb 7gCXLR72VObbZBegAaGhfnINtGqF3Htwcw/s6QneOt11428jivLOGR7s+nEjO3VBIsiu VAhA== X-Gm-Message-State: AOAM530WJPgnl9TnKpUAhd1b8RIZr245szZaIyI5aVpG6oDO3S1WkohF QWAXntAkIymmSIzhhh4deEIH2ewGSAPKRYDJ8DTdacHnJcrCwIb50WV9qilvdHYZVbVVXBRUZVL WJMVD9L9osU2Z6XlEJ/3dO/loRDcxgYHnEY0= X-Received: by 2002:a05:6830:2476:: with SMTP id x54mr4587635otr.293.1623244992463; Wed, 09 Jun 2021 06:23:12 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJVTDvLlUDaJIXu5S/Py9PlgwFfhdEeR9Iy2Od2esg6I8Dwfcj2r9Zl8jfnt3n33QzVdBfaw== X-Received: by 2002:a05:6830:2476:: with SMTP id x54mr4587618otr.293.1623244992227; Wed, 09 Jun 2021 06:23:12 -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 21sm3165654otd.21.2021.06.09.06.23.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:11 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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: Wed, 9 Jun 2021 06:21:47 -0700 Message-Id: <20210609132151.3081379-5-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062315_693489_60B0BA2E X-CRM114-Status: GOOD ( 17.78 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21:48 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310183 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 86874C48BCF for ; Wed, 9 Jun 2021 14:00:32 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 4AA9C61364 for ; Wed, 9 Jun 2021 14:00:32 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 4AA9C61364 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=8vOi5hROoAIZcy62Bbt/fyJ8T/95xfoNc30Mm1luigw=; b=HEdT0l/zJW0PoX GpRM4PRaICoGAWXxaLpcGksFO8XOTKahqysCkdH8VVOs1DhvPsvH3YqertZMdF7R4Du1B5JBygdLd 2fKBcTisNC/YkuU0VE9K9bUT9Qn1Ufr9MBo1d0DuuA3k2/5lHhO3WBFbqpn7AdSCeN8WbYVBsDHSH LKkUqY3EgufaImabZphdolzPVOyacSeR9leda41cuKGPlXDCJqttAQ4xHGVAO/4dcI16q4xx4pl5W trueNNjYBmDUSSuqx09QDGkBtP8oDoqrYtGmax87jQ6qYfWn/hwAR7GOpRb3KnEjRjkfSL8XUjiON fovezGI4n5RmnDlwoEgg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyiO-00E9h8-GG; Wed, 09 Jun 2021 13:57:53 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyAw-00Dypu-Kf for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:20 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623244997; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=hE6HSHMIRX+gAlRokY5aHJhvIk3ZJblkRJXqZXARHDc=; b=fcCh7P/6WuZ9xlPQ621TPDTVtTqiRB/8MkEa/yc8kBsP4OQGEwnQ0er58mgJmBGrLpUbnm PexfBEL9josHbaN4GqSlfbgt/nxQRp9LfmkkBRXczIsffRtpsdaquDFxN0TVZS1/VgFvSP A+T4qRTm6pZEt5PbCSe8ZSjPydNKZN8= 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-333-XPzRCnT-MKGk-OgNLmnmOg-1; Wed, 09 Jun 2021 09:23:16 -0400 X-MC-Unique: XPzRCnT-MKGk-OgNLmnmOg-1 Received: by mail-oi1-f198.google.com with SMTP id a24-20020a0568080998b02901ee3e06e6a6so9539271oic.6 for ; Wed, 09 Jun 2021 06:23:16 -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=jBJGonlG4DVbqToRuqlQmYq66rXl/BGikmUHqLpMUWpml2OEoI0svVDhg7IUM9Xkx9 cSl66mwRS0oYwcCjUHXa9ZelwzB5fBkKMYePhtcSMygnhNXbF0tdPyO39jMpgiAdy8C7 XVJT+ve7Bot5en1dDQz3jo5BJ0GCgmX6Vj4AugI0Gk2gDaDf4Fw0QZlGHT523otihk/c RAPOwOmKD6CrO/NnQqjah7fnjEMU6YjjhTghAPWmhTQBPPexcFm4An67Oprk0IL4NjgH nPJDHe+ieoAUSbkGrpx8m4wUIghPLFM/p0VsOytC/LutPfjLUmYdrJYAccoewdPc7CTY 930Q== X-Gm-Message-State: AOAM532QU+Ij3cDuTDr993nVeUmVHYqDNtQo9FGY4+7yaITYUbzELYHj 5eiqPGC19V0Zk5BAZidUgOdsC2PG4HlXfYcGZpH/fXeIXZF2Z+DdFCujaZdHP1N6Xw/XUB0MA5z 7fFkm6YwMFlXE8ENZ9X8sfpEpZtO+LEAHvnQ= X-Received: by 2002:a9d:1b8:: with SMTP id e53mr21498145ote.252.1623244995630; Wed, 09 Jun 2021 06:23:15 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwr4NEx7Yve3wjhF1gwVJrTOehYjV/0qEGs38SXoho/7pOmP0syhetqKATX2jZzPm+B7Rcomg== X-Received: by 2002:a9d:1b8:: with SMTP id e53mr21498134ote.252.1623244995464; Wed, 09 Jun 2021 06:23:15 -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 21sm3165654otd.21.2021.06.09.06.23.14 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:15 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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: Wed, 9 Jun 2021 06:21:48 -0700 Message-Id: <20210609132151.3081379-6-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062318_806210_A4B7978B X-CRM114-Status: GOOD ( 14.64 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21:49 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310185 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 A7AE5C48BCF for ; Wed, 9 Jun 2021 14:01:56 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7114661351 for ; Wed, 9 Jun 2021 14:01:56 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7114661351 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=lKwZK84M6dFyx5SizFkUaW6cBX8QJllC73gUGDDmJvg=; b=5D3KrdIldVER6L iuxhQW9CGqJkJe00wPMWiC/+OIj7ECElmpCu+WmgMygkGDBqLydyWc0vffr9tJwKeKpV9LShiUGJD L/FEi9tB+bjTJ2N+Vd0Ut3/ttZlGo9PkQ/3QM4GxudHMjfH7sGQNWr5SQ4Ow2mZEu5/OUckJ6EY+n IROOUhBV3JNgAdWSIEDePKx4UJGkQ4IQ7dNLjxfMjknF/llqOCK3GU7xu8a9vTZS6dRd27SyUhHOq OHdukR+MR7d3hfo5KD9MNXIPD1zx8aZhV6wt/GAeaDvTEzHwrZsBLFj6KNOd4mSc1VX8J8FOiJVBN GyEMPV8yMok4eRF7v5zg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyjp-00EAAI-Nh; Wed, 09 Jun 2021 13:59:24 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyB4-00Dys5-Ov for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:29 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623245005; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=z30Ub+z2OjWJtR5c/iXeFpG9nHCwEt3UgVQc8aykjUY=; b=VuUN9DgvMxUDmDw9UCP2WeQsnfkT9tSLvrLFTLgEQkOabbb2TTepjft77j5t2uCvRIdb1p DJmwIbeNYq93Oj20+O8FKTdmcaLXUBeGJmgMQoK/ni2bNTt9IeY0JwQPX4/IX2xP4Fm8B2 yGld9RgN9mh1DUBhXD88sMj2+xiK+yI= Received: from mail-ot1-f71.google.com (mail-ot1-f71.google.com [209.85.210.71]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-513-si4DTLYdP9KO1Ls1iBCCqw-1; Wed, 09 Jun 2021 09:23:24 -0400 X-MC-Unique: si4DTLYdP9KO1Ls1iBCCqw-1 Received: by mail-ot1-f71.google.com with SMTP id 59-20020a9d0dc10000b02902a57e382ca1so16325348ots.7 for ; Wed, 09 Jun 2021 06:23:24 -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=tp/lXij9jU8akAyCsA1eejaGdIBiBi+sqRWFP/PpBaPsX2Qjs/F3cjcxTQi2SNqEtQ RhGem9zptI3BKyBEq+W9H1MSB7k7hm0/vx0+ipuzgpo/1uu+6kg9Th02+HiPn4RhUyu4 1XVP+10aswvX710ekiJ7L10G1xoC0XDO59DxMKQbr+WRSZeunBPMekdXCdOTn7AUFog6 2qD0snA/gNft/4rT1rq9zArxPoYc6E4qxGjtxbN1PePQQ5glNp9RjRYLVkzgqWajGHpK SImEx3oqfL/bZO2CiEvsMuKSvMD7wA3FxpI5K5enedStHa4ljUlfr4MsdrLMzUryOB79 Uo8g== X-Gm-Message-State: AOAM530yja0rqT1V3RmulFgXOvJgDgWdRZCbwEo39YukivbMjdRpMLfW 1bk1tNybGFQy0Sn0S7c/krfr3lmJoVqiurzUSYWZNlrTevsM4rmtRpqKHxMdbfXnEg/JPUH70Et ja0Ksl2XjX4QEtDJ5CcmTMd38JlWxrJVqqf0= X-Received: by 2002:aca:f488:: with SMTP id s130mr6325430oih.5.1623245003527; Wed, 09 Jun 2021 06:23:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxGZkuQlcHGNMAEUbmCa4ErDyEavEw7XXTSdMa/dKVrmhOsr0+aOpMSgBvnYm3yB4s0eiprzA== X-Received: by 2002:aca:f488:: with SMTP id s130mr6325411oih.5.1623245003321; Wed, 09 Jun 2021 06:23:23 -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 21sm3165654otd.21.2021.06.09.06.23.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:23 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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: Wed, 9 Jun 2021 06:21:49 -0700 Message-Id: <20210609132151.3081379-7-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062327_043777_4B057DD3 X-CRM114-Status: GOOD ( 18.70 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21:50 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310191 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 DBAE5C48BCD for ; Wed, 9 Jun 2021 14:03:27 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id AAF16613AE for ; Wed, 9 Jun 2021 14:03:27 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org AAF16613AE Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=37BRRq/9vDQzisKO3A6+Y1iHoNOjQNUfgH7cSA8ALS4=; b=01KZTUfz1Gui3F r6mdYUbXCs7j9Ly5I4Dm7hVnFo6ZhTy7okFRMEKvEXt/RPpQSfavoITPn7eRlg6267zsPEPTMsdX9 +t41C6blR1z2KfzraTA6CLhp4ISuIvIEB8/5L2E7/I+iYedp4QbUwTrfse+tdvR2K2IXz7moM53fe WW7uEcFNapi4B6wEv4r5vo2FXzhqDSByiabjmAx+hGGYVNHg33Vy8ltJ2puxLZ5wCX3GYn+/Bwz+s b6T+tO6rH7Lc1HpHS9iZLCLWBDh3kiM0/HFmCBLJyjK9xRh/ucCIR0NZUpCbQS7x/rI1HLmugm5k7 vI3edqd8BVGohhnOrXQg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyl5-00EAYq-R0; Wed, 09 Jun 2021 14:00:42 +0000 Received: from us-smtp-delivery-124.mimecast.com ([170.10.133.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyB7-00Dyt2-Sw for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:31 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623245008; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=qViXgyeh1dlyqh22Awn1t3CyyorftxIelVJ9ElQQ5YY=; b=VN2li0vjLR9c3RKW5tk/F2+Dyazdbwc36azYR4NiwBdtuEMpqN1onXoGVrYSaEq1pj1MHy xHlhxC+KPQzVWE1fXTL+iarxRjWW6frZm3yyJZfKXFJjTPZgJoElfc9wj5/NC9k961S/T7 i936AzhFsWH10QG31Z+TbVI7VMcBTOM= Received: from mail-oo1-f69.google.com (mail-oo1-f69.google.com [209.85.161.69]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-568-k3ERcc5GOcuMpedSPxebZw-1; Wed, 09 Jun 2021 09:23:28 -0400 X-MC-Unique: k3ERcc5GOcuMpedSPxebZw-1 Received: by mail-oo1-f69.google.com with SMTP id n62-20020a4a53410000b0290246a4799849so14922943oob.8 for ; Wed, 09 Jun 2021 06:23: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:in-reply-to :references:mime-version:content-transfer-encoding; bh=qViXgyeh1dlyqh22Awn1t3CyyorftxIelVJ9ElQQ5YY=; b=Fgn0BfKTf1JfUoH9DVV9ZHhh2Zr/SrRZei/lrpHqX0DkWoW1H3bQAfxelCUdaQFPMk Yvn6cjB0rvBsza2vremrus75A/AbClECIt+sMD9aZ2yyHl05SMRf6xRKy0rOaz6OA2yk vU71/7t4c4GpG42Fwm7oTbo6aToYUyhybfa4mjbHqx16pCw5xWdQPihp5+QXcPVZ2EQv 5vAQIV8x7ZRTdbcYOf3MS+v9uLxtNz62HwFQPe+l2fbBhSA/9rJUiSYxYplVtxlZkyPG iFasPMdkVndDiwij4YQpyK5xlknHVp6P7zGx40scXhUMP19knBWGhl8VTVLKBsj43w9v mNjA== X-Gm-Message-State: AOAM533D6HouQwqj3xfoTJbm2945dSRhDeSl5heu0Nw0sPT1gScVRt5y q5Jru0Ey9NgvZIkxkp0MDiCMFvPYEs4fnOZ2PP88QcSFJBeZQqw+Uf0vq3esjfw09cRT3Fy5hYt iQTlbZinH8E6k/pVImepL348stUE8sG9F6mI= X-Received: by 2002:a9d:66d9:: with SMTP id t25mr3492362otm.217.1623245006772; Wed, 09 Jun 2021 06:23:26 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyYlq5NQAg9r5rM56eciALlRRoXOllzEovCjy257M0FuEL28u377Zg2s+BEXW70oM5w182g1Q== X-Received: by 2002:a9d:66d9:: with SMTP id t25mr3492350otm.217.1623245006642; Wed, 09 Jun 2021 06:23:26 -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 21sm3165654otd.21.2021.06.09.06.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:26 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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 6/7] fpga: xilinx: remove xilinx- prefix on files Date: Wed, 9 Jun 2021 06:21:50 -0700 Message-Id: <20210609132151.3081379-8-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062330_105860_57CDD82D X-CRM114-Status: GOOD ( 11.20 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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 Wed Jun 9 13:21: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: 12310193 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=-17.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,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 8A8A6C48BCF for ; Wed, 9 Jun 2021 14:04:53 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 60F3F6136D for ; Wed, 9 Jun 2021 14:04:53 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 60F3F6136D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-Id:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=CrPwnuLyjhXcpySn/D2G9conzfghewYyi8X7B05Mhhg=; b=B1rmwyOMCaitPr U8bB//ld/xzMg8UByb+qLIckLGBGXhkOiRE9+ouagTFKc9IfGwWPgdEKt2aoOvf8SClpT/FnqmYaK 9ZyEV+Hs3cJ9tH3Ze0BpZbbYexzQ9PgGS+ThelUez7oVqzK9jvQslwdZCOETrhG2N9FNcl4ItgzoI n61speYT44h4tI75RbolrKw+2c+qaoGKUawqP0vTvgeDs7Je9spd1Rz7kdUYu6C5gwML4WK9nm1D7 ESEHf87L+qyV0t8sePQ4HLMdnPNkb82zEUc245ha6UiU+aEtjXTs8E+0twRYWfx/xhmm5NtHUtwUG gv7wVxjhYTPuHT8u5FhA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqymW-00EB0f-LE; Wed, 09 Jun 2021 14:02:08 +0000 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqyBC-00Dyu8-8K for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:23:36 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623245013; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GMoGoh2HRdMM9sJwX6YN1+PVxLx5DD2e1fp3oIQPxak=; b=RMcMURFNj/fcZd7Kz2oF6vbjqfDmOzC0RIgZs984Rf+Y2Q17tApIgv9MyPN+yKhvgsBY41 kb2X7/TEcbISLaCKZEeKAf6HhBFLvJMmCDNS6djsx3HLeFN7L21bR6/4STdVxaeFki8nqH aL6gGwTzhhI6FdTs0q0YH11pa0mANYE= Received: from mail-oo1-f72.google.com (mail-oo1-f72.google.com [209.85.161.72]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-37-XFCtwuLCNJ6PRxe3a9AjJA-1; Wed, 09 Jun 2021 09:23:32 -0400 X-MC-Unique: XFCtwuLCNJ6PRxe3a9AjJA-1 Received: by mail-oo1-f72.google.com with SMTP id x24-20020a4a9b980000b0290249d5c08dd6so6137718ooj.15 for ; Wed, 09 Jun 2021 06:23:30 -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=GMoGoh2HRdMM9sJwX6YN1+PVxLx5DD2e1fp3oIQPxak=; b=CgyqHwut+SpNJY7SyUIZuxpKduu7wmk+nvyaxVUpb5HK99XXCs2txpS3O8WU+SF7Yz 6V3lUfqBSl8fUkNDSH8j9q0DsDkhbwApMjqYlMPSn4OrFd41X8cbd1Zjfe9jVv936Dp4 7aPmsfGRt4aVYYbQpasUc25ubnwTTLHd7qdmm/VMtLyCLBsxTKKLQv3cjyfso/dWMDZK Wi+5QQkOEeJP+TwZuAry1Lz7fnGhd2dwHRip3jMgFrH5K8dO0oUKrE15kxhwcL9HTSKY +VoSQSiQ0+6XvNMizsAZLgPJuDCRmW4+j0e9Hvt+w2RnB6L7GLk4tSXx9BqSlK23hYWv 6zjA== X-Gm-Message-State: AOAM531DESmPHE/dXTxHYwHmH2EWKpf3Rz2ucVfwhqVmAmxb3yPJP2xs NhI1tmvu8nDSwFUr98SPQn6NA2da/NR7T5ujxBOnRULgiMtmu4OzFDEhPFUHiPSEWkZjGMh5NA4 xnSQxigIaoaSZjGVibt9StbfwkYxMfEorgG8= X-Received: by 2002:a9d:1d21:: with SMTP id m30mr23363353otm.145.1623245010291; Wed, 09 Jun 2021 06:23:30 -0700 (PDT) X-Google-Smtp-Source: ABdhPJydARdiHq8phH1rVCd2rtPnu21b5nt/oM27/i7eYYIcqaQSBvNa5sJkdoPzOFhOlfjHs69E/w== X-Received: by 2002:a9d:1d21:: with SMTP id m30mr23363338otm.145.1623245010121; Wed, 09 Jun 2021 06:23:30 -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 21sm3165654otd.21.2021.06.09.06.23.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:23:29 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com 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 7/7] fpga: altera: remove altera- prefix on files Date: Wed, 9 Jun 2021 06:21:51 -0700 Message-Id: <20210609132151.3081379-9-trix@redhat.com> X-Mailer: git-send-email 2.26.3 In-Reply-To: <20210609132151.3081379-1-trix@redhat.com> References: <20210609132151.3081379-1-trix@redhat.com> MIME-Version: 1.0 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=trix@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20210609_062334_441323_A87E8BFF X-CRM114-Status: GOOD ( 10.72 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.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