summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/ste-nomadik-s8815.dts
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2013-06-20 17:40:16 +0400
committerArnd Bergmann <arnd@arndb.de>2013-06-20 18:13:10 +0400
commit15f4b11b0fa91cf81738215483b2bb2c0b911285 (patch)
treec2f30b1b5941f35b0884f02d485a0d04d984f3a0 /arch/arm/boot/dts/ste-nomadik-s8815.dts
parentdc61cd9ecb918f593972962b97cf6079ab9d1daf (diff)
parentc641d4dfef6d462c6d66a6fb57700086cd2f0106 (diff)
downloadlinux-15f4b11b0fa91cf81738215483b2bb2c0b911285.tar.xz
Merge tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik into next/dt
From Linus Walleij: Nomadik DT and clock work: - Lee Jones' pinctrl compat ontology patches - A real clock driver for the Nomadik, 100% DT-based - Device tree changes for the Nomadik clocks * tag 'nomadik-dt-2' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik: ARM: nomadik: add the new clocks to the device tree clk: nomadik: implement the Nomadik clocks properly pinctrl/nomadik: Standardise Pinctrl compat string for Nomadik based platforms ARM: nomadik: Standardise Nomadik STN8815 based Pinctrl compat string in the DTS Conflicts: arch/arm/boot/dts/ste-nomadik-s8815.dts Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/boot/dts/ste-nomadik-s8815.dts')
-rw-r--r--arch/arm/boot/dts/ste-nomadik-s8815.dts6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/ste-nomadik-s8815.dts b/arch/arm/boot/dts/ste-nomadik-s8815.dts
index f4dfda7db366..16c3888b7b15 100644
--- 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";