From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
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 15/15] ARM: socfpga: drop ARCH_SOCFPGA
Date: Thu, 11 Mar 2021 16:27:44 +0100 [thread overview]
Message-ID: <20210311152744.1318653-1-krzysztof.kozlowski@canonical.com> (raw)
In-Reply-To: <20210311152545.1317581-1-krzysztof.kozlowski@canonical.com>
Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
one for both of them. After conversion of all
drivers to use the new ARCH_INTEL_SOCFPGA, the remaining ARM option can
be removed.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/socfpga_defconfig | 2 +-
arch/arm/mach-socfpga/Kconfig | 8 ++------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 3823da605430..591b15164e3d 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -79,7 +79,7 @@ CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_RENESAS=y
-CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_PLAT_SPEAR=y
CONFIG_ARCH_SPEAR13XX=y
CONFIG_MACH_SPEAR1310=y
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 0c60eb382c80..2d9404ea52c6 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -9,7 +9,7 @@ CONFIG_NAMESPACES=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EMBEDDED=y
CONFIG_PROFILING=y
-CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_ARM_THUMBEE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index e43ed0ca6860..43ddec677c0b 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -1,8 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
-menuconfig ARCH_SOCFPGA
+menuconfig ARCH_INTEL_SOCFPGA
bool "Altera SOCFPGA family"
depends on ARCH_MULTI_V7
- select ARCH_INTEL_SOCFPGA
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
select ARM_GIC
@@ -20,10 +19,7 @@ menuconfig ARCH_SOCFPGA
select PL310_ERRATA_753970 if PL310
select PL310_ERRATA_769419
-if ARCH_SOCFPGA
-config ARCH_INTEL_SOCFPGA
- bool
-
+if ARCH_INTEL_SOCFPGA
config SOCFPGA_SUSPEND
bool "Suspend to RAM on SOCFPGA"
help
--
2.25.1
WARNING: multiple messages have this Message-ID (diff)
From: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
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 15/15] ARM: socfpga: drop ARCH_SOCFPGA
Date: Thu, 11 Mar 2021 16:27:44 +0100 [thread overview]
Message-ID: <20210311152744.1318653-1-krzysztof.kozlowski@canonical.com> (raw)
Message-ID: <20210311152744.Ko_Bd4AIBJODCc2LiH3652NQ90VPWoejRjrldDeumUg@z> (raw)
In-Reply-To: <20210311152545.1317581-1-krzysztof.kozlowski@canonical.com>
Simplify 32-bit and 64-bit Intel SoCFPGA Kconfig options by having only
one for both of them. After conversion of all
drivers to use the new ARCH_INTEL_SOCFPGA, the remaining ARM option can
be removed.
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@canonical.com>
---
arch/arm/configs/multi_v7_defconfig | 2 +-
arch/arm/configs/socfpga_defconfig | 2 +-
arch/arm/mach-socfpga/Kconfig | 8 ++------
3 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm/configs/multi_v7_defconfig b/arch/arm/configs/multi_v7_defconfig
index 3823da605430..591b15164e3d 100644
--- a/arch/arm/configs/multi_v7_defconfig
+++ b/arch/arm/configs/multi_v7_defconfig
@@ -79,7 +79,7 @@ CONFIG_ARCH_MSM8960=y
CONFIG_ARCH_MSM8974=y
CONFIG_ARCH_ROCKCHIP=y
CONFIG_ARCH_RENESAS=y
-CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_PLAT_SPEAR=y
CONFIG_ARCH_SPEAR13XX=y
CONFIG_MACH_SPEAR1310=y
diff --git a/arch/arm/configs/socfpga_defconfig b/arch/arm/configs/socfpga_defconfig
index 0c60eb382c80..2d9404ea52c6 100644
--- a/arch/arm/configs/socfpga_defconfig
+++ b/arch/arm/configs/socfpga_defconfig
@@ -9,7 +9,7 @@ CONFIG_NAMESPACES=y
CONFIG_BLK_DEV_INITRD=y
CONFIG_EMBEDDED=y
CONFIG_PROFILING=y
-CONFIG_ARCH_SOCFPGA=y
+CONFIG_ARCH_INTEL_SOCFPGA=y
CONFIG_ARM_THUMBEE=y
CONFIG_SMP=y
CONFIG_NR_CPUS=2
diff --git a/arch/arm/mach-socfpga/Kconfig b/arch/arm/mach-socfpga/Kconfig
index e43ed0ca6860..43ddec677c0b 100644
--- a/arch/arm/mach-socfpga/Kconfig
+++ b/arch/arm/mach-socfpga/Kconfig
@@ -1,8 +1,7 @@
# SPDX-License-Identifier: GPL-2.0-only
-menuconfig ARCH_SOCFPGA
+menuconfig ARCH_INTEL_SOCFPGA
bool "Altera SOCFPGA family"
depends on ARCH_MULTI_V7
- select ARCH_INTEL_SOCFPGA
select ARCH_SUPPORTS_BIG_ENDIAN
select ARM_AMBA
select ARM_GIC
@@ -20,10 +19,7 @@ menuconfig ARCH_SOCFPGA
select PL310_ERRATA_753970 if PL310
select PL310_ERRATA_769419
-if ARCH_SOCFPGA
-config ARCH_INTEL_SOCFPGA
- bool
-
+if ARCH_INTEL_SOCFPGA
config SOCFPGA_SUSPEND
bool "Suspend to RAM on SOCFPGA"
help
--
2.25.1
_______________________________________________
linux-arm-kernel mailing list
linux-arm-kernel@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
next prev parent reply other threads:[~2021-03-11 15:28 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-03-11 15:25 [PATCH v3 00/15] arm64 / clk: socfpga: simplifying, cleanups and compile testing Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-11 15:25 ` [PATCH v3 01/15] clk: socfpga: allow building N5X clocks with ARCH_N5X Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-12 12:47 ` Dinh Nguyen
2021-03-12 12:47 ` Dinh Nguyen
2021-04-01 1:32 ` Stephen Boyd
2021-04-06 18:17 ` Dinh Nguyen
2021-04-06 18:17 ` Dinh Nguyen
2021-03-11 15:25 ` [PATCH v3 02/15] ARM: socfpga: introduce common ARCH_INTEL_SOCFPGA Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-12 12:47 ` Dinh Nguyen
2021-03-12 12:47 ` Dinh Nguyen
2021-03-11 15:25 ` [PATCH v3 03/15] mfd: altera: merge ARCH_SOCFPGA and ARCH_STRATIX10 Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-22 15:10 ` Lee Jones
2021-03-22 15:10 ` Lee Jones
2021-03-11 15:25 ` [PATCH v3 04/15] net: stmmac: " Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-11 15:25 ` [PATCH v3 05/15] clk: socfpga: build together Stratix 10, Agilex and N5X clock drivers Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-12 12:47 ` Dinh Nguyen
2021-03-12 12:47 ` Dinh Nguyen
2021-04-01 1:33 ` Stephen Boyd
2021-03-11 15:25 ` [PATCH v3 06/15] clk: socfpga: merge ARCH_SOCFPGA and ARCH_STRATIX10 Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-12 12:47 ` Dinh Nguyen
2021-03-12 12:47 ` Dinh Nguyen
2021-04-01 1:33 ` Stephen Boyd
2021-03-11 15:25 ` [PATCH v3 07/15] EDAC: altera: " Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-03-11 15:25 ` [PATCH v3 08/15] arm64: socfpga: merge Agilex and N5X into ARCH_INTEL_SOCFPGA Krzysztof Kozlowski
2021-03-11 15:25 ` Krzysztof Kozlowski
2021-04-06 16:09 ` Guenter Roeck
2021-04-06 16:09 ` Guenter Roeck
2021-04-06 16:15 ` Krzysztof Kozlowski
2021-04-06 16:15 ` Krzysztof Kozlowski
2021-04-06 16:15 ` Krzysztof Kozlowski
2021-04-06 16:16 ` Dinh Nguyen
2021-04-06 16:16 ` Dinh Nguyen
2021-03-11 15:27 ` [PATCH v3 09/15] clk: socfpga: allow compile testing of Stratix 10 / Agilex clocks Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-12 12:48 ` Dinh Nguyen
2021-03-12 12:48 ` Dinh Nguyen
2021-04-01 1:34 ` Stephen Boyd
2021-03-11 15:27 ` [PATCH v3 10/15] clk: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs (and compile test) Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-11 19:03 ` kernel test robot
2021-03-11 19:06 ` Krzysztof Kozlowski
2021-03-12 12:48 ` Dinh Nguyen
2021-03-12 12:48 ` Dinh Nguyen
2021-04-01 1:34 ` Stephen Boyd
2021-03-11 15:27 ` [PATCH v3 11/15] dmaengine: socfpga: use ARCH_INTEL_SOCFPGA also for 32-bit ARM SoCs Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-14 11:52 ` Vinod Koul
2021-03-14 11:52 ` Vinod Koul
2021-03-11 15:27 ` [PATCH v3 12/15] fpga: altera: " Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-11 22:48 ` Moritz Fischer
2021-03-11 22:48 ` Moritz Fischer
2021-03-11 15:27 ` [PATCH v3 13/15] i2c: " Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-11 15:35 ` Wolfram Sang
2021-03-11 15:35 ` Wolfram Sang
2021-03-11 15:27 ` [PATCH v3 14/15] reset: socfpga: " Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski
2021-03-11 15:27 ` Krzysztof Kozlowski [this message]
2021-03-11 15:27 ` [PATCH v3 15/15] ARM: socfpga: drop ARCH_SOCFPGA Krzysztof Kozlowski
2021-03-12 12:48 ` Dinh Nguyen
2021-03-12 12:48 ` Dinh Nguyen
2021-03-11 18:26 ` [PATCH v3 00/15] arm64 / clk: socfpga: simplifying, cleanups and compile testing Tom Rix
2021-03-11 18:26 ` Tom Rix
2021-03-11 18:47 ` Krzysztof Kozlowski
2021-03-11 18:47 ` Krzysztof Kozlowski
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210311152744.1318653-1-krzysztof.kozlowski@canonical.com \
--to=krzysztof.kozlowski@canonical.com \
--cc=alexandre.torgue@st.com \
--cc=arnd@arndb.de \
--cc=bp@alien8.de \
--cc=catalin.marinas@arm.com \
--cc=davem@davemloft.net \
--cc=devicetree@vger.kernel.org \
--cc=dinguyen@kernel.org \
--cc=dmaengine@vger.kernel.org \
--cc=james.morse@arm.com \
--cc=joabreu@synopsys.com \
--cc=kuba@kernel.org \
--cc=lee.jones@linaro.org \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-clk@vger.kernel.org \
--cc=linux-edac@vger.kernel.org \
--cc=linux-fpga@vger.kernel.org \
--cc=linux-i2c@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-stm32@st-md-mailman.stormreply.com \
--cc=linux@armlinux.org.uk \
--cc=mdf@kernel.org \
--cc=mturquette@baylibre.com \
--cc=netdev@vger.kernel.org \
--cc=olof@lixom.net \
--cc=p.zabel@pengutronix.de \
--cc=peppe.cavallaro@st.com \
--cc=robh+dt@kernel.org \
--cc=rric@kernel.org \
--cc=sboyd@kernel.org \
--cc=soc@kernel.org \
--cc=tony.luck@intel.com \
--cc=trix@redhat.com \
--cc=vkoul@kernel.org \
--cc=will@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.