aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/boot/dts/omap4.dtsi
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2013-10-29 19:11:03 -0400
committerOlof Johansson <olof@lixom.net>2013-10-29 19:11:03 -0400
commit6275a9be78e3ab584be3d863cebdfe07d35d9762 (patch)
tree69b787a692dc85347553d047643c5dfacb234418 /arch/arm/boot/dts/omap4.dtsi
parent331d7d6afe586477ba8804e653fd013b925bbeca (diff)
parent0352bd1f04b706904b26d13f6d8792e7ff6b7eb6 (diff)
Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/dt
From Tony Lindgren: Few device tree changes that fix boot time warnings and make panda display work with recent u-boot. * tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap: ARM: dts: omap4-panda: add DPI pinmuxing ARM: dts: AM33xx: Add RNG node ARM: dts: AM33XX: Add hwspinlock node ARM: dts: OMAP5: Add hwspinlock node ARM: dts: OMAP4: Add hwspinlock node Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/boot/dts/omap4.dtsi')
-rw-r--r--arch/arm/boot/dts/omap4.dtsi6
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi
index e8d97b46690c..a5b6e88a41a5 100644
--- a/arch/arm/boot/dts/omap4.dtsi
+++ b/arch/arm/boot/dts/omap4.dtsi
@@ -257,6 +257,12 @@
257 clock-frequency = <48000000>; 257 clock-frequency = <48000000>;
258 }; 258 };
259 259
260 hwspinlock: spinlock@4a0f6000 {
261 compatible = "ti,omap4-hwspinlock";
262 reg = <0x4a0f6000 0x1000>;
263 ti,hwmods = "spinlock";
264 };
265
260 i2c1: i2c@48070000 { 266 i2c1: i2c@48070000 {
261 compatible = "ti,omap4-i2c"; 267 compatible = "ti,omap4-i2c";
262 reg = <0x48070000 0x100>; 268 reg = <0x48070000 0x100>;