Message ID | 20210311152545.1317581-5-krzysztof.kozlowski@canonical.com (mailing list archive) |
---|---|
State | Queued, archived |
Headers | show
Return-Path: <linux-fpga-owner@kernel.org> 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.8 required=3.0 tests=BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 3D724C43603 for <linux-fpga@archiver.kernel.org>; Thu, 11 Mar 2021 15:27:02 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 15B4864FA6 for <linux-fpga@archiver.kernel.org>; Thu, 11 Mar 2021 15:27:02 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234111AbhCKP03 (ORCPT <rfc822;linux-fpga@archiver.kernel.org>); Thu, 11 Mar 2021 10:26:29 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:33871 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234136AbhCKPZ5 (ORCPT <rfc822;linux-fpga@vger.kernel.org>); Thu, 11 Mar 2021 10:25:57 -0500 Received: from mail-ej1-f72.google.com ([209.85.218.72]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from <krzysztof.kozlowski@canonical.com>) id 1lKNCG-0004ov-35 for linux-fpga@vger.kernel.org; Thu, 11 Mar 2021 15:25:56 +0000 Received: by mail-ej1-f72.google.com with SMTP id gv58so8800554ejc.6 for <linux-fpga@vger.kernel.org>; Thu, 11 Mar 2021 07:25:56 -0800 (PST) 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=seRfZbNnrbt83A3lqfbME46rdPLUXBuaJIJzFEroJqM=; b=Yh9TyrS5sZEf83S9e0gpA7vlG9R2TFOD0iqiDAd9BdNjqvzVaSsuDE+Il8bDiy9lka AkdZ2P0I1vVq4C17RiZONOCcvWqRvpLrHTRvaZtKUa+8tsUuDZvZPof9mmfJ8m+1alwc eVeNu/F20IsLRpIYMmhOqJcpkNN1tZSAf1XOCFMbv0SBYu4js5eoxWYY5nndUSno72FL dnYj1r6f8Kk//1gT98j5QcxvaKJfl00wDRsIXId5fCCdsX+TW/FCRcDaDEeydLg16H4E s0tB1p2VBIQiTV/vPx2kyHKU7FaHhOM+XXAJo3s6Fj7HjMO9weMck0FfjjSfrYMLWCrZ HGPA== X-Gm-Message-State: AOAM5327fslMUQd2Y8fVwmkMWQUC9hZNLyX44t/C+VFzSVGKSU84soFy cbmDjOKXnMBQafcs/gBJml3r/uEhMNuNpZ7RVhbhgMUZsyft3pgzXsLUooO9HLUsBaNdO4KtGJX I94GjuDrTKwP53EQdfk5sWGyMMN1TgqKXj2EZsk0= X-Received: by 2002:a17:906:2c44:: with SMTP id f4mr3504725ejh.508.1615476355784; Thu, 11 Mar 2021 07:25:55 -0800 (PST) X-Google-Smtp-Source: ABdhPJyyTATyAQcbeENIUwKOgFEFyZfkouzkosm1a5SyTcN6wlVTiKi+ARuyDQUI5aUuLLjUtpz6tg== X-Received: by 2002:a17:906:2c44:: with SMTP id f4mr3504683ejh.508.1615476355579; Thu, 11 Mar 2021 07:25:55 -0800 (PST) Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.gmail.com with ESMTPSA id v25sm1517826edr.18.2021.03.11.07.25.54 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 07:25:55 -0800 (PST) From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> List-Id: <soc.lore.kernel.org> To: Russell King <linux@armlinux.org.uk>, Arnd Bergmann <arnd@arndb.de>, Olof Johansson <olof@lixom.net>, soc@kernel.org, Rob Herring <robh+dt@kernel.org>, Dinh Nguyen <dinguyen@kernel.org>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will@kernel.org>, Michael Turquette <mturquette@baylibre.com>, Stephen Boyd <sboyd@kernel.org>, Vinod Koul <vkoul@kernel.org>, Borislav Petkov <bp@alien8.de>, Tony Luck <tony.luck@intel.com>, James Morse <james.morse@arm.com>, Robert Richter <rric@kernel.org>, Moritz Fischer <mdf@kernel.org>, Tom Rix <trix@redhat.com>, Lee Jones <lee.jones@linaro.org>, Giuseppe Cavallaro <peppe.cavallaro@st.com>, Alexandre Torgue <alexandre.torgue@st.com>, Jose Abreu <joabreu@synopsys.com>, "David S. Miller" <davem@davemloft.net>, Jakub Kicinski <kuba@kernel.org>, Philipp Zabel <p.zabel@pengutronix.de>, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-clk@vger.kernel.org, dmaengine@vger.kernel.org, linux-edac@vger.kernel.org, linux-fpga@vger.kernel.org, linux-i2c@vger.kernel.org, netdev@vger.kernel.org, linux-stm32@st-md-mailman.stormreply.com Cc: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> Subject: [PATCH v3 04/15] net: stmmac: merge ARCH_SOCFPGA and ARCH_STRATIX10 Date: Thu, 11 Mar 2021 16:25:34 +0100 Message-Id: <20210311152545.1317581-5-krzysztof.kozlowski@canonical.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210311152545.1317581-1-krzysztof.kozlowski@canonical.com> References: <20210311152545.1317581-1-krzysztof.kozlowski@canonical.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: <linux-fpga.vger.kernel.org> X-Mailing-List: linux-fpga@vger.kernel.org |
Series |
arm64 / clk: socfpga: simplifying, cleanups and compile testing
|
expand
|
diff --git a/drivers/net/ethernet/stmicro/stmmac/Kconfig b/drivers/net/ethernet/stmicro/stmmac/Kconfig index e675ba12fde2..7737e4d0bb9e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/Kconfig +++ b/drivers/net/ethernet/stmicro/stmmac/Kconfig @@ -140,8 +140,8 @@ config DWMAC_ROCKCHIP config DWMAC_SOCFPGA tristate "SOCFPGA dwmac support" - default (ARCH_SOCFPGA || ARCH_STRATIX10) - depends on OF && (ARCH_SOCFPGA || ARCH_STRATIX10 || COMPILE_TEST) + default ARCH_INTEL_SOCFPGA + depends on OF && (ARCH_INTEL_SOCFPGA || COMPILE_TEST) select MFD_SYSCON help Support for ethernet controller on Altera SOCFPGA
Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only one for both of them. This the common practice for other platforms. Additionally, the ARCH_SOCFPGA is too generic as SoCFPGA designs come from multiple vendors. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com> --- drivers/net/ethernet/stmicro/stmmac/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)