git.samba.org
/
sfrench
/
cifs-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge tag 'armsoc-dt' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
nspire.dtsi
diff --git
a/arch/arm/boot/dts/nspire.dtsi
b/arch/arm/boot/dts/nspire.dtsi
index d9a0fd7524dc68668e9a956ffa638ff2ad3956b6..90e033d9141f2eb38c369c048cc6cf0a9ea0ae86 100644
(file)
--- a/
arch/arm/boot/dts/nspire.dtsi
+++ b/
arch/arm/boot/dts/nspire.dtsi
@@
-145,15
+145,19
@@
timer0: timer@900C0000 {
reg = <0x900C0000 0x1000>;
timer0: timer@900C0000 {
reg = <0x900C0000 0x1000>;
-
- clocks = <&timer_clk>;
+ clocks = <&timer_clk>, <&timer_clk>,
+ <&timer_clk>;
+ clock-names = "timer0clk", "timer1clk",
+ "apb_pclk";
};
timer1: timer@900D0000 {
reg = <0x900D0000 0x1000>;
interrupts = <19>;
};
timer1: timer@900D0000 {
reg = <0x900D0000 0x1000>;
interrupts = <19>;
-
- clocks = <&timer_clk>;
+ clocks = <&timer_clk>, <&timer_clk>,
+ <&timer_clk>;
+ clock-names = "timer0clk", "timer1clk",
+ "apb_pclk";
};
watchdog: watchdog@90060000 {
};
watchdog: watchdog@90060000 {