projects
/
linux-2.6-block.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge tag 'clk-for-linus-3.18' of git://git.linaro.org/people/mike.turquette/linux
[linux-2.6-block.git]
/
arch
/
arm
/
boot
/
dts
/
sun5i-a10s.dtsi
diff --git
a/arch/arm/boot/dts/sun5i-a10s.dtsi
b/arch/arm/boot/dts/sun5i-a10s.dtsi
index d73a2287b37ab7affcb826c2ad864d8eefdb0c59..531272c0e526aec013c22ec6a7d6a3a044f88467 100644
(file)
--- a/
arch/arm/boot/dts/sun5i-a10s.dtsi
+++ b/
arch/arm/boot/dts/sun5i-a10s.dtsi
@@
-287,7
+287,7
@@
mbus_clk: clk@01c2015c {
#clock-cells = <0>;
- compatible = "allwinner,sun
4i-a10-mod0
-clk";
+ compatible = "allwinner,sun
5i-a13-mbus
-clk";
reg = <0x01c2015c 0x4>;
clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;
clock-output-names = "mbus";