Linux-Renesas-SoC Archive on lore.kernel.org
 help / color / Atom feed
* [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support
@ 2019-12-17 18:38 Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 1/5] arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* Geert Uytterhoeven
                   ` (6 more replies)
  0 siblings, 7 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

	Hi all,

Despite using the same compatible values ("r8a7795"-based) because of
historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
(R8A77951) are really different SoCs, with different part numbers.

Hence this patch series splits the config symbols for R-Car H3, and
renames the related DTS files, to maintain a clear separation between
early (ES1.x) and later (ES2.0+) SoC revisions.  This will pave the way
for configuring out support for early SoC revisions, which can reduce
kernel size, especially in the pin control subsystem.
This is similar to the recent split of R8A7796 symbols for R-Car M3-W
(R8A77960) and M3-W+ (R8A77961)[1], and the related DTS file renames[2],
but different due to the sharing of compatible values between R-Car H3
ES1.x and H3 ES2.0+.

This series also includes the rename/cleanup of the ULCB DTS file names,
as suggested by Eugeniu Rosca.  As DTS files are already being renamed
for v5.6[2], it makes sense to combine them with other renames, to avoid
inconveniencing the user with multiple renames in multiple kernel
versions.

The pin control part will be handled in a separate patch.

For your convenience, all of this is available in the
topic/r8a7795-rename-v1 branch of my renesas-drivers git repository at
git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.

Thanks for your comments!

References:
  [1] "[PATCH v2 00/11] arm64: renesas: Add r8a77961 support"
      https://lore.kernel.org/linux-renesas-soc/20191023123342.13100-1-geert+renesas@glider.be/
  [2] "[PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960*"
      https://lore.kernel.org/linux-renesas-soc/20191211131311.23661-1-geert+renesas@glider.be/

Geert Uytterhoeven (5):
  arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]*
  arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file
    names
  arm64: dts: renesas: Sort DTBs in Makefile
  arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into
    ARCH_R8A7795[01]
  soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3

 arch/arm64/boot/dts/renesas/Makefile          | 21 ++++++++++---------
 ...salvator-x.dts => r8a77950-salvator-x.dts} |  4 ++--
 ...795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} |  4 ++--
 ...a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} |  4 ++--
 .../{r8a7795-es1.dtsi => r8a77950.dtsi}       |  4 ++--
 ...salvator-x.dts => r8a77951-salvator-x.dts} |  4 ++--
 ...lvator-xs.dts => r8a77951-salvator-xs.dts} |  8 +++----
 ...es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} |  4 ++--
 .../{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} |  4 ++--
 .../renesas/{r8a7795.dtsi => r8a77951.dtsi}   |  2 +-
 ...960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} |  2 +-
 ...{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts} |  0
 ...65-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} |  2 +-
 ...r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} |  0
 drivers/soc/renesas/Kconfig                   |  8 +++++++
 15 files changed, 40 insertions(+), 31 deletions(-)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} (75%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} (89%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} (98%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} (75%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} (99%)
 rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts} (100%)
 rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} (100%)

-- 
2.17.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 1/5] arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]*
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
@ 2019-12-17 18:38 ` Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 2/5] arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file names Geert Uytterhoeven
                   ` (5 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

Despite using the same compatible values ("r8a7795"-based) because of
historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
(R8A77951) are really different SoCs, with different part numbers.

Reflect this in the DTS files by changing their base names from
"r8a7795-es1" and "r8a7795" to "r8a77950" resp. "r8a77951".
Drop all "ES" references next to part numbers, as they are implied by
the part numbers, and thus redundant.

Note that DT binding headers, definitions, and compatible values are
not renamed, to preserve backward compatibility.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile                   | 10 +++++-----
 .../{r8a7795-h3ulcb-kf.dts => r8a77950-h3ulcb-kf.dts}  |  4 ++--
 .../{r8a7795-es1-h3ulcb.dts => r8a77950-h3ulcb.dts}    |  4 ++--
 ...7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} |  4 ++--
 .../dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi}    |  4 ++--
 ...8a7795-es1-h3ulcb-kf.dts => r8a77951-h3ulcb-kf.dts} |  4 ++--
 .../{r8a7795-h3ulcb.dts => r8a77951-h3ulcb.dts}        |  4 ++--
 ...{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} |  4 ++--
 ...8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} |  8 ++++----
 .../boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi}   |  2 +-
 10 files changed, 24 insertions(+), 24 deletions(-)
 rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a77950-h3ulcb-kf.dts} (75%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a77950-h3ulcb.dts} (89%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} (98%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a77951-h3ulcb-kf.dts} (75%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a77951-h3ulcb.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} (96%)
 rename arch/arm64/boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} (99%)

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index d4cc3323d0668dba..12c2382c0a5427e2 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -4,11 +4,11 @@ dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-x.dtb r8a7795-h3ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-h3ulcb-kf.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-salvator-xs.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-salvator-x.dtb r8a7795-es1-h3ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a7795-es1-h3ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-h3ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-h3ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb r8a77950-h3ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-h3ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-m3ulcb.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-m3ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts
similarity index 75%
rename from arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts
index 80791ed27539bf8f..1e84a40f1dcab353 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts
@@ -6,11 +6,11 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
-#include "r8a7795-h3ulcb.dts"
+#include "r8a77950-h3ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
-	model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES2.0+";
+	model = "Renesas H3ULCB Kingfisher board based on r8a77950";
 	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",
 		     "renesas,r8a7795";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts
similarity index 89%
rename from arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts
index 598b98168559e0e4..38a6d6a108d488ed 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts
@@ -7,11 +7,11 @@
  */
 
 /dts-v1/;
-#include "r8a7795-es1.dtsi"
+#include "r8a77950.dtsi"
 #include "ulcb.dtsi"
 
 / {
-	model = "Renesas H3ULCB board based on r8a7795 ES1.x";
+	model = "Renesas H3ULCB board based on r8a77950";
 	compatible = "renesas,h3ulcb", "renesas,r8a7795";
 
 	memory@48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts
similarity index 96%
rename from arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
rename to arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts
index c72968623e94b790..2438825c9b22e26d 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77950-salvator-x.dts
@@ -6,11 +6,11 @@
  */
 
 /dts-v1/;
-#include "r8a7795-es1.dtsi"
+#include "r8a77950.dtsi"
 #include "salvator-x.dtsi"
 
 / {
-	model = "Renesas Salvator-X board based on r8a7795 ES1.x";
+	model = "Renesas Salvator-X board based on r8a77950";
 	compatible = "renesas,salvator-x", "renesas,r8a7795";
 
 	memory@48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi b/arch/arm64/boot/dts/renesas/r8a77950.dtsi
similarity index 98%
rename from arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
rename to arch/arm64/boot/dts/renesas/r8a77950.dtsi
index 14d8513d2a47336f..15216495e1c8b31c 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77950.dtsi
@@ -1,11 +1,11 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the R-Car H3 (R8A77950) ES1.x SoC
+ * Device Tree Source for the R-Car H3 (R8A77950) SoC
  *
  * Copyright (C) 2015 Renesas Electronics Corp.
  */
 
-#include "r8a7795.dtsi"
+#include "r8a77951.dtsi"
 
 &audma0 {
 	iommus = <&ipmmu_mp1 0>, <&ipmmu_mp1 1>,
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts
similarity index 75%
rename from arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts
index 2f24dfc45617baf6..647198bb3bf7746a 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-es1-h3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts
@@ -6,11 +6,11 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
-#include "r8a7795-es1-h3ulcb.dts"
+#include "r8a77951-h3ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
-	model = "Renesas H3ULCB Kingfisher board based on r8a7795 ES1.x";
+	model = "Renesas H3ULCB Kingfisher board based on r8a77951";
 	compatible = "shimafuji,kingfisher", "renesas,h3ulcb",
 		     "renesas,r8a7795";
 };
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts
similarity index 92%
rename from arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts
index 54515eaf0310f172..8ad8f2a539771de8 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-h3ulcb.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts
@@ -7,11 +7,11 @@
  */
 
 /dts-v1/;
-#include "r8a7795.dtsi"
+#include "r8a77951.dtsi"
 #include "ulcb.dtsi"
 
 / {
-	model = "Renesas H3ULCB board based on r8a7795 ES2.0+";
+	model = "Renesas H3ULCB board based on r8a77951";
 	compatible = "renesas,h3ulcb", "renesas,r8a7795";
 
 	memory@48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
similarity index 96%
rename from arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
index 72874f675359e7a4..a402a2fb6e3c313b 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-x.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77951-salvator-x.dts
@@ -6,11 +6,11 @@
  */
 
 /dts-v1/;
-#include "r8a7795.dtsi"
+#include "r8a77951.dtsi"
 #include "salvator-x.dtsi"
 
 / {
-	model = "Renesas Salvator-X board based on r8a7795 ES2.0+";
+	model = "Renesas Salvator-X board based on r8a77951";
 	compatible = "renesas,salvator-x", "renesas,r8a7795";
 
 	memory@48000000 {
diff --git a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
similarity index 96%
rename from arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
index 36667c81d43d517b..cef9da4376a3f673 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795-salvator-xs.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77951-salvator-xs.dts
@@ -1,16 +1,16 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the Salvator-X 2nd version board with R-Car H3 ES2.0
+ * Device Tree Source for the Salvator-X 2nd version board with R-Car H3 ES2.0+
  *
  * Copyright (C) 2015-2017 Renesas Electronics Corp.
  */
 
 /dts-v1/;
-#include "r8a7795.dtsi"
+#include "r8a77951.dtsi"
 #include "salvator-xs.dtsi"
 
 / {
-	model = "Renesas Salvator-X 2nd version board based on r8a7795 ES2.0+";
+	model = "Renesas Salvator-X 2nd version board based on r8a77951";
 	compatible = "renesas,salvator-xs", "renesas,r8a7795";
 
 	memory@48000000 {
@@ -136,7 +136,7 @@
 	 * - On Salvator-X[S], GP6_3[01] are connected to ADV7482 as irq pins
 	 *   (when SW31 is the default setting on Salvator-XS).
 	 * - If SW31 is the default setting, you cannot use USB2.0 ch3 on
-	 *   r8a7795 with Salvator-XS.
+	 *   r8a77951 with Salvator-XS.
 	 *   Hence the SW31 setting must be changed like 2) below.
 	 *   1) Default setting of SW31: ON-ON-OFF-OFF-OFF-OFF:
 	 *	- Connect GP6_3[01] to ADV7842.
diff --git a/arch/arm64/boot/dts/renesas/r8a7795.dtsi b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
similarity index 99%
rename from arch/arm64/boot/dts/renesas/r8a7795.dtsi
rename to arch/arm64/boot/dts/renesas/r8a77951.dtsi
index fde6ec122d3b4006..821891548d5fde0f 100644
--- a/arch/arm64/boot/dts/renesas/r8a7795.dtsi
+++ b/arch/arm64/boot/dts/renesas/r8a77951.dtsi
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0
 /*
- * Device Tree Source for the R-Car H3 (R8A77950) SoC
+ * Device Tree Source for the R-Car H3 (R8A77951) SoC
  *
  * Copyright (C) 2015 Renesas Electronics Corp.
  */
-- 
2.17.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 2/5] arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file names
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 1/5] arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* Geert Uytterhoeven
@ 2019-12-17 18:38 ` Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 3/5] arm64: dts: renesas: Sort DTBs in Makefile Geert Uytterhoeven
                   ` (4 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

Unlike the V3MSK and V3HSK boards, the various "ULCB" boards are really
the same boards, with different SiPs fitted, just like the Salvator-X(S)
boards.  Furthermore, the "H3", "M3", and "M3N" prefixes of the "ULCB"
parts in the DTS file names are redundant, as they are implied by the
SoC part numbers, which are also part of the file names.

Hence drop the redundant prefixes, to make the DTS file names consistent
with the file names for the various "Salvator-X(S)" boards.

Suggested-by: Eugeniu Rosca <erosca@de.adit-jv.com>
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile             | 16 ++++++++--------
 ...a77950-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} |  2 +-
 .../{r8a77950-h3ulcb.dts => r8a77950-ulcb.dts}   |  0
 ...a77951-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} |  2 +-
 .../{r8a77951-h3ulcb.dts => r8a77951-ulcb.dts}   |  0
 ...a77960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} |  2 +-
 .../{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts}   |  0
 ...77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} |  2 +-
 .../{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts}  |  0
 9 files changed, 12 insertions(+), 12 deletions(-)
 rename arch/arm64/boot/dts/renesas/{r8a77950-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77950-h3ulcb.dts => r8a77950-ulcb.dts} (100%)
 rename arch/arm64/boot/dts/renesas/{r8a77951-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77951-h3ulcb.dts => r8a77951-ulcb.dts} (100%)
 rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts} (100%)
 rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} (92%)
 rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} (100%)

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 12c2382c0a5427e2..f7ed7b5a41ea3c77 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -4,18 +4,18 @@ dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-h3ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-h3ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-xs.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb r8a77950-h3ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-h3ulcb-kf.dtb
-dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-m3ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-m3ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb r8a77950-ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
-dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb.dtb
-dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-m3nulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb
+dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
 dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb
 dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb
diff --git a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts
similarity index 92%
rename from arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts
index 1e84a40f1dcab353..dcaaf12cec40dab4 100644
--- a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77950-ulcb-kf.dts
@@ -6,7 +6,7 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
-#include "r8a77950-h3ulcb.dts"
+#include "r8a77950-ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts
similarity index 100%
rename from arch/arm64/boot/dts/renesas/r8a77950-h3ulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77950-ulcb.dts
diff --git a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts
similarity index 92%
rename from arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts
index 647198bb3bf7746a..11f943a67703f0a8 100644
--- a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77951-ulcb-kf.dts
@@ -6,7 +6,7 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
-#include "r8a77951-h3ulcb.dts"
+#include "r8a77951-ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts
similarity index 100%
rename from arch/arm64/boot/dts/renesas/r8a77951-h3ulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77951-ulcb.dts
diff --git a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts
similarity index 92%
rename from arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts
index 611dd2d4fae98d29..2151c37d77a6c942 100644
--- a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77960-ulcb-kf.dts
@@ -6,7 +6,7 @@
  * Copyright (C) 2017 Cogent Embedded, Inc.
  */
 
-#include "r8a77960-m3ulcb.dts"
+#include "r8a77960-ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
similarity index 100%
rename from arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77960-ulcb.dts
diff --git a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts
similarity index 92%
rename from arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts
rename to arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts
index dadad97051b99f8c..12aa08fd6fd87f7e 100644
--- a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb-kf.dts
+++ b/arch/arm64/boot/dts/renesas/r8a77965-ulcb-kf.dts
@@ -6,7 +6,7 @@
  * Copyright (C) 2018 Cogent Embedded, Inc.
  */
 
-#include "r8a77965-m3nulcb.dts"
+#include "r8a77965-ulcb.dts"
 #include "ulcb-kf.dtsi"
 
 / {
diff --git a/arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts b/arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts
similarity index 100%
rename from arch/arm64/boot/dts/renesas/r8a77965-m3nulcb.dts
rename to arch/arm64/boot/dts/renesas/r8a77965-ulcb.dts
-- 
2.17.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 3/5] arm64: dts: renesas: Sort DTBs in Makefile
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 1/5] arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 2/5] arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file names Geert Uytterhoeven
@ 2019-12-17 18:38 ` Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 4/5] arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into ARCH_R8A7795[01] Geert Uytterhoeven
                   ` (3 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

Sort the entries for the various DTBs in the Makefile by SoC and board
type.  Keep Salvator-X(S) together, and do the same for ULCB with and
without Kingfisher extension.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index f7ed7b5a41ea3c77..7ac6f18c996a0961 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -4,18 +4,15 @@ dtb-$(CONFIG_ARCH_R8A774A1) += r8a774a1-hihope-rzg2m-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n.dtb
 dtb-$(CONFIG_ARCH_R8A774B1) += r8a774b1-hihope-rzg2n-ex.dtb
 dtb-$(CONFIG_ARCH_R8A774C0) += r8a774c0-cat874.dtb r8a774c0-ek874.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb-kf.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-xs.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb r8a77950-ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb-kf.dtb
-dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb-kf.dtb
-dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-salvator-x.dtb r8a77965-salvator-xs.dtb
-dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb
-dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77965) += r8a77965-ulcb.dtb r8a77965-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77970) += r8a77970-eagle.dtb r8a77970-v3msk.dtb
 dtb-$(CONFIG_ARCH_R8A77980) += r8a77980-condor.dtb r8a77980-v3hsk.dtb
 dtb-$(CONFIG_ARCH_R8A77990) += r8a77990-ebisu.dtb
-- 
2.17.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 4/5] arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into ARCH_R8A7795[01]
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
                   ` (2 preceding siblings ...)
  2019-12-17 18:38 ` [PATCH 3/5] arm64: dts: renesas: Sort DTBs in Makefile Geert Uytterhoeven
@ 2019-12-17 18:38 ` Geert Uytterhoeven
  2019-12-17 18:38 ` [PATCH 5/5] soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3 Geert Uytterhoeven
                   ` (2 subsequent siblings)
  6 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

