]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
arm: aspeed: Add clock-names property to timer node
authorAndrew Jeffery <andrew@aj.id.au>
Mon, 5 Jun 2017 07:48:46 +0000 (17:18 +0930)
committerDaniel Lezcano <daniel.lezcano@linaro.org>
Mon, 12 Jun 2017 08:13:56 +0000 (10:13 +0200)
The merging of a number of clocksource drivers into fttmr010 means we
require clock-names to be specified in the Aspeed timer node, else the
clocksource fails to probe and boot hangs.

Signed-off-by: Andrew Jeffery <andrew@aj.id.au>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
arch/arm/boot/dts/aspeed-g4.dtsi
arch/arm/boot/dts/aspeed-g5.dtsi

index 8c6bc29eb7f695e0c43a1e6a242c20ea11ea177e..3e74929d3289179dc211846af1012bf02dbf079e 100644 (file)
@@ -893,6 +893,7 @@ timer: timer@1e782000 {
                                //interrupts = <16 17 18 35 36 37 38 39>;
                                interrupts = <16>;
                                clocks = <&clk_apb>;
+                               clock-names = "PCLK";
                        };
 
                        wdt1: wdt@1e785000 {
index a0bea4a6ec7764141e1a62cb8716a1cba5ad6e2e..1e6c701da853c2c9a3eddbf52b1e2efae22d3ea9 100644 (file)
@@ -1000,6 +1000,7 @@ timer: timer@1e782000 {
                                //interrupts = <16 17 18 35 36 37 38 39>;
                                interrupts = <16>;
                                clocks = <&clk_apb>;
+                               clock-names = "PCLK";
                        };