* [PATCH] soc: renesas: Remove ARCH_R8A7796 @ 2019-12-11 10:05 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 10:05 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-arm-kernel, linux-renesas-soc, Geert Uytterhoeven All users of CONFIG_ARCH_R8A7796 have been updated to use CONFIG_ARCH_R8A77960, so the former can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued in renesas-devel for v5.6. drivers/soc/renesas/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index f93492b72c04e237..2d10e34cdbe4d117 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -200,13 +200,9 @@ config ARCH_R8A7795 This enables support for the Renesas R-Car H3 SoC. config ARCH_R8A77960 - bool + bool "Renesas R-Car M3-W SoC Platform" select ARCH_RCAR_GEN3 select SYSC_R8A77960 - -config ARCH_R8A7796 - bool "Renesas R-Car M3-W SoC Platform" - select ARCH_R8A77960 help This enables support for the Renesas R-Car M3-W SoC. -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] soc: renesas: Remove ARCH_R8A7796 @ 2019-12-11 10:05 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 10:05 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-renesas-soc, Geert Uytterhoeven, linux-arm-kernel All users of CONFIG_ARCH_R8A7796 have been updated to use CONFIG_ARCH_R8A77960, so the former can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued in renesas-devel for v5.6. drivers/soc/renesas/Kconfig | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/drivers/soc/renesas/Kconfig b/drivers/soc/renesas/Kconfig index f93492b72c04e237..2d10e34cdbe4d117 100644 --- a/drivers/soc/renesas/Kconfig +++ b/drivers/soc/renesas/Kconfig @@ -200,13 +200,9 @@ config ARCH_R8A7795 This enables support for the Renesas R-Car H3 SoC. config ARCH_R8A77960 - bool + bool "Renesas R-Car M3-W SoC Platform" select ARCH_RCAR_GEN3 select SYSC_R8A77960 - -config ARCH_R8A7796 - bool "Renesas R-Car M3-W SoC Platform" - select ARCH_R8A77960 help This enables support for the Renesas R-Car M3-W SoC. -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* @ 2019-12-11 13:13 ` Geert Uytterhoeven 2019-12-11 10:04 ` Geert Uytterhoeven ` (2 more replies) 0 siblings, 3 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 13:13 UTC (permalink / raw) To: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda, Laurent Pinchart, Wolfram Sang, Eugeniu Rosca Cc: linux-renesas-soc, Geert Uytterhoeven CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit 39e57e14d7eaf818 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W"), to avoid confusion between R-Car M3-W (R8A77960) and R-Car M3-W+ (R8A77961). Rename the DTS files as well, for consistency. Note that DT binding headers, definitions, and compatible values were not renamed, to preserve backward compatibility. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- I think it makes sense to do a similar but slightly different rename dance for R-Car H3: - Config symbols: - CONFIG_ARCH_R8A7795 => CONFIG_ARCH_R8A77950 (ES1.x) CONFIG_ARCH_R8A77951 (ES2.0+) - CONFIG_PINCTRL_PFC_R8A7795 => CONFIG_PINCTRL_PFC_R8A77950 (ES1.0) CONFIG_PINCTRL_PFC_R8A77951 (ES2.0+) (auto-selected based on CONFIG_ARCH_R8A77950/CONFIG_ARCH_R8A77951) - Drivers: - drivers/pinctrl/sh-pfc/{pfc-r8a7795-es1.c => pfc-r8a77950.c} - drivers/pinctrl/sh-pfc/{pfc-r8a7795.c => pfc-r8a77951.c} - DTS: - r8a7795-es1.dtsi => r8a77950.dtsi - r8a7795.dtsi => r8a77951.dtsi - r8a7795-es1-h3ulcb-kf.dts => r8a77950-h3ulcb-kf.dts - r8a7795-es1-h3ulcb.dts => r8a77950-h3ulcb.dts - r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts - r8a7795-h3ulcb-kf.dts => r8a77951-h3ulcb-kf.dts - r8a7795-h3ulcb.dts => r8a77951-h3ulcb.dts - r8a7795-salvator-x.dts => r8a77951-salvator-x.dts - r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts - Unchanged (auto-selected symbols, drivers and compatible values are the same): - CONFIG_CLK_R8A7795 - CONFIG_SYSC_R8A7795 - drivers/clk/renesas/r8a7795-cpg-mssr.c - drivers/soc/renesas/r8a7795-sysc.c - drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts Advantages: - Allow reducing kernel size (due to dropping pfc-r8a7795-es1, 47 KiB) by not enabling support for R-Car H3 ES1.x, - Closer correspondence with the R-Car Series, 3rd Generation documentation, which uses 5-digit part numbers. Disadvantages: - The DTB files are renamed. Thanks for your comments! --- arch/arm64/boot/dts/renesas/Makefile | 6 +++--- .../{r8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} | 4 ++-- .../dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} | 4 ++-- .../{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} | 4 ++-- .../{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} | 4 ++-- arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} | 0 6 files changed, 11 insertions(+), 11 deletions(-) rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} (76%) rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} (90%) rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} (94%) rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} (94%) rename arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} (100%) diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index bc54041590a7ca05..6ba67ae59e052326 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -9,9 +9,9 @@ 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_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-m3ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.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 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 diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts similarity index 76% rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts rename to arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts index 2df50eb11f165aac..611dd2d4fae98d29 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts +++ b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts @@ -6,11 +6,11 @@ * Copyright (C) 2017 Cogent Embedded, Inc. */ -#include "r8a7796-m3ulcb.dts" +#include "r8a77960-m3ulcb.dts" #include "ulcb-kf.dtsi" / { - model = "Renesas M3ULCB Kingfisher board based on r8a7796"; + model = "Renesas M3ULCB Kingfisher board based on r8a77960"; compatible = "shimafuji,kingfisher", "renesas,m3ulcb", "renesas,r8a7796"; }; diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts similarity index 90% rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts rename to arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts index 9e4594c27fa6c553..d041042a56192ab2 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts +++ b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts @@ -7,11 +7,11 @@ */ /dts-v1/; -#include "r8a7796.dtsi" +#include "r8a77960.dtsi" #include "ulcb.dtsi" / { - model = "Renesas M3ULCB board based on r8a7796"; + model = "Renesas M3ULCB board based on r8a77960"; compatible = "renesas,m3ulcb", "renesas,r8a7796"; memory@48000000 { diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts similarity index 94% rename from arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts rename to arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts index de37e91e3b7ac31d..ecfbeafeaf367f15 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts +++ b/arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts @@ -6,11 +6,11 @@ */ /dts-v1/; -#include "r8a7796.dtsi" +#include "r8a77960.dtsi" #include "salvator-x.dtsi" / { - model = "Renesas Salvator-X board based on r8a7796"; + model = "Renesas Salvator-X board based on r8a77960"; compatible = "renesas,salvator-x", "renesas,r8a7796"; memory@48000000 { diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts similarity index 94% rename from arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts rename to arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts index a1cbfef2053fe408..249896a38fdcc7a8 100644 --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts +++ b/arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts @@ -6,11 +6,11 @@ */ /dts-v1/; -#include "r8a7796.dtsi" +#include "r8a77960.dtsi" #include "salvator-xs.dtsi" / { - model = "Renesas Salvator-X 2nd version board based on r8a7796"; + model = "Renesas Salvator-X 2nd version board based on r8a77960"; compatible = "renesas,salvator-xs", "renesas,r8a7796"; memory@48000000 { diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi similarity index 100% rename from arch/arm64/boot/dts/renesas/r8a7796.dtsi rename to arch/arm64/boot/dts/renesas/r8a77960.dtsi -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] arm64: dts: renesas: Remove use of ARCH_R8A7796 @ 2019-12-11 10:04 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 10:04 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-arm-kernel, linux-renesas-soc, Geert Uytterhoeven CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit 39e57e14d7eaf818 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W"), so its users can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued in renesas-devel for v5.6. arch/arm64/boot/dts/renesas/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 3ce9ff58efd5a25b..bc54041590a7ca05 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -9,9 +9,6 @@ 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_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-m3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.dtb -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] arm64: dts: renesas: Remove use of ARCH_R8A7796 @ 2019-12-11 10:04 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 10:04 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-renesas-soc, Geert Uytterhoeven, linux-arm-kernel CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit 39e57e14d7eaf818 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car M3-W"), so its users can be removed. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued in renesas-devel for v5.6. arch/arm64/boot/dts/renesas/Makefile | 3 --- 1 file changed, 3 deletions(-) diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile index 3ce9ff58efd5a25b..bc54041590a7ca05 100644 --- a/arch/arm64/boot/dts/renesas/Makefile +++ b/arch/arm64/boot/dts/renesas/Makefile @@ -9,9 +9,6 @@ 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_R8A7796) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-m3ulcb-kf.dtb -dtb-$(CONFIG_ARCH_R8A7796) += r8a7796-salvator-xs.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-m3ulcb-kf.dtb dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.dtb -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] ARM: shmobile: defconfig: Restore debugfs support @ 2019-12-09 10:13 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-09 10:13 UTC (permalink / raw) To: Magnus Damm Cc: linux-renesas-soc, linux-arm-kernel, linux-kernel, Geert Uytterhoeven Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks booting Debian 9, as systemd needs debugfs: [FAILED] Failed to mount /sys/kernel/debug. See 'systemctl status sys-kernel-debug.mount' for details. [DEPEND] Dependency failed for Local File Systems. ... You are in emergGive root password for maintenance (or press Control-D to continue): Fix this by enabling CONFIG_DEBUG_FS explicitly. See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore debugfs support"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued as a fix for v5.5. --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 7f0985e023313b57..64fa849f8bbe0617 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -215,4 +215,5 @@ CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] ARM: shmobile: defconfig: Restore debugfs support @ 2019-12-09 10:13 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-09 10:13 UTC (permalink / raw) To: Magnus Damm Cc: linux-renesas-soc, Geert Uytterhoeven, linux-kernel, linux-arm-kernel Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks booting Debian 9, as systemd needs debugfs: [FAILED] Failed to mount /sys/kernel/debug. See 'systemctl status sys-kernel-debug.mount' for details. [DEPEND] Dependency failed for Local File Systems. ... You are in emergGive root password for maintenance (or press Control-D to continue): Fix this by enabling CONFIG_DEBUG_FS explicitly. See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore debugfs support"). Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be queued as a fix for v5.5. --- arch/arm/configs/shmobile_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig index 7f0985e023313b57..64fa849f8bbe0617 100644 --- a/arch/arm/configs/shmobile_defconfig +++ b/arch/arm/configs/shmobile_defconfig @@ -215,4 +215,5 @@ CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=64 CONFIG_PRINTK_TIME=y # CONFIG_ENABLE_MUST_CHECK is not set +CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y -- 2.17.1 _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply related [flat|nested] 18+ messages in thread
* [PATCH] [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 @ 2019-12-09 10:14 ` Geert Uytterhoeven 2019-12-09 10:36 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc 2019-12-11 10:06 ` [PATCH LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 Geert Uytterhoeven 0 siblings, 2 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-09 10:14 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-renesas-soc, Geert Uytterhoeven Update the defconfig for Renesas R-Car Gen3 boards: - Re-enable CONFIG_DEBUG_FS, as this is needed for e.g. systemd in Debian 9 (no longer auto-enabled since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS dependency")), - Disable CONFIG_ARM64_ERRATUM_1542419 (not applicable), - Disable CONFIG_CAVIUM_TX2_ERRATUM_219 (not applicable), - Remove CONFIG_TASKSTATS=y and CONFIG_TASK_DELAY_ACCT=y (auto-enabled since commit c7892db5dd6afe92 ("KVM: arm64: Select TASK_DELAY_ACCT+TASKSTATS rather than SCHEDSTATS")), - Remove CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y (depends on CONFIG_ENERGY_MODEL since commit a4e893e802e6a807 ("thermal: cpu_cooling: Migrate to using the EM framework")), Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- Should we enable CONFIG_ENERGY_MODEL? Probably not, as CONFIG_CPU_FREQ_GOV_PERFORMANCE is enabled, cfr. the description of commit 48da6f80057c3f8d ("arm64: defconfig: Enable CONFIG_ENERGY_MODEL"). --- arch/arm64/configs/renesas_defconfig | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/arch/arm64/configs/renesas_defconfig b/arch/arm64/configs/renesas_defconfig index 109aef9c7da45d9a..f509da1473dfe1fa 100644 --- a/arch/arm64/configs/renesas_defconfig +++ b/arch/arm64/configs/renesas_defconfig @@ -8,8 +8,6 @@ CONFIG_PREEMPT=y CONFIG_IRQ_TIME_ACCOUNTING=y CONFIG_BSD_PROCESS_ACCT=y CONFIG_BSD_PROCESS_ACCT_V3=y -CONFIG_TASKSTATS=y -CONFIG_TASK_DELAY_ACCT=y CONFIG_TASK_XACCT=y CONFIG_TASK_IO_ACCOUNTING=y CONFIG_IKCONFIG=y @@ -29,10 +27,12 @@ CONFIG_BLK_DEV_INITRD=y # CONFIG_COMPAT_BRK is not set CONFIG_PROFILING=y CONFIG_ARCH_RENESAS=y +# CONFIG_ARM64_ERRATUM_1542419 is not set # CONFIG_CAVIUM_ERRATUM_22375 is not set # CONFIG_CAVIUM_ERRATUM_23154 is not set # CONFIG_CAVIUM_ERRATUM_27456 is not set # CONFIG_CAVIUM_ERRATUM_30115 is not set +# CONFIG_CAVIUM_TX2_ERRATUM_219 is not set # CONFIG_QCOM_FALKOR_ERRATUM_1003 is not set # CONFIG_QCOM_FALKOR_ERRATUM_1009 is not set # CONFIG_QCOM_QDF2400_ERRATUM_0065 is not set @@ -139,7 +139,6 @@ CONFIG_GPIO_RCAR=y CONFIG_GPIO_PCA953X=y CONFIG_GPIO_BD9571MWV=y CONFIG_THERMAL=y -CONFIG_THERMAL_GOV_POWER_ALLOCATOR=y CONFIG_CPU_THERMAL=y CONFIG_THERMAL_EMULATION=y CONFIG_RCAR_THERMAL=y @@ -328,6 +327,7 @@ CONFIG_CMA_SIZE_MBYTES=128 CONFIG_CMA_ALIGNMENT=9 CONFIG_PRINTK_TIME=y CONFIG_MAGIC_SYSRQ=y +CONFIG_DEBUG_FS=y CONFIG_DEBUG_KERNEL=y # CONFIG_SCHED_DEBUG is not set # CONFIG_DEBUG_PREEMPT is not set -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Patchwork summary for: linux-renesas-soc 2019-12-09 10:14 ` [PATCH] [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 Geert Uytterhoeven @ 2019-12-09 10:36 ` patchwork-bot+linux-renesas-soc 2019-12-09 13:23 ` Geert Uytterhoeven 2019-12-11 10:06 ` [PATCH LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 Geert Uytterhoeven 1 sibling, 1 reply; 18+ messages in thread From: patchwork-bot+linux-renesas-soc @ 2019-12-09 10:36 UTC (permalink / raw) To: linux-renesas-soc Hello: The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/master): Patch: ARM: shmobile: defconfig: Restore debugfs support Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213533 Patch: [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213537 Total patches: 2 -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: Patchwork summary for: linux-renesas-soc 2019-12-09 10:36 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc @ 2019-12-09 13:23 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-09 13:23 UTC (permalink / raw) To: Linux-Renesas On Mon, Dec 9, 2019 at 11:36 AM <patchwork-bot+linux-renesas-soc@kernel.org> wrote: > The following patches were marked "accepted", because they were applied to > geert/renesas-devel (refs/heads/master): > > Patch: ARM: shmobile: defconfig: Restore debugfs support > Submitter: Geert Uytterhoeven <geert+renesas@glider.be> > Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213533 > > Patch: [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 > Submitter: Geert Uytterhoeven <geert+renesas@glider.be> > Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213537 > > Total patches: 2 FTR: Reverted to "Under Review", as the patches haven't been queued up yet. I did apply them on top of renesas-devel, after merging renesas-next, as not doing so would cause regressions on Debian 9 with systemd. 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] 18+ messages in thread
* [PATCH LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 @ 2019-12-11 10:06 ` Geert Uytterhoeven 2019-12-13 21:40 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc 0 siblings, 1 reply; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-11 10:06 UTC (permalink / raw) To: Magnus Damm; +Cc: linux-renesas-soc, Geert Uytterhoeven CONFIG_ARCH_R8A7796 is being replaced by CONFIG_ARCH_R8A77960. Enable both options for now, so r8a77960 support stays enabled both before and after the removal of the CONFIG_ARCH_R8A7796 option. Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> --- To be applied to topic/renesas-defconfig. Not intended for upstream merge. arch/arm64/configs/renesas_defconfig | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/arm64/configs/renesas_defconfig b/arch/arm64/configs/renesas_defconfig index 2f3848d819d461aa..c9ca5e2a2665c232 100644 --- a/arch/arm64/configs/renesas_defconfig +++ b/arch/arm64/configs/renesas_defconfig @@ -287,6 +287,7 @@ CONFIG_ARCH_R8A774B1=y CONFIG_ARCH_R8A774C0=y CONFIG_ARCH_R8A7795=y CONFIG_ARCH_R8A7796=y +CONFIG_ARCH_R8A77960=y CONFIG_ARCH_R8A77961=y CONFIG_ARCH_R8A77965=y CONFIG_ARCH_R8A77970=y -- 2.17.1 ^ permalink raw reply related [flat|nested] 18+ messages in thread
* Patchwork summary for: linux-renesas-soc 2019-12-11 10:06 ` [PATCH LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 Geert Uytterhoeven @ 2019-12-13 21:40 ` patchwork-bot+linux-renesas-soc 0 siblings, 0 replies; 18+ messages in thread From: patchwork-bot+linux-renesas-soc @ 2019-12-13 21:40 UTC (permalink / raw) To: linux-renesas-soc Hello: The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/master): Patch: [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213537 Patch: [LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=214887 Total patches: 2 -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: shmobile: defconfig: Restore debugfs support 2019-12-09 10:13 ` Geert Uytterhoeven @ 2019-12-10 17:09 ` Niklas Söderlund -1 siblings, 0 replies; 18+ messages in thread From: Niklas Söderlund @ 2019-12-10 17:09 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Magnus Damm, linux-renesas-soc, linux-arm-kernel, linux-kernel Hi Geert, Thanks for your patch. On 2019-12-09 11:13:27 +0100, Geert Uytterhoeven wrote: > Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS > dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks > booting Debian 9, as systemd needs debugfs: > > [FAILED] Failed to mount /sys/kernel/debug. > See 'systemctl status sys-kernel-debug.mount' for details. > [DEPEND] Dependency failed for Local File Systems. > ... > You are in emergGive root password for maintenance > (or press Control-D to continue): > > Fix this by enabling CONFIG_DEBUG_FS explicitly. > > See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore > debugfs support"). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > To be queued as a fix for v5.5. > --- > arch/arm/configs/shmobile_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index 7f0985e023313b57..64fa849f8bbe0617 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -215,4 +215,5 @@ CONFIG_DMA_CMA=y > CONFIG_CMA_SIZE_MBYTES=64 > CONFIG_PRINTK_TIME=y > # CONFIG_ENABLE_MUST_CHECK is not set > +CONFIG_DEBUG_FS=y > CONFIG_DEBUG_KERNEL=y > -- > 2.17.1 > -- Regards, Niklas Söderlund ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH] ARM: shmobile: defconfig: Restore debugfs support @ 2019-12-10 17:09 ` Niklas Söderlund 0 siblings, 0 replies; 18+ messages in thread From: Niklas Söderlund @ 2019-12-10 17:09 UTC (permalink / raw) To: Geert Uytterhoeven Cc: linux-renesas-soc, Magnus Damm, linux-kernel, linux-arm-kernel Hi Geert, Thanks for your patch. On 2019-12-09 11:13:27 +0100, Geert Uytterhoeven wrote: > Since commit 0e4a459f56c32d3e ("tracing: Remove unnecessary DEBUG_FS > dependency"), CONFIG_DEBUG_FS is no longer auto-enabled. This breaks > booting Debian 9, as systemd needs debugfs: > > [FAILED] Failed to mount /sys/kernel/debug. > See 'systemctl status sys-kernel-debug.mount' for details. > [DEPEND] Dependency failed for Local File Systems. > ... > You are in emergGive root password for maintenance > (or press Control-D to continue): > > Fix this by enabling CONFIG_DEBUG_FS explicitly. > > See also commit 18977008f44c66bd ("ARM: multi_v7_defconfig: Restore > debugfs support"). > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Niklas Söderlund <niklas.soderlund+renesas@ragnatech.se> > --- > To be queued as a fix for v5.5. > --- > arch/arm/configs/shmobile_defconfig | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/arch/arm/configs/shmobile_defconfig b/arch/arm/configs/shmobile_defconfig > index 7f0985e023313b57..64fa849f8bbe0617 100644 > --- a/arch/arm/configs/shmobile_defconfig > +++ b/arch/arm/configs/shmobile_defconfig > @@ -215,4 +215,5 @@ CONFIG_DMA_CMA=y > CONFIG_CMA_SIZE_MBYTES=64 > CONFIG_PRINTK_TIME=y > # CONFIG_ENABLE_MUST_CHECK is not set > +CONFIG_DEBUG_FS=y > CONFIG_DEBUG_KERNEL=y > -- > 2.17.1 > -- Regards, Niklas Söderlund _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel ^ permalink raw reply [flat|nested] 18+ messages in thread
* Patchwork summary for: linux-renesas-soc 2019-12-09 10:13 ` Geert Uytterhoeven ` (2 preceding siblings ...) (?) @ 2019-12-13 21:40 ` patchwork-bot+linux-renesas-soc -1 siblings, 0 replies; 18+ messages in thread From: patchwork-bot+linux-renesas-soc @ 2019-12-13 21:40 UTC (permalink / raw) To: linux-renesas-soc Hello: The following patches were marked "accepted", because they were applied to geert/renesas-devel (refs/heads/next): Patch: soc: renesas: Remove ARCH_R8A7796 Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=214881 Patch: [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=214985 Patch: arm64: dts: renesas: Remove use of ARCH_R8A7796 Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=214877 Patch: ARM: shmobile: defconfig: Restore debugfs support Submitter: Geert Uytterhoeven <geert+renesas@glider.be> Patchwork: https://patchwork.kernel.org/project/linux-renesas-soc/list/?series=213533 Total patches: 4 -- Deet-doot-dot, I am a bot. https://korg.wiki.kernel.org/userdoc/pwbot ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* 2019-12-11 13:13 ` [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Geert Uytterhoeven 2019-12-11 10:04 ` Geert Uytterhoeven @ 2019-12-11 17:55 ` Laurent Pinchart 2019-12-11 19:52 ` Eugeniu Rosca 2 siblings, 0 replies; 18+ messages in thread From: Laurent Pinchart @ 2019-12-11 17:55 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda, Wolfram Sang, Eugeniu Rosca, linux-renesas-soc Hi Geert, Thank you for the patch. On Wed, Dec 11, 2019 at 02:13:11PM +0100, Geert Uytterhoeven wrote: > CONFIG_ARCH_R8A7796 was renamed to CONFIG_ARCH_R8A77960 in commit > 39e57e14d7eaf818 ("soc: renesas: Add ARCH_R8A77960 for existing R-Car > M3-W"), to avoid confusion between R-Car M3-W (R8A77960) and R-Car M3-W+ > (R8A77961). > > Rename the DTS files as well, for consistency. > > Note that DT binding headers, definitions, and compatible values were > not renamed, to preserve backward compatibility. > > Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be> Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com> > --- > I think it makes sense to do a similar but slightly different rename > dance for R-Car H3: > - Config symbols: > - CONFIG_ARCH_R8A7795 => CONFIG_ARCH_R8A77950 (ES1.x) > CONFIG_ARCH_R8A77951 (ES2.0+) > - CONFIG_PINCTRL_PFC_R8A7795 => CONFIG_PINCTRL_PFC_R8A77950 (ES1.0) > CONFIG_PINCTRL_PFC_R8A77951 (ES2.0+) > (auto-selected based on CONFIG_ARCH_R8A77950/CONFIG_ARCH_R8A77951) > - Drivers: > - drivers/pinctrl/sh-pfc/{pfc-r8a7795-es1.c => pfc-r8a77950.c} > - drivers/pinctrl/sh-pfc/{pfc-r8a7795.c => pfc-r8a77951.c} > - DTS: > - r8a7795-es1.dtsi => r8a77950.dtsi > - r8a7795.dtsi => r8a77951.dtsi > - r8a7795-es1-h3ulcb-kf.dts => r8a77950-h3ulcb-kf.dts > - r8a7795-es1-h3ulcb.dts => r8a77950-h3ulcb.dts > - r8a7795-es1-salvator-x.dts => r8a77950-salvator-x.dts > - r8a7795-h3ulcb-kf.dts => r8a77951-h3ulcb-kf.dts > - r8a7795-h3ulcb.dts => r8a77951-h3ulcb.dts > - r8a7795-salvator-x.dts => r8a77951-salvator-x.dts > - r8a7795-salvator-xs.dts => r8a77951-salvator-xs.dts > - Unchanged (auto-selected symbols, drivers and compatible values are > the same): > - CONFIG_CLK_R8A7795 > - CONFIG_SYSC_R8A7795 > - drivers/clk/renesas/r8a7795-cpg-mssr.c > - drivers/soc/renesas/r8a7795-sysc.c > - drivers/gpu/drm/rcar-du/rcar_du_of_lvds_r8a7795.dts > > Advantages: > - Allow reducing kernel size (due to dropping pfc-r8a7795-es1, 47 KiB) > by not enabling support for R-Car H3 ES1.x, > - Closer correspondence with the R-Car Series, 3rd Generation > documentation, which uses 5-digit part numbers. > > Disadvantages: > - The DTB files are renamed. > > Thanks for your comments! I have no objection. > --- > arch/arm64/boot/dts/renesas/Makefile | 6 +++--- > .../{r8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} | 4 ++-- > .../dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} | 4 ++-- > .../{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} | 4 ++-- > .../{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} | 4 ++-- > arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} | 0 > 6 files changed, 11 insertions(+), 11 deletions(-) > rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb-kf.dts => r8a77960-m3ulcb-kf.dts} (76%) > rename arch/arm64/boot/dts/renesas/{r8a7796-m3ulcb.dts => r8a77960-m3ulcb.dts} (90%) > rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-x.dts => r8a77960-salvator-x.dts} (94%) > rename arch/arm64/boot/dts/renesas/{r8a7796-salvator-xs.dts => r8a77960-salvator-xs.dts} (94%) > rename arch/arm64/boot/dts/renesas/{r8a7796.dtsi => r8a77960.dtsi} (100%) > > diff --git a/arch/arm64/boot/dts/renesas/Makefile b/arch/arm64/boot/dts/renesas/Makefile > index bc54041590a7ca05..6ba67ae59e052326 100644 > --- a/arch/arm64/boot/dts/renesas/Makefile > +++ b/arch/arm64/boot/dts/renesas/Makefile > @@ -9,9 +9,9 @@ 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_R8A77960) += r8a7796-salvator-x.dtb r8a7796-m3ulcb.dtb > -dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-m3ulcb-kf.dtb > -dtb-$(CONFIG_ARCH_R8A77960) += r8a7796-salvator-xs.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 > 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 > diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts > similarity index 76% > rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts > rename to arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts > index 2df50eb11f165aac..611dd2d4fae98d29 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb-kf.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb-kf.dts > @@ -6,11 +6,11 @@ > * Copyright (C) 2017 Cogent Embedded, Inc. > */ > > -#include "r8a7796-m3ulcb.dts" > +#include "r8a77960-m3ulcb.dts" > #include "ulcb-kf.dtsi" > > / { > - model = "Renesas M3ULCB Kingfisher board based on r8a7796"; > + model = "Renesas M3ULCB Kingfisher board based on r8a77960"; > compatible = "shimafuji,kingfisher", "renesas,m3ulcb", > "renesas,r8a7796"; > }; > diff --git a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts > similarity index 90% > rename from arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts > rename to arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts > index 9e4594c27fa6c553..d041042a56192ab2 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796-m3ulcb.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77960-m3ulcb.dts > @@ -7,11 +7,11 @@ > */ > > /dts-v1/; > -#include "r8a7796.dtsi" > +#include "r8a77960.dtsi" > #include "ulcb.dtsi" > > / { > - model = "Renesas M3ULCB board based on r8a7796"; > + model = "Renesas M3ULCB board based on r8a77960"; > compatible = "renesas,m3ulcb", "renesas,r8a7796"; > > memory@48000000 { > diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts b/arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts > similarity index 94% > rename from arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts > rename to arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts > index de37e91e3b7ac31d..ecfbeafeaf367f15 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-x.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77960-salvator-x.dts > @@ -6,11 +6,11 @@ > */ > > /dts-v1/; > -#include "r8a7796.dtsi" > +#include "r8a77960.dtsi" > #include "salvator-x.dtsi" > > / { > - model = "Renesas Salvator-X board based on r8a7796"; > + model = "Renesas Salvator-X board based on r8a77960"; > compatible = "renesas,salvator-x", "renesas,r8a7796"; > > memory@48000000 { > diff --git a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts b/arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts > similarity index 94% > rename from arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts > rename to arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts > index a1cbfef2053fe408..249896a38fdcc7a8 100644 > --- a/arch/arm64/boot/dts/renesas/r8a7796-salvator-xs.dts > +++ b/arch/arm64/boot/dts/renesas/r8a77960-salvator-xs.dts > @@ -6,11 +6,11 @@ > */ > > /dts-v1/; > -#include "r8a7796.dtsi" > +#include "r8a77960.dtsi" > #include "salvator-xs.dtsi" > > / { > - model = "Renesas Salvator-X 2nd version board based on r8a7796"; > + model = "Renesas Salvator-X 2nd version board based on r8a77960"; > compatible = "renesas,salvator-xs", "renesas,r8a7796"; > > memory@48000000 { > diff --git a/arch/arm64/boot/dts/renesas/r8a7796.dtsi b/arch/arm64/boot/dts/renesas/r8a77960.dtsi > similarity index 100% > rename from arch/arm64/boot/dts/renesas/r8a7796.dtsi > rename to arch/arm64/boot/dts/renesas/r8a77960.dtsi > -- > 2.17.1 > -- Regards, Laurent Pinchart ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* 2019-12-11 13:13 ` [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Geert Uytterhoeven 2019-12-11 10:04 ` Geert Uytterhoeven 2019-12-11 17:55 ` [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Laurent Pinchart @ 2019-12-11 19:52 ` Eugeniu Rosca 2019-12-12 9:11 ` Geert Uytterhoeven 2 siblings, 1 reply; 18+ messages in thread From: Eugeniu Rosca @ 2019-12-11 19:52 UTC (permalink / raw) To: Geert Uytterhoeven Cc: Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda, Laurent Pinchart, Wolfram Sang, Eugeniu Rosca, linux-renesas-soc, Eugeniu Rosca Hi Geert, Thank you for your time and effort to decrease the chaos in the R-Car3 DTS jungle. Just one small comment. On Wed, Dec 11, 2019 at 02:13:11PM +0100, Geert Uytterhoeven wrote: > Disadvantages: > - The DTB files are renamed. This reminded me of a past contribution [*], where, based on feedback from Laurent and Simon, the decision was to avoid DTS renaming. Does this series mean that one day, given enough time and resources, we might also eliminate the "r8a779[5-6]" and "(h3|m3|m3n)" redundancy in the naming scheme of the ULCB DTS? (not that it bothers me much) PS: [Thinking out loud] Need to get prepared for using two versions of U-Boot scripts when switching between BSP and vanilla kernels on the r8a77960 targets. This will definitely add a tiny bit of overhead, but nevertheless it looks like an investment to me, the one which users will not regret (on the contrary, will be happy about) in some years from now. Reviewed-by: Eugeniu Rosca <erosca@de.adit-jv.com> [*] https://patchwork.kernel.org/patch/10555955/ -- Best Regards, Eugeniu ^ permalink raw reply [flat|nested] 18+ messages in thread
* Re: [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* 2019-12-11 19:52 ` Eugeniu Rosca @ 2019-12-12 9:11 ` Geert Uytterhoeven 0 siblings, 0 replies; 18+ messages in thread From: Geert Uytterhoeven @ 2019-12-12 9:11 UTC (permalink / raw) To: Eugeniu Rosca Cc: Geert Uytterhoeven, Magnus Damm, Kuninori Morimoto, Yoshihiro Shimoda, Laurent Pinchart, Wolfram Sang, Linux-Renesas, Eugeniu Rosca Hi Eugeniu, On Wed, Dec 11, 2019 at 8:52 PM Eugeniu Rosca <erosca@de.adit-jv.com> wrote: > On Wed, Dec 11, 2019 at 02:13:11PM +0100, Geert Uytterhoeven wrote: > > Disadvantages: > > - The DTB files are renamed. > > This reminded me of a past contribution [*], where, based on feedback > from Laurent and Simon, the decision was to avoid DTS renaming. Does > this series mean that one day, given enough time and resources, we > might also eliminate the "r8a779[5-6]" and "(h3|m3|m3n)" redundancy in > the naming scheme of the ULCB DTS? (not that it bothers me much) Thanks for reminding me! At that time, the rename was considered too intrusive, compared to the slim benefit. However, if we're renaming the files anyway, and thus causing a (temporary) inconvenience for the user, I think this is a good moment to get rid of the "(h3|m3|m3n)" redundancy in the DTS naming scheme (unfortunately we cannot do that for the "renesas,(h3|m3|m3n)ulcb" compatible values). Hence for R-Car H3, I will move forward the rename of the DTS files, so all renames happen in the same kernel release time frame. Regarding the R-Car V3HSK and V3MSK boards, dropping the "v3m" resp. "v3h" from r8a77970-v3msk.dts resp. r8a77980-v3hsk.dts is IMHO different: the boards are not called "sk", and are far from identical, unlike "ulcb" and "salvator-x(s)". Renesas has lots of "sk", "rsk", and "evm" boards. Let's hope they don't plan any unrelated "ulcb" boards... > PS: [Thinking out loud] Need to get prepared for using two versions of > U-Boot scripts when switching between BSP and vanilla kernels on the > r8a77960 targets. This will definitely add a tiny bit of overhead, but > nevertheless it looks like an investment to me, the one which users > will not regret (on the contrary, will be happy about) in some years > from now. I'm fully aware of that inconvenience. > Reviewed-by: Eugeniu Rosca <erosca@de.adit-jv.com> Thank you! > [*] https://patchwork.kernel.org/patch/10555955/ 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] 18+ messages in thread
end of thread, other threads:[~2019-12-13 21:40 UTC | newest] Thread overview: 18+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-12-11 10:05 [PATCH] soc: renesas: Remove ARCH_R8A7796 Geert Uytterhoeven 2019-12-11 10:05 ` Geert Uytterhoeven 2019-12-11 13:13 ` [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Geert Uytterhoeven 2019-12-11 10:04 ` [PATCH] arm64: dts: renesas: Remove use of ARCH_R8A7796 Geert Uytterhoeven 2019-12-11 10:04 ` Geert Uytterhoeven 2019-12-09 10:13 ` [PATCH] ARM: shmobile: defconfig: Restore debugfs support Geert Uytterhoeven 2019-12-09 10:13 ` Geert Uytterhoeven 2019-12-09 10:14 ` [PATCH] [LOCAL] arm64: renesas_defconfig: Refresh for v5.5-rc1 Geert Uytterhoeven 2019-12-09 10:36 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc 2019-12-09 13:23 ` Geert Uytterhoeven 2019-12-11 10:06 ` [PATCH LOCAL] arm64: defconfig: Enable CONFIG_ARCH_R8A77960 Geert Uytterhoeven 2019-12-13 21:40 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc 2019-12-10 17:09 ` [PATCH] ARM: shmobile: defconfig: Restore debugfs support Niklas Söderlund 2019-12-10 17:09 ` Niklas Söderlund 2019-12-13 21:40 ` Patchwork summary for: linux-renesas-soc patchwork-bot+linux-renesas-soc 2019-12-11 17:55 ` [PATCH/RFC] arm64: dts: renesas: Rename r8a7796* to r8a77960* Laurent Pinchart 2019-12-11 19:52 ` Eugeniu Rosca 2019-12-12 9:11 ` Geert Uytterhoeven
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.