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 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw...
[sfrench/cifs-2.6.git]
/
arch
/
arm
/
boot
/
dts
/
ste-nomadik-s8815.dts
diff --git
a/arch/arm/boot/dts/ste-nomadik-s8815.dts
b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f4dfda7db3669735618e8ac61eb09d7c9861f931..16c3888b7b15005579ecef4fcdb0cb9d4678be70 100644
(file)
--- a/
arch/arm/boot/dts/ste-nomadik-s8815.dts
+++ b/
arch/arm/boot/dts/ste-nomadik-s8815.dts
@@
-22,6
+22,12
@@
};
};
+ src@101e0000 {
+ /* These chrystal drivers are not used on this board */
+ disable-sxtalo;
+ disable-mxtalo;
+ };
+
pinctrl {
/* Hog CD pins */
pinctrl-names = "default";