]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ARM: dts: aspeed: ast2600: Set arch timer always-on
authorEddie James <eajames@linux.ibm.com>
Thu, 26 Mar 2020 14:17:21 +0000 (09:17 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 24 Jun 2020 15:48:39 +0000 (17:48 +0200)
[ Upstream commit c998f40f2ae6a48e93206e2c1ea0691479989611 ]

According to ASPEED, 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.

The FTTMR010 device is described by set to disabled.

This fixes highres timer support for AST2600.

Fixes: 2ca5646b5c2f ("ARM: dts: aspeed: Add AST2600 and EVB")
Signed-off-by: Eddie James <eajames@linux.ibm.com>
Reviewed-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Joel Stanley <joel@jms.id.au>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm/boot/dts/aspeed-g6.dtsi

index 0a29b3b57a9dc86ff0a7fd7a2d5af7793db5448e..fd0e483737a0f1c6f68e22b0e3374305265b5658 100644 (file)
@@ -65,6 +65,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 {
                                                <&gic  GIC_SPI 23 IRQ_TYPE_LEVEL_HIGH>;
                                clocks = <&syscon ASPEED_CLK_APB1>;
                                clock-names = "PCLK";
+                               status = "disabled";
                         };
 
                        uart1: serial@1e783000 {