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
/
arm64
/
boot
/
dts
/
arm
/
juno-motherboard.dtsi
diff --git
a/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
b/arch/arm64/boot/dts/arm/juno-motherboard.dtsi
index eeee51f1251bf91d7511be10356aed566511b5a6..40d95c58b55e255454d7d8fa0bbc418c84ef7e01 100644
(file)
--- a/
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
+++ b/
arch/arm64/boot/dts/arm/juno-motherboard.dtsi
@@
-251,7
+251,7
@@
reg = <0x0f0000 0x10000>;
interrupts = <7>;
clocks = <&mb_clk24mhz>, <&soc_smc50mhz>;
- clock-names = "wdogclk", "apb_pclk";
+ clock-names = "wdog
_
clk", "apb_pclk";
};
v2m_timer01: timer@110000 {