From: Dinh Nguyen <dinguyen@xxxxxxxxxx>
Set the correct clock entries for the the timers, and also clean up
the timer entries for SOCFPGA by removing timer<n> in the timer entry.
Signed-off-by: Dinh Nguyen <dinguyen@xxxxxxxxxx>
Reviewed-by: Pavel Machek <pavel@xxxxxxx>
CC: Rob Herring <rob.herring@xxxxxxxxxxx>
Cc: Pawel Moll <pawel.moll@xxxxxxx>
Cc: Mark Rutland <mark.rutland@xxxxxxx>
Cc: Stephen Warren <swarren@xxxxxxxxxxxxx>
Cc: Ian Campbell <ian.campbell@xxxxxxxxxx>
CC: Arnd Bergmann <arnd@xxxxxxxx>
Cc: Olof Johansson <olof@xxxxxxxxx>
CC: Jamie Iles <jamie@xxxxxxxxxxxxx>
Cc: John Stultz <john.stultz@xxxxxxxxxx>
Cc: Heiko Stuebner <heiko@xxxxxxxxx>
Cc: Pavel Machek <pavel@xxxxxxx>
Cc: devicetree@xxxxxxxxxxxxxxx
Cc: linux-arm-kernel@xxxxxxxxxxxxxxxxxxx
---
arch/arm/boot/dts/socfpga.dtsi | 16 ++++++++--------
arch/arm/boot/dts/socfpga_cyclone5.dts | 8 ++++----
arch/arm/boot/dts/socfpga_vt.dts | 8 ++++----
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/arch/arm/boot/dts/socfpga.dtsi b/arch/arm/boot/dts/socfpga.dtsi
index bee62a2..2cb5cb7 100644
--- a/arch/arm/boot/dts/socfpga.dtsi
+++ b/arch/arm/boot/dts/socfpga.dtsi
@@ -26,10 +26,6 @@
ethernet1 = &gmac1;
serial0 = &uart0;
serial1 = &uart1;
- timer0 = &timer0;
- timer1 = &timer1;
- timer2 = &timer2;
- timer3 = &timer3;
};
cpus {
@@ -475,28 +471,32 @@
interrupts = <1 13 0xf04>;
};
- timer0: timer0@ffc08000 {
+ timer@ffc08000 {
compatible = "snps,dw-apb-timer-sp";
interrupts = <0 167 4>;
reg = <0xffc08000 0x1000>;
+ clocks = <&osc>;
};
- timer1: timer1@ffc09000 {
+ timer@ffc09000 {
compatible = "snps,dw-apb-timer-sp";
interrupts = <0 168 4>;
reg = <0xffc09000 0x1000>;
+ clocks = <&osc>;
};
- timer2: timer2@ffd00000 {
+ timer@ffd00000 {
compatible = "snps,dw-apb-timer-osc";
interrupts = <0 169 4>;
reg = <0xffd00000 0x1000>;
+ clocks = <&l4_sp_clk>;
};
- timer3: timer3@ffd01000 {
+ timer@ffd01000 {
compatible = "snps,dw-apb-timer-osc";
interrupts = <0 170 4>;
reg = <0xffd01000 0x1000>;
+ clocks = <&l4_sp_clk>;
};
uart0: serial0@ffc02000 {
diff --git a/arch/arm/boot/dts/socfpga_cyclone5.dts b/arch/arm/boot/dts/socfpga_cyclone5.dts
index 973999d..8978790 100644
--- a/arch/arm/boot/dts/socfpga_cyclone5.dts
+++ b/arch/arm/boot/dts/socfpga_cyclone5.dts
@@ -54,19 +54,19 @@
status = "okay";
};
- timer0@ffc08000 {
+ timer@ffc08000 {
clock-frequency = <100000000>;
};
- timer1@ffc09000 {
+ timer@ffc09000 {
clock-frequency = <100000000>;
};
- timer2@ffd00000 {
+ timer@ffd00000 {
clock-frequency = <25000000>;
};
- timer3@ffd01000 {
+ timer@ffd01000 {
clock-frequency = <25000000>;
};
diff --git a/arch/arm/boot/dts/socfpga_vt.dts b/arch/arm/boot/dts/socfpga_vt.dts
index d1ec0ca..679320f 100644
--- a/arch/arm/boot/dts/socfpga_vt.dts
+++ b/arch/arm/boot/dts/socfpga_vt.dts
@@ -46,19 +46,19 @@
status = "okay";
};
- timer0@ffc08000 {
+ timer@ffc08000 {
clock-frequency = <7000000>;
};
- timer1@ffc09000 {
+ timer@ffc09000 {
clock-frequency = <7000000>;
};
- timer2@ffd00000 {
+ timer@ffd00000 {
clock-frequency = <7000000>;
};
- timer3@ffd01000 {
+ timer@ffd01000 {
clock-frequency = <7000000>;
};
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
