From: Geert Uytterhoeven <geert+renesas@glider.be>
Date: Mon, 11 Apr 2022 12:32:44 +0000 (+0200)
Subject: ARM: dts: r9a06g032: Drop "arm,cortex-a7-timer" from timer node
X-Git-Tag: v6.6.17~7444^2~38^2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=aa70cbda745d5d2085f2847b875d0da3173a9032;p=platform%2Fkernel%2Flinux-rpi.git

ARM: dts: r9a06g032: Drop "arm,cortex-a7-timer" from timer node

"make dtbs_check":

    arch/arm/boot/dts/r9a06g032-rzn1d400-db.dt.yaml: timer: compatible: 'oneOf' conditional failed, one must be fixed:
	    ['arm,cortex-a7-timer', 'arm,armv7-timer'] is too long
	    'arm,cortex-a7-timer' is not one of ['arm,cortex-a15-timer']
	    'arm,cortex-a7-timer' is not one of ['arm,armv7-timer']
	    'arm,cortex-a7-timer' is not one of ['arm,armv8-timer']
	    From schema: Documentation/devicetree/bindings/timer/arm,arch_timer.yaml

The Cortex-A7 timer should just declare compatibility with
"arm,armv7-timer".

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/a8e0cf00a983b4c539cdb1cfad5cc6b10b423c5b.1649680220.git.geert+renesas@glider.be
---

diff --git a/arch/arm/boot/dts/r9a06g032.dtsi b/arch/arm/boot/dts/r9a06g032.dtsi
index 636a6ab..2257706 100644
--- a/arch/arm/boot/dts/r9a06g032.dtsi
+++ b/arch/arm/boot/dts/r9a06g032.dtsi
@@ -214,8 +214,7 @@
 	};
 
 	timer {
-		compatible = "arm,cortex-a7-timer",
-			     "arm,armv7-timer";
+		compatible = "arm,armv7-timer";
 		interrupt-parent = <&gic>;
 		arm,cpu-registers-not-fw-configured;
 		always-on;