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
/
vexpress-v2m.dtsi
diff --git
a/arch/arm/boot/dts/vexpress-v2m.dtsi
b/arch/arm/boot/dts/vexpress-v2m.dtsi
index 5e48b641068ad83806efa45c93f31dc6d680b0ca..2ac41ed3a57c7d6bc2c28df8d05c6850e27022b6 100644
(file)
--- a/
arch/arm/boot/dts/vexpress-v2m.dtsi
+++ b/
arch/arm/boot/dts/vexpress-v2m.dtsi
@@
-198,7
+198,7
@@
reg = <0x0f000 0x1000>;
interrupts = <0>;
clocks = <&v2m_refclk32khz>, <&smbclk>;
- clock-names = "wdogclk", "apb_pclk";
+ clock-names = "wdog
_
clk", "apb_pclk";
};
v2m_timer01: timer@11000 {