From patchwork Wed Jun 9 13:21:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom Rix X-Patchwork-Id: 12310167 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=-12.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,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 8A6F5C48BCD for ; Wed, 9 Jun 2021 13:53:20 +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 6123161285 for ; Wed, 9 Jun 2021 13:53:20 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6123161285 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: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:In-Reply-To:References: List-Owner; bh=jmYPuQDFIhEfw+DihICB3M/ZUC4Nn30qO+zTaqgC/WU=; b=G/v907Gi8asjJE GwhoRSqX/tZIl/YVJ+1rZ+vyCSekNIVw7ZgqCH7dLZd+HLQQQDYgpW7fAlC+7OM74mHMiZuthMGPf vRyB3buxko/dQ6nNB5KoOXkSczjJcvHWJPZhvE6fPeImlTvhOgL/SkNdi/gFT+bORWsBMQyS/xkNI dbm4HhTfAIvsZ82q1KAhed1XUCJh9/nDTIpGthwL+RI6dQqE4SCMELkgSTAJBCARx0WXXnsFSF3Qr KrQHNX2vao42K3oTzz9ihCRegjzGhkRPuPvi7V9B0wG1ytjVqtwUTRwrIM8Htk2fr5EVgtOQR9TUt zBJ9V72n/K7AgDb7qx8w==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1lqybv-00E7R4-6S; Wed, 09 Jun 2021 13:51:12 +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 1lqyAZ-00DygE-Ik for linux-arm-kernel@lists.infradead.org; Wed, 09 Jun 2021 13:22:57 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1623244974; 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; bh=aDHyqkHT8tP5woeTV+rBNHR8on5450qVlxL0Zzlav/M=; b=QiRDwagebzw1ztjJ0bTnBNXzsI031v6KFVAThzi0pQ6tST3W4oR/Leg1CXK7qCC+ku3+aO +70S8YHXFWj0QuQYsE+luUDOdTHOACMwBN+vwTBi2+rYJNScxTpx+38txpGskEXNwmJU4b XPoP+Tg+YJNEVyCvXI50ZxG/fKv/TdI= 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-225-Vfl5ZTT6OgeIOsFG3JAo0g-1; Wed, 09 Jun 2021 09:22:53 -0400 X-MC-Unique: Vfl5ZTT6OgeIOsFG3JAo0g-1 Received: by mail-ot1-f72.google.com with SMTP id v16-20020a0568300910b029032e3cb976e3so16311561ott.14 for ; Wed, 09 Jun 2021 06:22:53 -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=Ja9GFQhNIZgpZBmbIatEpdkQ+P2SElGZ+bElhqhLJVEIzU7tWrwrD9HAe3z8tTUgkY qUsJpy8nQI8lMutGZJsAgRBD5Jijp4NPo76Xy5cG0zV5v6IqE7LvwjggfkKfO5Os28zQ bI2Y/G9qjMqwWb1Qis/zvH58aoOlpuv8HXk6G1NPABnxARe8aNnExvZyFpo2ndEggZyr 2tuolHfUEReMqI+/TlbhGk37nKMK07LviZrjE4q4REK2l31DUjARhIGafWyjPpHm55zI +W3PB1RWI2dTieF+2PTOHd9reIfzO/BkunsC5t/qXuKaPAroLcCJOEQKj/7uEUIUH4sX ZTVQ== X-Gm-Message-State: AOAM530i3Imeh9jmx1wejWUD1IV6yHtnpAeM9u4OV0IxoxgZ5oIIFhPL Ucstz7GU0hnRXmUlqQ9sdqMBlD2t6nkpzsXQ2xZwFfcvGDkD0Yk969po3YhXXJePIhVahhGQ7vm uTG8T4nf/LPTbTNXsJ4wn2HBnF2nggfYmtfI= X-Received: by 2002:aca:5f8b:: with SMTP id t133mr6219341oib.163.1623244972741; Wed, 09 Jun 2021 06:22:52 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyn5lanWywWdbV93OBtRDUPMoGU8oADrAe7cVkY1A5c8p/LtBg0gJ/mQGxaIqK7JjoP2FBKDw== X-Received: by 2002:aca:5f8b:: with SMTP id t133mr6219330oib.163.1623244972568; Wed, 09 Jun 2021 06:22:52 -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.22.51 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 09 Jun 2021 06:22:52 -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 0/7] fpga: reorganize to subdirs Date: Wed, 9 Jun 2021 06:21:43 -0700 Message-Id: <20210609132151.3081379-1-trix@redhat.com> X-Mailer: git-send-email 2.26.3 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_062255_843316_216C6B24 X-CRM114-Status: GOOD ( 10.15 ) 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 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%)