As R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+ (R8A77951) are really
different SoCs, CONFIG_ARCH_R8A7795 will be split in
CONFIG_ARCH_R8A77950 and CONFIG_ARCH_R8A77951.

Relax dependencies by handling both the old and the new symbols.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm64/boot/dts/renesas/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile
index 7ac6f18c996a0961..b663176d153493f9 100644
--- a/arch/arm64/boot/dts/renesas/Makefile
+++ b/arch/arm64/boot/dts/renesas/Makefile
@@ -8,6 +8,10 @@ dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-salvator-x.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A7795) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-salvator-x.dtb
+dtb-$(CONFIG_ARCH_R8A77950) += r8a77950-ulcb.dtb r8a77950-ulcb-kf.dtb
+dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-salvator-x.dtb r8a77951-salvator-xs.dtb
+dtb-$(CONFIG_ARCH_R8A77951) += r8a77951-ulcb.dtb r8a77951-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-salvator-x.dtb r8a77960-salvator-xs.dtb
 dtb-$(CONFIG_ARCH_R8A77960) += r8a77960-ulcb.dtb r8a77960-ulcb-kf.dtb
 dtb-$(CONFIG_ARCH_R8A77961) += r8a77961-salvator-xs.dtb
-- 
2.17.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* [PATCH 5/5] soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
                   ` (3 preceding siblings ...)
  2019-12-17 18:38 ` [PATCH 4/5] arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into ARCH_R8A7795[01] Geert Uytterhoeven
