From: Geert Uytterhoeven <geert+renesas@glider.be>
To: Magnus Damm <magnus.damm@gmail.com>
Cc: linux-renesas-soc@vger.kernel.org,
linux-arm-kernel@lists.infradead.org,
Geert Uytterhoeven <geert+renesas@glider.be>
Subject: [PATCH] soc: renesas: Remove ARCH_R8A7795
Date: Tue, 18 Feb 2020 12:24:49 +0100 [thread overview]
Message-ID: <20200218112449.5723-1-geert+renesas@glider.be> (raw)
Replace the final user of CONFIG_ARCH_R8A7795 by CONFIG_ARCH_R8A77950 ||
CONFIG_ARCH_R8A77951, and remove the now unused CONFIG_ARCH_R8A7795
symbol definition.
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
To be queued in renesas-devel for v5.7.
---
drivers/soc/renesas/Kconfig | 16 ++++++++--------
drivers/soc/renesas/renesas-soc.c | 2 +-
2 files changed, 9 insertions(+), 9 deletions(-)
diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index de5cfe3fddd335d5..1982c7fb45fa2556 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -195,19 +195,19 @@ config ARCH_R8A774C0
This enables support for the Renesas RZ/G2E SoC.
config ARCH_R8A77950
- bool
+ bool "Renesas R-Car H3 ES1.x SoC Platform"
+ select ARCH_RCAR_GEN3
+ select SYSC_R8A7795
+ help
+ This enables support for the Renesas R-Car H3 SoC (revision 1.x).
config ARCH_R8A77951
- bool
-
-config ARCH_R8A7795
- bool "Renesas R-Car H3 SoC Platform"
- select ARCH_R8A77950
- select ARCH_R8A77951
+ bool "Renesas R-Car H3 ES2.0+ SoC Platform"
select ARCH_RCAR_GEN3
select SYSC_R8A7795
help
- This enables support for the Renesas R-Car H3 SoC.
+ This enables support for the Renesas R-Car H3 SoC (revisions 2.0 and
+ later).
config ARCH_R8A77960
bool "Renesas R-Car M3-W SoC Platform"
diff --git a/drivers/soc/renesas/renesas-soc.c b/drivers/soc/renesas/renesas-soc.c
index 850f5733dc880a2d..c43e910b869d1ccf 100644
--- a/drivers/soc/renesas/renesas-soc.c
+++ b/drivers/soc/renesas/renesas-soc.c
@@ -259,7 +259,7 @@ static const struct of_device_id renesas_socs[] __initconst = {
#ifdef CONFIG_ARCH_R8A7794
{ .compatible = "renesas,r8a7794", .data = &soc_rcar_e2 },
#endif
-#ifdef CONFIG_ARCH_R8A7795
+#if defined(CONFIG_ARCH_R8A77950) || defined(CONFIG_ARCH_R8A77951)
{ .compatible = "renesas,r8a7795", .data = &soc_rcar_h3 },
#endif
#ifdef CONFIG_ARCH_R8A77960
--
2.17.1
next prev reply other threads:[~2020-02-18 11:24 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-17 10:17 [PATCH] arm64: defconfig: Replace ARCH_R8A7796 by ARCH_R8A77960 Geert Uytterhoeven
2020-02-18 11:24 ` [PATCH] arm64: dts: renesas: Remove use of ARCH_R8A7795 Geert Uytterhoeven
2020-02-18 11:24 ` Geert Uytterhoeven [this message]
2020-02-19 15:39 ` [PATCH] ARM: dts: r8a7779: Remove deprecated "renesas,rcar-sata" compatible value Geert Uytterhoeven
2020-02-18 13:22 ` [PATCH] ARM: dts: r8a7745: Convert to new DU DT bindings Geert Uytterhoeven
2020-02-17 10:32 ` [PATCH] arm64: defconfig: Enable additional support for Renesas platforms Geert Uytterhoeven
2020-02-17 12:51 ` Niklas Söderlund
2020-02-21 14:20 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc
2020-02-18 20:04 ` [PATCH] ARM: dts: r8a7745: Convert to new DU DT bindings Niklas Söderlund
2020-02-21 13:22 ` Geert Uytterhoeven
2020-02-21 13:37 ` Geert Uytterhoeven
2020-02-19 15:48 ` Laurent Pinchart
2020-02-21 14:02 ` Kieran Bingham
2020-02-22 15:03 ` [PATCH] ARM: dts: r8a7779: Remove deprecated "renesas,rcar-sata" compatible value Niklas Söderlund
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=20200218112449.5723-1-geert+renesas@glider.be \
--to=geert+renesas@glider.be \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-renesas-soc@vger.kernel.org \
--cc=magnus.damm@gmail.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).