From patchwork Tue Jun 8 16:23:32 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12307513 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=-13.9 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, 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 E995FC4743D for ; Tue, 8 Jun 2021 16:24:03 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D824761249 for ; Tue, 8 Jun 2021 16:24:03 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231675AbhFHQZz (ORCPT ); Tue, 8 Jun 2021 12:25:55 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:44874 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232734AbhFHQZv (ORCPT ); Tue, 8 Jun 2021 12:25:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623169438; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding; bh=aDHyqkHT8tP5woeTV+rBNHR8on5450qVlxL0Zzlav/M=; b=LIXJLC81XJ5le1wvX7htH/bb2Hg2x+kz94lo4XhKZlr4YoQi473W3r9TDnIODYFfaXpAYd XrXDt7t3wdmbdOoeKTn4IRRsKrfai++iE1UpeePVFlgHmGMlM2+OmgQZmLotNaeD5PzSl/ hP5yNgf1fTDGmsMl09+Nn3AXrYX8e5s= Received: from mail-oi1-f197.google.com (mail-oi1-f197.google.com [209.85.167.197]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-177-AoP5H5S0MQGLD5ej5b0oxA-1; Tue, 08 Jun 2021 12:23:55 -0400 X-MC-Unique: AoP5H5S0MQGLD5ej5b0oxA-1 Received: by mail-oi1-f197.google.com with SMTP id l189-20020acabbc60000b02901f566a77bb8so205029oif.7 for ; Tue, 08 Jun 2021 09:23:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=aDHyqkHT8tP5woeTV+rBNHR8on5450qVlxL0Zzlav/M=; b=mX8gdVx4r9YEvKHUzF1zZOWIyGu2FW/N9t0tTuT5KjEWhCEtR0qCkV1q5xBDP5Jb/U xOXOzu9My1KykbZKulwamhQiXZsbpQZ9uqhITT5NgviEmNdtVFJNmoH1jIWq2/qkx7k4 GX00bWWu0NLD8NGcI0fr1Zv8Ql82lXVSmh5DPdgRN/w/2m4y0b5FeGnBuHaAQ2t0WiYh U/IGB6ysEU3ZWbpoiE6YVcNN48fzchCjqFu+qc93F0AbItD7AWy6gIgxoiobCi9/finX Llu65CICXoIpG/VHhVaQuZjMzmAACMtUdV/wO5QjbJlLg7KL2YGdTHWUA82KBv74WqIK lOCw== X-Gm-Message-State: AOAM531sVqEgjeiflnivOhWUkxagTx16QO4i+63R4YCZ/8ECg+mlR4sZ VGvoTkiqtv22+9RzqElKLtI+vWmvMVSER7B9JwbWC1XrDH7Egq1ugy5zfU5iLEGjpmBfXo1siHJ vUcmvfVGi9+9gA2w3bai5Rw== X-Received: by 2002:a05:6808:488:: with SMTP id z8mr3357386oid.135.1623169434975; Tue, 08 Jun 2021 09:23:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzL3V0dlSLYkqToSWjx9Po9II62z4yYLpcjOlV4KUq87+yWIQQ0CfaVL3XV3QpauOYsA+4Gjg== X-Received: by 2002:a05:6808:488:: with SMTP id z8mr3357367oid.135.1623169434800; Tue, 08 Jun 2021 09:23:54 -0700 (PDT) Received: from localhost.localdomain.com (075-142-250-213.res.spectrum.com. [75.142.250.213]) by smtp.gmail.com with ESMTPSA id s4sm3225773otr.80.2021.06.08.09.23.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 08 Jun 2021 09:23:54 -0700 (PDT) From: trix@redhat.com To: hao.wu@intel.com, mdf@kernel.org, corbet@lwn.net, michal.simek@xilinx.com, gregkh@linuxfoundation.org, dinguyen@kernel.org, krzysztof.kozlowski@canonical.com, nava.manne@xilinx.com, yilun.xu@intel.com, davidgow@google.com, fpacheco@redhat.com, richard.gong@intel.com, luca@lucaceresoli.net Cc: linux-fpga@vger.kernel.org, linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, Tom Rix Subject: [PATCH 0/7] fpga: reorganize to subdirs Date: Tue, 8 Jun 2021 09:23:32 -0700 Message-Id: <20210608162340.3010204-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-fpga@vger.kernel.org From: Tom Rix The incoming xrt patchset has a toplevel subdir xrt/ The current fpga/ uses a single dir with filename prefixes to subdivide owners For consistency, there should be only one way to organize the fpga/ dir. Because the subdir model scales better, refactor to use it. The discussion wrt xrt is here: https://lore.kernel.org/linux-fpga/68e85a4f-4a10-1ff9-0443-aa565878c855@redhat.com/ Follow drivers/net/ethernet/ which has control configs NET_VENDOR_BLA that map to drivers/net/ethernet/bla Since fpgas do not have many vendors, drop the 'VENDOR' and use FPGA_BLA. There are several new subdirs altera/ dfl/ lattice/ xilinx/ Each subdir has a Kconfig that has a new/reused if FPGA_BLA ... existing configs ... endif FPGA_BLA Which is sourced into the main fpga/Kconfig Each subdir has a Makefile whose transversal is controlled in the fpga/Makefile by obj-$(CONFIG_FPGA_BLA) += bla/ For many of the moved files, they had a prefix bla-* that matched their new subdir dir name bla/. Those filename are overspecified. So they were simplified by removing the 'bla-' prefix. If they were *.h files their guards were also changed. Some cleanup to arrange thing alphabetically and make fpga/Makefile's whitespace look more like net/'s Tom Rix (7): fpga: dfl: reorganize to subdir layout fpga: xilinx: reorganize to subdir layout fpga: altera: reorganize to subdir layout fpga: lattice: reorganize to subdir layout fpga: dfl: remove dfl- prefix on files fpga: xilinx: remove xilinx- prefix on files fpga: altera: remove altera- prefix on files Documentation/fpga/dfl.rst | 4 +- MAINTAINERS | 2 +- drivers/fpga/Kconfig | 204 +----------------- drivers/fpga/Makefile | 47 +--- drivers/fpga/altera/Kconfig | 79 +++++++ drivers/fpga/altera/Makefile | 12 ++ drivers/fpga/{altera-cvp.c => altera/cvp.c} | 0 .../fpga2sdram.c} | 0 .../freeze-bridge.c} | 0 .../{altera-hps2fpga.c => altera/hps2fpga.c} | 0 .../pr-ip-core-plat.c} | 0 .../pr-ip-core.c} | 0 .../fpga/{altera-ps-spi.c => altera/ps-spi.c} | 0 drivers/fpga/{ => altera}/socfpga-a10.c | 0 drivers/fpga/{ => altera}/socfpga.c | 0 drivers/fpga/{ => altera}/stratix10-soc.c | 0 drivers/fpga/{ => altera}/ts73xx-fpga.c | 0 drivers/fpga/dfl/Kconfig | 80 +++++++ drivers/fpga/dfl/Makefile | 17 ++ .../afu-dma-region.c} | 2 +- .../fpga/{dfl-afu-error.c => dfl/afu-error.c} | 2 +- .../fpga/{dfl-afu-main.c => dfl/afu-main.c} | 2 +- .../{dfl-afu-region.c => dfl/afu-region.c} | 2 +- drivers/fpga/{dfl-afu.h => dfl/afu.h} | 6 +- drivers/fpga/{ => dfl}/dfl.c | 0 drivers/fpga/{ => dfl}/dfl.h | 0 drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} | 2 +- .../fpga/{dfl-fme-error.c => dfl/fme-error.c} | 2 +- .../fpga/{dfl-fme-main.c => dfl/fme-main.c} | 2 +- drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} | 2 +- .../fpga/{dfl-fme-perf.c => dfl/fme-perf.c} | 2 +- drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} | 4 +- drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} | 6 +- .../{dfl-fme-region.c => dfl/fme-region.c} | 2 +- drivers/fpga/{dfl-fme.h => dfl/fme.h} | 6 +- .../{dfl-n3000-nios.c => dfl/n3000-nios.c} | 0 drivers/fpga/{dfl-pci.c => dfl/pci.c} | 0 drivers/fpga/lattice/Kconfig | 22 ++ drivers/fpga/lattice/Makefile | 4 + drivers/fpga/{ => lattice}/ice40-spi.c | 0 drivers/fpga/{ => lattice}/machxo2-spi.c | 0 drivers/fpga/xilinx/Kconfig | 48 +++++ drivers/fpga/xilinx/Makefile | 8 + .../pr-decoupler.c} | 0 drivers/fpga/{xilinx-spi.c => xilinx/spi.c} | 0 drivers/fpga/{ => xilinx}/zynq-fpga.c | 0 drivers/fpga/{ => xilinx}/zynqmp-fpga.c | 0 47 files changed, 306 insertions(+), 263 deletions(-) create mode 100644 drivers/fpga/altera/Kconfig create mode 100644 drivers/fpga/altera/Makefile rename drivers/fpga/{altera-cvp.c => altera/cvp.c} (100%) rename drivers/fpga/{altera-fpga2sdram.c => altera/fpga2sdram.c} (100%) rename drivers/fpga/{altera-freeze-bridge.c => altera/freeze-bridge.c} (100%) rename drivers/fpga/{altera-hps2fpga.c => altera/hps2fpga.c} (100%) rename drivers/fpga/{altera-pr-ip-core-plat.c => altera/pr-ip-core-plat.c} (100%) rename drivers/fpga/{altera-pr-ip-core.c => altera/pr-ip-core.c} (100%) rename drivers/fpga/{altera-ps-spi.c => altera/ps-spi.c} (100%) rename drivers/fpga/{ => altera}/socfpga-a10.c (100%) rename drivers/fpga/{ => altera}/socfpga.c (100%) rename drivers/fpga/{ => altera}/stratix10-soc.c (100%) rename drivers/fpga/{ => altera}/ts73xx-fpga.c (100%) create mode 100644 drivers/fpga/dfl/Kconfig create mode 100644 drivers/fpga/dfl/Makefile rename drivers/fpga/{dfl-afu-dma-region.c => dfl/afu-dma-region.c} (99%) rename drivers/fpga/{dfl-afu-error.c => dfl/afu-error.c} (99%) rename drivers/fpga/{dfl-afu-main.c => dfl/afu-main.c} (99%) rename drivers/fpga/{dfl-afu-region.c => dfl/afu-region.c} (99%) rename drivers/fpga/{dfl-afu.h => dfl/afu.h} (98%) rename drivers/fpga/{ => dfl}/dfl.c (100%) rename drivers/fpga/{ => dfl}/dfl.h (100%) rename drivers/fpga/{dfl-fme-br.c => dfl/fme-br.c} (99%) rename drivers/fpga/{dfl-fme-error.c => dfl/fme-error.c} (99%) rename drivers/fpga/{dfl-fme-main.c => dfl/fme-main.c} (99%) rename drivers/fpga/{dfl-fme-mgr.c => dfl/fme-mgr.c} (99%) rename drivers/fpga/{dfl-fme-perf.c => dfl/fme-perf.c} (99%) rename drivers/fpga/{dfl-fme-pr.c => dfl/fme-pr.c} (99%) rename drivers/fpga/{dfl-fme-pr.h => dfl/fme-pr.h} (96%) rename drivers/fpga/{dfl-fme-region.c => dfl/fme-region.c} (98%) rename drivers/fpga/{dfl-fme.h => dfl/fme.h} (95%) rename drivers/fpga/{dfl-n3000-nios.c => dfl/n3000-nios.c} (100%) rename drivers/fpga/{dfl-pci.c => dfl/pci.c} (100%) create mode 100644 drivers/fpga/lattice/Kconfig create mode 100644 drivers/fpga/lattice/Makefile rename drivers/fpga/{ => lattice}/ice40-spi.c (100%) rename drivers/fpga/{ => lattice}/machxo2-spi.c (100%) create mode 100644 drivers/fpga/xilinx/Kconfig create mode 100644 drivers/fpga/xilinx/Makefile rename drivers/fpga/{xilinx-pr-decoupler.c => xilinx/pr-decoupler.c} (100%) rename drivers/fpga/{xilinx-spi.c => xilinx/spi.c} (100%) rename drivers/fpga/{ => xilinx}/zynq-fpga.c (100%) rename drivers/fpga/{ => xilinx}/zynqmp-fpga.c (100%)