@ 2019-12-17 18:38 ` Geert Uytterhoeven
  2019-12-25  9:33 ` [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Yoshihiro Shimoda
  2020-01-07 23:26 ` Niklas Söderlund
  6 siblings, 0 replies; 8+ messages in thread
From: Geert Uytterhoeven @ 2019-12-17 18:38 UTC (permalink / raw)
  To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree, Geert Uytterhoeven

Despite using the same compatible values ("r8a7795"-based) because of
historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
(R8A77951) are really different SoCs, with different part numbers.

Reflect this in the SoC configuration, by adding CONFIG_ARCH_R8A77950
and CONFIG_ARCH_R8A77951 as new config symbols.  These are intended to
replace CONFIG_ARCH_R8A7795, and will allow making support for early SoC
revisions optional.

Note that for now, CONFIG_ARCH_R8A7795 is retained, and just selects
CONFIG_ARCH_R8A77950 and CONFIG_ARCH_R8A77951.  This relaxes
dependencies of other subsystems on the SoC configuration symbol, and
provides a smooth transition path for config files through "make
oldconfig".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 drivers/soc/renesas/Kconfig | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig
index 2d10e34cdbe4d117..ba2b8b51d2d986f1 100644
--- a/drivers/soc/renesas/Kconfig
+++ b/drivers/soc/renesas/Kconfig
@@ -192,8 +192,16 @@ config ARCH_R8A774C0
 	help
 	  This enables support for the Renesas RZ/G2E SoC.
 
+config ARCH_R8A77950
+	bool
+
+config ARCH_R8A77951
+	bool
+
 config ARCH_R8A7795
 	bool "Renesas R-Car H3 SoC Platform"
+	select ARCH_R8A77950
+	select ARCH_R8A77951
 	select ARCH_RCAR_GEN3
 	select SYSC_R8A7795
 	help
-- 
2.17.1


^ permalink raw reply	[flat|nested] 8+ messages in thread

* RE: [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
                   ` (4 preceding siblings ...)
  2019-12-17 18:38 ` [PATCH 5/5] soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3 Geert Uytterhoeven
@ 2019-12-25  9:33 ` Yoshihiro Shimoda
  2020-01-07 23:26 ` Niklas Söderlund
  6 siblings, 0 replies; 8+ messages in thread
From: Yoshihiro Shimoda @ 2019-12-25  9:33 UTC (permalink / raw)
  To: Geert Uytterhoeven, Magnus Damm, Kuninori Morimoto,
	Laurent Pinchart, Wolfram Sang, REE erosca@DE.ADIT-JV.COM
  Cc: linux-renesas-soc, linux-arm-kernel, devicetree

Hi Geert-san,

> From: Geert Uytterhoeven, Sent: Wednesday, December 18, 2019 3:39 AM
> 
> 	Hi all,
> 
> Despite using the same compatible values ("r8a7795"-based) because of
> historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
> (R8A77951) are really different SoCs, with different part numbers.
> 
> Hence this patch series splits the config symbols for R-Car H3, and
> renames the related DTS files, to maintain a clear separation between
> early (ES1.x) and later (ES2.0+) SoC revisions.  This will pave the way
> for configuring out support for early SoC revisions, which can reduce
> kernel size, especially in the pin control subsystem.
> This is similar to the recent split of R8A7796 symbols for R-Car M3-W
> (R8A77960) and M3-W+ (R8A77961)[1], and the related DTS file renames[2],
> but different due to the sharing of compatible values between R-Car H3
> ES1.x and H3 ES2.0+.
> 
> This series also includes the rename/cleanup of the ULCB DTS file names,
> as suggested by Eugeniu Rosca.  As DTS files are already being renamed
> for v5.6[2], it makes sense to combine them with other renames, to avoid
> inconveniencing the user with multiple renames in multiple kernel
> versions.
> 
> The pin control part will be handled in a separate patch.
> 
> For your convenience, all of this is available in the
> topic/r8a7795-rename-v1 branch of my renesas-drivers git repository at
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> 
> Thanks for your comments!

Thank you for the patches!

Reviewed-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Also I tested on both R-Car H3 ES1.1 Salvator-X and R-Car H3 ES3.0 Salvator-XS,
and the kernel can boot on these boards. So,

Tested-by: Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>

Best regards,
Yoshihiro Shimoda


^ permalink raw reply	[flat|nested] 8+ messages in thread

* Re: [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support
  2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
                   ` (5 preceding siblings ...)
  2019-12-25  9:33 ` [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Yoshihiro Shimoda
@ 2020-01-07 23:26 ` Niklas Söderlund
  6 siblings, 0 replies; 8+ messages in thread
From: Niklas Söderlund @ 2020-01-07 23:26 UTC (permalink / raw)
  To: Geert Uytterhoeven
  Cc: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda,
	Laurent Pinchart, Wolfram Sang, Eugeniu Rosca, linux-renesas-soc,
	linux-arm-kernel, devicetree

Hi Geert,

Nice cleanup of the otherwise sometimes confusing names :-)

