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 'iomap-4.21-merge-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
am335x-osd3358-sm-red.dts
diff --git
a/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
b/arch/arm/boot/dts/am335x-osd3358-sm-red.dts
index 85cd1d0a73ca4542d29fb473ca310a796bb10f5c..95d54cf3849eb91e008f0179c042a3530f835244 100644
(file)
--- a/
arch/arm/boot/dts/am335x-osd3358-sm-red.dts
+++ b/
arch/arm/boot/dts/am335x-osd3358-sm-red.dts
@@
-456,6
+456,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";
};