mirror of
				git://git.openwrt.org/openwrt/openwrt.git
				synced 2025-11-03 22:44:27 -05:00 
			
		
		
		
	This is an automatically generated commit which aids following Kernel patch history, as git will see the move and copy as a rename thus defeating the purpose. See: https://lists.openwrt.org/pipermail/openwrt-devel/2023-October/041673.html for the original discussion. Signed-off-by: Robert Marko <robimarko@gmail.com>
		
			
				
	
	
		
			53 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
			
		
		
	
	
			53 lines
		
	
	
		
			2.0 KiB
		
	
	
	
		
			Diff
		
	
	
	
	
	
From feeef118fda562cf9081edef8ad464d89db070f4 Mon Sep 17 00:00:00 2001
 | 
						|
From: Robert Marko <robimarko@gmail.com>
 | 
						|
Date: Tue, 27 Sep 2022 22:12:18 +0200
 | 
						|
Subject: [PATCH] arm64: dts: qcom: ipq6018: move ARMv8 timer out of SoC node
 | 
						|
 | 
						|
The ARM timer is usually considered not part of SoC node, just like
 | 
						|
other ARM designed blocks (PMU, PSCI).  This fixes dtbs_check warning:
 | 
						|
 | 
						|
arch/arm64/boot/dts/qcom/ipq6018-cp01-c1.dtb: soc: timer: {'compatible': ['arm,armv8-timer'], 'interrupts': [[1, 2, 3848], [1, 3, 3848], [1, 4, 3848], [1, 1, 3848]]} should not be valid under {'type': 'object'}
 | 
						|
	From schema: dtschema/schemas/simple-bus.yaml
 | 
						|
 | 
						|
Signed-off-by: Robert Marko <robimarko@gmail.com>
 | 
						|
Reviewed-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
 | 
						|
Reviewed-by: Neil Armstrong <neil.armstrong@linaro.org>
 | 
						|
Signed-off-by: Bjorn Andersson <andersson@kernel.org>
 | 
						|
Link: https://lore.kernel.org/r/20220927201218.1264506-2-robimarko@gmail.com
 | 
						|
---
 | 
						|
 arch/arm64/boot/dts/qcom/ipq6018.dtsi | 16 ++++++++--------
 | 
						|
 1 file changed, 8 insertions(+), 8 deletions(-)
 | 
						|
 | 
						|
--- a/arch/arm64/boot/dts/qcom/ipq6018.dtsi
 | 
						|
+++ b/arch/arm64/boot/dts/qcom/ipq6018.dtsi
 | 
						|
@@ -510,14 +510,6 @@
 | 
						|
 			clock-names = "xo";
 | 
						|
 		};
 | 
						|
 
 | 
						|
-		timer {
 | 
						|
-			compatible = "arm,armv8-timer";
 | 
						|
-			interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
-				     <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
-				     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
-				     <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 | 
						|
-		};
 | 
						|
-
 | 
						|
 		timer@b120000 {
 | 
						|
 			#address-cells = <1>;
 | 
						|
 			#size-cells = <1>;
 | 
						|
@@ -769,6 +761,14 @@
 | 
						|
 		};
 | 
						|
 	};
 | 
						|
 
 | 
						|
+	timer {
 | 
						|
+		compatible = "arm,armv8-timer";
 | 
						|
+		interrupts = <GIC_PPI 2 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
+			     <GIC_PPI 3 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
+			     <GIC_PPI 4 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>,
 | 
						|
+			     <GIC_PPI 1 (GIC_CPU_MASK_SIMPLE(4) | IRQ_TYPE_LEVEL_LOW)>;
 | 
						|
+	};
 | 
						|
+
 | 
						|
 	wcss: wcss-smp2p {
 | 
						|
 		compatible = "qcom,smp2p";
 | 
						|
 		qcom,smem = <435>, <428>;
 |