For the whole series,

Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se>

On 2019-12-17 19:38:36 +0100, Geert Uytterhoeven wrote:
> 	Hi all,
> 
> Despite using the same compatible values ("r8a7795"-based) because of
> historical reasons, R-Car H3 ES1.x (R8A77950) and R-Car H3 ES2.0+
> (R8A77951) are really different SoCs, with different part numbers.
> 
> Hence this patch series splits the config symbols for R-Car H3, and
> renames the related DTS files, to maintain a clear separation between
> early (ES1.x) and later (ES2.0+) SoC revisions.  This will pave the way
> for configuring out support for early SoC revisions, which can reduce
> kernel size, especially in the pin control subsystem.
> This is similar to the recent split of R8A7796 symbols for R-Car M3-W
> (R8A77960) and M3-W+ (R8A77961)[1], and the related DTS file renames[2],
> but different due to the sharing of compatible values between R-Car H3
> ES1.x and H3 ES2.0+.
> 
> This series also includes the rename/cleanup of the ULCB DTS file names,
> as suggested by Eugeniu Rosca.  As DTS files are already being renamed
> for v5.6[2], it makes sense to combine them with other renames, to avoid
> inconveniencing the user with multiple renames in multiple kernel
> versions.
> 
> The pin control part will be handled in a separate patch.
> 
> For your convenience, all of this is available in the
> topic/r8a7795-rename-v1 branch of my renesas-drivers git repository at
> git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git.
> 
> Thanks for your comments!
> 
> References:
>   [1] "[PATCH v2 00/11] arm64: renesas: Add r8a77961 support"
>       https://lore.kernel.org/linux-renesas-soc/20191023123342.13100-1-geert+renesas@glider.be/
>   [2] "[PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960*"
>       https://lore.kernel.org/linux-renesas-soc/20191211131311.23661-1-geert+renesas@glider.be/
> 
> Geert Uytterhoeven (5):
>   arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]*
>   arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file
>     names
>   arm64: dts: renesas: Sort DTBs in Makefile
>   arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into
>     ARCH_R8A7795[01]
>   soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3
> 
>  arch/arm64/boot/dts/renesas/Makefile          | 21 ++++++++++---------
>  ...salvator-x.dts => r8a77950-salvator-x.dts} |  4 ++--
>  ...795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} |  4 ++--
>  ...a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} |  4 ++--
>  .../{r8a7795-es1.dtsi => r8a77950.dtsi}       |  4 ++--
>  ...salvator-x.dts => r8a77951-salvator-x.dts} |  4 ++--
>  ...lvator-xs.dts => r8a77951-salvator-xs.dts} |  8 +++----
>  ...es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} |  4 ++--
>  .../{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} |  4 ++--
>  .../renesas/{r8a7795.dtsi => r8a77951.dtsi}   |  2 +-
>  ...960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} |  2 +-
>  ...{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts} |  0
>  ...65-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} |  2 +-
>  ...r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} |  0
>  drivers/soc/renesas/Kconfig                   |  8 +++++++
>  15 files changed, 40 insertions(+), 31 deletions(-)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts} (96%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb-kf.dts => r8a77950-ulcb-kf.dts} (75%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb.dts => r8a77950-ulcb.dts} (89%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-es1.dtsi => r8a77950.dtsi} (98%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-x.dts => r8a77951-salvator-x.dts} (96%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts} (96%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-es1-h3ulcb-kf.dts => r8a77951-ulcb-kf.dts} (75%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795-h3ulcb.dts => r8a77951-ulcb.dts} (92%)
>  rename arch/arm64/boot/dts/renesas/{r8a7795.dtsi => r8a77951.dtsi} (99%)
>  rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb-kf.dts => r8a77960-ulcb-kf.dts} (92%)
>  rename arch/arm64/boot/dts/renesas/{r8a77960-m3ulcb.dts => r8a77960-ulcb.dts} (100%)
>  rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb-kf.dts => r8a77965-ulcb-kf.dts} (92%)
>  rename arch/arm64/boot/dts/renesas/{r8a77965-m3nulcb.dts => r8a77965-ulcb.dts} (100%)
> 
> -- 
> 2.17.1
> 
> Gr{oetje,eeting}s,
> 
> 						Geert
> 
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
> 
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
> 							    -- Linus Torvalds

