[PATCH linux dev-5.4] ARM: dts: Aspeed: AST2600: Remove FTTMR010 and set arch timer always-on

Eddie James eajames at linux.ibm.com
Fri Mar 27 01:17:21 AEDT 2020


The FTTMR010 is not intended to be used in the AST2600. The arch timer
should be used, but Linux doesn't enable high-res timers without being
assured that the arch timer is always on, so set that property in the
devicetree.

Signed-off-by: Eddie James <eajames at linux.ibm.com>
---
 arch/arm/boot/dts/aspeed-g6.dtsi | 16 +---------------
 1 file changed, 1 insertion(+), 15 deletions(-)

diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi
index a222871..f309f66 100644
--- a/arch/arm/boot/dts/aspeed-g6.dtsi
+++ b/arch/arm/boot/dts/aspeed-g6.dtsi
@@ -66,6 +66,7 @@
 			     <GIC_PPI 10 (GIC_CPU_MASK_SIMPLE(2) | IRQ_TYPE_LEVEL_LOW)>;
 		clocks = <&syscon ASPEED_CLK_HPLL>;
 		arm,cpu-registers-not-fw-configured;
+		always-on;
 	};
 
 	ahb {
@@ -387,21 +388,6 @@
 				status = "disabled";
 			};
 
-			timer: timer at 1e782000 {
-				compatible = "aspeed,ast2600-timer";
-				reg = <0x1e782000 0x90>;
-				interrupts-extended = <&gic  GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 20 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 22 IRQ_TYPE_LEVEL_HIGH>,
-						<&gic  GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
-				clocks = <&syscon ASPEED_CLK_APB1>;
-				clock-names = "PCLK";
-                        };
-
 			uart1: serial at 1e783000 {
 				compatible = "ns16550a";
 				reg = <0x1e783000 0x20>;
-- 
1.8.3.1



More information about the openbmc mailing list