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 'm68k-for-v4.20-tag2' of git://git.kernel.org/pub/scm/linux/kernel/git...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
sama5d2.dtsi
diff --git
a/arch/arm/boot/dts/sama5d2.dtsi
b/arch/arm/boot/dts/sama5d2.dtsi
index 843052f14f1cff7d32cf9622ba1ea470c529aa2f..dd0dda6ed44b5ff9d7aec2574e10a0c34ed14130 100644
(file)
--- a/
arch/arm/boot/dts/sama5d2.dtsi
+++ b/
arch/arm/boot/dts/sama5d2.dtsi
@@
-314,7
+314,7
@@
0x1 0x0 0x60000000 0x10000000
0x2 0x0 0x70000000 0x10000000
0x3 0x0 0x80000000 0x10000000>;
- clocks = <&
m
ck>;
+ clocks = <&
h32
ck>;
status = "disabled";
nand_controller: nand-controller {