-- 
Regards,
Niklas Söderlund

^ permalink raw reply	[flat|nested] 8+ messages in thread

end of thread, back to index

Thread overview: 8+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-12-17 18:38 [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Geert Uytterhoeven
2019-12-17 18:38 ` [PATCH 1/5] arm64: dts: renesas: Rename r8a7795{-es1,}* to r8a7795[01]* Geert Uytterhoeven
2019-12-17 18:38 ` [PATCH 2/5] arm64: dts: renesas: Drop redudant SoC prefixes from ULCB DTS file names Geert Uytterhoeven
2019-12-17 18:38 ` [PATCH 3/5] arm64: dts: renesas: Sort DTBs in Makefile Geert Uytterhoeven
2019-12-17 18:38 ` [PATCH 4/5] arm64: dts: renesas: Prepare for split of ARCH_R8A7795 into ARCH_R8A7795[01] Geert Uytterhoeven
2019-12-17 18:38 ` [PATCH 5/5] soc: renesas: Add ARCH_R8A7795[01] for existing R-Car H3 Geert Uytterhoeven
2019-12-25  9:33 ` [PATCH 0/5] arm64: renesas: Split/rename R-Car H3 support Yoshihiro Shimoda
2020-01-07 23:26 ` Niklas Söderlund

Linux-Renesas-SoC Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/linux-renesas-soc/0 linux-renesas-soc/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 linux-renesas-soc linux-renesas-soc/ https://lore.kernel.org/linux-renesas-soc \
		linux-renesas-soc@vger.kernel.org
	public-inbox-index linux-renesas-soc

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.linux-renesas-soc


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git