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 branch 'master' into fixes
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-bone-common.dtsi
diff --git
a/arch/arm/boot/dts/am335x-bone-common.dtsi
b/arch/arm/boot/dts/am335x-bone-common.dtsi
index 9e5e75ea87f5ec69bc6dd1a235108673a324def9..456eef57ef8971dae75d6e422032f57515a0dcc3 100644
(file)
--- a/
arch/arm/boot/dts/am335x-bone-common.dtsi
+++ b/
arch/arm/boot/dts/am335x-bone-common.dtsi
@@
-419,6
+419,6
@@
};
&rtc {
- clocks = <&clk_32768_ck>, <&
l4_per_clkctrl AM3
_CLKDIV32K_CLKCTRL 0>;
+ clocks = <&clk_32768_ck>, <&
clk_24mhz_clkctrl AM3_CLK_24MHZ
_CLKDIV32K_CLKCTRL 0>;
clock-names = "ext-clk", "int-clk";
};