Similar to the revision update from H3-ES1.x to H3-ES2.0, the update from M3-ES1.x to M3-ES3.0, in addition to fixing HW bugs/erratas, drops entire silicon IPs [1-2] (for cost efficiency and other reasons). However, unlike in the H3 ES1.x->ES2.0 revision update, the M3-ES3.0 came with a new SoC id, i.e. r8a77961 (according to both [2] and the updated SoC HW manual Rev.2.00 Jul 2019). The choice to allocate a new identifier seems to strengthen the HW differences between M3-ES1.x and M3-ES3.0 (as it is the case for M3N/r8a77965). Given the above, there are several ways to differentiate between M3-ES1.x and M3-ES3.0: A. The BSP way [1]. Move/rename r8a7796.dtsi to r8a7796-es1.dtsi and keep using r8a7796.dtsi for M3-ES3.x. Pros: * Resembles commit 291e0c4994d081 ("arm64: dts: r8a7795: Add support for R-Car H3 ES2.0") * Reuses the r8a7796 (e.g. sysc, cpg-mssr) drivers for r8a77961 (i.e. minimizes the bring-up effort) Cons: * Deliberately diverges from the vendor documentation [2] by ignoring the new SoC identifier r8a77961, i.e. leading to inconsistencies in the names of the drivers and DTS B. The approach taken in this patch, i.e. create a brand new r8a77961.dtsi (similar to r8a77965.dtsi). Pros: * Reflects the reality documented by HW designers [2] * Maintains drivers/DTS naming consistency and avoids mismatch between documentation and code Cons: * higher bring-up effort than (A) * more discussion is needed on whether it makes sense to separate: - DTS only - DTS + Kconfig (ARCH_R8A77961) - DTS + Kconfig (ARCH_R8A77961) + drivers (sysc, cpg-mssr, other?) Comments appreciated! Signed-off-by: Eugeniu Rosca <erosca@xxxxxxxxxxxxxx> --- arch/arm64/boot/dts/renesas/r8a77961.dtsi | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 arch/arm64/boot/dts/renesas/r8a77961.dtsi diff --git a/arch/arm64/boot/dts/renesas/r8a77961.dtsi b/arch/arm64/boot/dts/renesas/r8a77961.dtsi new file mode 100644 index 000000000000..7f784619be32 --- /dev/null +++ b/arch/arm64/boot/dts/renesas/r8a77961.dtsi @@ -0,0 +1,16 @@ +// SPDX-License-Identifier: GPL-2.0 +/* + * Device Tree Source for the R-Car M3-W+ (R8A77961) ES3.x SoC + * + * Copyright (C) 2019 Renesas Electronics Corp. + */ + +#include "r8a7796.dtsi" + +/* + * Here comes the delta between M3-W (M3 ES1.x) and M3-W+ (M3 ES3.0) + * described in: + * [1] https://git.kernel.org/pub/scm/linux/kernel/git/horms/renesas-bsp.git/commit/?id=8ba438fd03d5 + * ("arm64: dts: r8a7796: Add support for R-Car M3 ES3.0") + * [2] [Confidential] Engineering Change Notice for R8A77961 + */ -- 2.23.0