From mboxrd@z Thu Jan 1 00:00:00 1970 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.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 05431C4361B for ; Thu, 11 Mar 2021 15:28:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id D2FF464E59 for ; Thu, 11 Mar 2021 15:28:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234422AbhCKP2I (ORCPT ); Thu, 11 Mar 2021 10:28:08 -0500 Received: from youngberry.canonical.com ([91.189.89.112]:34277 "EHLO youngberry.canonical.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234358AbhCKP1o (ORCPT ); Thu, 11 Mar 2021 10:27:44 -0500 Received: from mail-ed1-f69.google.com ([209.85.208.69]) by youngberry.canonical.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1lKNDz-0005gL-HX for linux-edac@vger.kernel.org; Thu, 11 Mar 2021 15:27:43 +0000 Received: by mail-ed1-f69.google.com with SMTP id v27so10051621edx.1 for ; Thu, 11 Mar 2021 07:27:43 -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=RBN1O3Wcnz1uvA/bXXgFQO/02vpYiyGG/6WCSqIa6KY=; b=XmYUu+Kn8q3pk0p9ZVMg+Jq6MMQ68zH+A/0IDiyyONNSx/SmBR2yjDZj895j7QnoCF c1qv/2ojsDlOlB/aLKl6GX7xPUKqzmMZfLaqCuUBEN1dU2S+TsvARkRHi3ohhHrd4oZj W7OgzlIPKMe353eMHqrUgM2v0GdmL3+qirnI74tdLl6qnX4A0x5zDrTOZo+WTybCmPX2 n+zEhs46cukQegWqzJB5h7y+AkzpYrVkjoa40Eh3xkhbFUxiTEaoRgLA8nRiUoNrluAE XqzvoQTzCy3OdPBeR7hn2Ljsnx/jtFFJDbW2t/s0AzPt+FC9N7navoKVEXiFyUGZwWKV YfBg== X-Gm-Message-State: AOAM531yKOjMJu9DaFaLICvoUSqyhVwc8JXiHwlTTAWQC67eepngm7cp L8iuW892Z5FipedltBeifJoKPTtrVLBMzSDggocCs4wiziKY9FBOCwbqjC87lOADgZ6LRLMygqG Jwdbb4w+GD/tOtNAJng/MXYqqd7NiXAMVko9OEmg= X-Received: by 2002:a05:6402:510b:: with SMTP id m11mr9145604edd.103.1615476463285; Thu, 11 Mar 2021 07:27:43 -0800 (PST) X-Google-Smtp-Source: ABdhPJzftQgQhm6JCnX7NkcREdfHxQ79cH5j2A8F4fhogge3Hb8YjiFCimex/EvBlWPVnkSsMSMXPQ== X-Received: by 2002:a05:6402:510b:: with SMTP id m11mr9145573edd.103.1615476463167; Thu, 11 Mar 2021 07:27:43 -0800 (PST) Received: from localhost.localdomain (adsl-84-226-167-205.adslplus.ch. [84.226.167.205]) by smtp.gmail.com with ESMTPSA id k9sm1567062edn.68.2021.03.11.07.27.42 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 11 Mar 2021 07:27:42 -0800 (PST) From: Krzysztof Kozlowski List-Id: To: Russell King , Arnd Bergmann , Olof Johansson , soc@kernel.org, Rob Herring , Dinh Nguyen , Catalin Marinas , Will Deacon , Michael Turquette , Stephen Boyd , Vinod Koul , Borislav Petkov , Tony Luck , James Morse , Robert Richter , Moritz Fischer , Tom Rix , Lee Jones , Giuseppe Cavallaro , Alexandre Torgue , Jose Abreu , "David S. Miller" , Jakub Kicinski , Philipp Zabel , 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 Subject: [PATCH v3 14/15] reset: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs Date: Thu, 11 Mar 2021 16:27:41 +0100 Message-Id: <20210311152741.1318599-1-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: X-Mailing-List: linux-edac@vger.kernel.org ARCH_SOCFPGA is being renamed to ARCH_INTEL_SOCFPGA so adjust the 32-bit ARM drivers to rely on new symbol. Signed-off-by: Krzysztof Kozlowski --- drivers/reset/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/reset/Kconfig b/drivers/reset/Kconfig index b1e8efa16166..7043c7f6dcf0 100644 --- a/drivers/reset/Kconfig +++ b/drivers/reset/Kconfig @@ -205,8 +205,8 @@ config RESET_STM32MP157 This enables the RCC reset controller driver for STM32 MPUs. config RESET_SOCFPGA - bool "SoCFPGA Reset Driver" if COMPILE_TEST && !ARCH_SOCFPGA - default ARCH_SOCFPGA + bool "SoCFPGA Reset Driver" if COMPILE_TEST && (!ARM || !ARCH_INTEL_SOCFPGA) + default ARM && ARCH_INTEL_SOCFPGA select RESET_SIMPLE help This enables the reset driver for the SoCFPGA ARMv7 platforms. This -- 2.25.1