From: Paul Bolle <pebolle@tiscali.nl>
To: Jason Cooper <jason@lakedaemon.net>, Andrew Lunn <andrew@lunn.ch>,
Gregory CLEMENT <gregory.clement@free-electrons.com>,
Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>,
". Russell King - ARM Linux" <linux@arm.linux.org.uk>
Cc: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org
Subject: [PATCH v2] ARM: mvebu: rename ARM_ERRATA_753970
Date: Mon, 23 Jun 2014 11:01:44 +0200 [thread overview]
Message-ID: <1403514104.12982.20.camel@x220> (raw)
In-Reply-To: <20140620205340.GX32514@n2100.arm.linux.org.uk>
ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
PL310 errata workarounds"). Two selects were added in v3.15 that still
use the previous name. Rename these.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
v2: redone on top of next-21040623, and therefor on top of commit
a641f3a6abce ("ARM: l2c: fix dependencies on PL310 errata symbols").
Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if
CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be
(indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set.
Tested only with "make ARCH=arm menuconfig". So not compile tested! If
that's not acceptable please let me know. (I have no access to these
machines so runtime testing is not possible for me.)
Perhaps we want something similar for v3.15+ stable. But that would
require a different patch (v1 could probably be used for stable).
arch/arm/mach-mvebu/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 955d4a3afabd..8d4cf4fa118a 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -33,7 +33,7 @@ config MACH_ARMADA_370
config MACH_ARMADA_375
bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
select ARM_ERRATA_720789
- select ARM_ERRATA_753970
+ select PL310_ERRATA_753970
select ARM_GIC
select ARMADA_375_CLK
select HAVE_ARM_SCU
@@ -48,7 +48,7 @@ config MACH_ARMADA_375
config MACH_ARMADA_38X
bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
select ARM_ERRATA_720789
- select ARM_ERRATA_753970
+ select PL310_ERRATA_753970
select ARM_GIC
select ARMADA_38X_CLK
select HAVE_ARM_SCU
--
1.9.3
WARNING: multiple messages have this Message-ID (diff)
From: pebolle@tiscali.nl (Paul Bolle)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2] ARM: mvebu: rename ARM_ERRATA_753970
Date: Mon, 23 Jun 2014 11:01:44 +0200 [thread overview]
Message-ID: <1403514104.12982.20.camel@x220> (raw)
In-Reply-To: <20140620205340.GX32514@n2100.arm.linux.org.uk>
ARM_ERRATA_753970 was renamed to PL310_ERRATA_753970 in v3.2, through
commit fa0ce4035d48 ("ARM: 7162/1: errata: tidy up Kconfig options for
PL310 errata workarounds"). Two selects were added in v3.15 that still
use the previous name. Rename these.
Signed-off-by: Paul Bolle <pebolle@tiscali.nl>
---
v2: redone on top of next-21040623, and therefor on top of commit
a641f3a6abce ("ARM: l2c: fix dependencies on PL310 errata symbols").
Dropped the "if CACHE_PL310" fragments used in v1. No need to use "if
CACHE_L2X0" instead. Both CACHE_PL310 and CACHE_L2X0 will be
(indirectly) selected if MACH_ARMADA_375 or MACH_ARMADA_38X are set.
Tested only with "make ARCH=arm menuconfig". So not compile tested! If
that's not acceptable please let me know. (I have no access to these
machines so runtime testing is not possible for me.)
Perhaps we want something similar for v3.15+ stable. But that would
require a different patch (v1 could probably be used for stable).
arch/arm/mach-mvebu/Kconfig | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/arm/mach-mvebu/Kconfig b/arch/arm/mach-mvebu/Kconfig
index 955d4a3afabd..8d4cf4fa118a 100644
--- a/arch/arm/mach-mvebu/Kconfig
+++ b/arch/arm/mach-mvebu/Kconfig
@@ -33,7 +33,7 @@ config MACH_ARMADA_370
config MACH_ARMADA_375
bool "Marvell Armada 375 boards" if ARCH_MULTI_V7
select ARM_ERRATA_720789
- select ARM_ERRATA_753970
+ select PL310_ERRATA_753970
select ARM_GIC
select ARMADA_375_CLK
select HAVE_ARM_SCU
@@ -48,7 +48,7 @@ config MACH_ARMADA_375
config MACH_ARMADA_38X
bool "Marvell Armada 380/385 boards" if ARCH_MULTI_V7
select ARM_ERRATA_720789
- select ARM_ERRATA_753970
+ select PL310_ERRATA_753970
select ARM_GIC
select ARMADA_38X_CLK
select HAVE_ARM_SCU
--
1.9.3
next prev parent reply other threads:[~2014-06-23 9:01 UTC|newest]
Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-04-05 19:01 [GIT PULL 0/8] ARM: SoC: pending changes for 3.15 Arnd Bergmann
2014-04-05 19:02 ` [GIT PULL 1/8] ARM: SoC non-critical bug fixes " Arnd Bergmann
2014-04-05 19:02 ` Arnd Bergmann
2014-04-05 19:03 ` [GIT PULL 2/8] ARM: SoC: cleanups " Arnd Bergmann
2014-04-05 19:03 ` Arnd Bergmann
2014-04-05 19:04 ` [GIT PULL 3/8] ARM: SoC specific changes Arnd Bergmann
2014-04-05 19:04 ` Arnd Bergmann
2014-04-06 9:37 ` Kconfig ARM_ERRATA_753970? Paul Bolle
2014-04-06 17:02 ` Gregory CLEMENT
2014-04-06 17:02 ` Gregory CLEMENT
2014-04-06 17:28 ` Paul Bolle
2014-04-06 17:28 ` Paul Bolle
2014-05-26 9:01 ` [PATCH] ARM: mvebu: rename ARM_ERRATA_753970 Paul Bolle
2014-05-26 9:01 ` Paul Bolle
2014-06-20 20:21 ` Jason Cooper
2014-06-20 20:21 ` Jason Cooper
2014-06-20 20:42 ` Paul Bolle
2014-06-20 20:42 ` Paul Bolle
2014-06-20 21:10 ` Jason Cooper
2014-06-20 21:10 ` Jason Cooper
2014-06-23 7:58 ` Paul Bolle
2014-06-23 7:58 ` Paul Bolle
2014-06-20 20:53 ` Russell King - ARM Linux
2014-06-20 20:53 ` Russell King - ARM Linux
2014-06-23 9:01 ` Paul Bolle [this message]
2014-06-23 9:01 ` [PATCH v2] " Paul Bolle
2014-06-23 9:07 ` Russell King - ARM Linux
2014-06-23 9:07 ` Russell King - ARM Linux
2014-06-23 9:34 ` Paul Bolle
2014-06-23 9:34 ` Paul Bolle
2014-09-12 11:10 ` [PATCH v3] " Paul Bolle
2014-09-12 11:10 ` Paul Bolle
2014-09-12 13:31 ` Russell King - ARM Linux
2014-09-12 13:31 ` Russell King - ARM Linux
2014-11-05 9:11 ` Paul Bolle
2014-11-05 9:11 ` Paul Bolle
2014-04-05 19:04 ` [GIT PULL 4/8] ARM: SoC: board changes Arnd Bergmann
2014-04-05 19:04 ` Arnd Bergmann
2014-04-05 19:05 ` [GIT PULL 5/8] ARM: SoC: device tree changes Arnd Bergmann
2014-04-05 19:05 ` Arnd Bergmann
2014-04-05 19:06 ` [GIT PULL 6/8] ARM: SoC: driver changes Arnd Bergmann
2014-04-05 19:06 ` Arnd Bergmann
2014-04-05 19:06 ` [GIT PULL 7/8] ARM: SoC: sh " Arnd Bergmann
2014-04-05 19:06 ` Arnd Bergmann
2014-04-05 19:07 ` [GIT PULL 8/8] ARM: SoC: late cleanups Arnd Bergmann
2014-04-05 19:07 ` Arnd Bergmann
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=1403514104.12982.20.camel@x220 \
--to=pebolle@tiscali.nl \
--cc=andrew@lunn.ch \
--cc=gregory.clement@free-electrons.com \
--cc=jason@lakedaemon.net \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=sebastian.hesselbarth@gmail.com \
--cc=thomas.petazzoni@free-electrons.com \
/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.