diff options
| author | Olof Johansson <olof@lixom.net> | 2013-10-29 16:11:03 -0700 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2013-10-29 16:11:03 -0700 |
| commit | 6275a9be78e3ab584be3d863cebdfe07d35d9762 (patch) | |
| tree | 69b787a692dc85347553d047643c5dfacb234418 /arch/arm/boot/dts/omap4.dtsi | |
| parent | 331d7d6afe586477ba8804e653fd013b925bbeca (diff) | |
| parent | 0352bd1f04b706904b26d13f6d8792e7ff6b7eb6 (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.dtsi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/omap4.dtsi b/arch/arm/boot/dts/omap4.dtsi index e8d97b46690..a5b6e88a41a 100644 --- a/arch/arm/boot/dts/omap4.dtsi +++ b/arch/arm/boot/dts/omap4.dtsi @@ -257,6 +257,12 @@ clock-frequency = <48000000>; }; + hwspinlock: spinlock@4a0f6000 { + compatible = "ti,omap4-hwspinlock"; + reg = <0x4a0f6000 0x1000>; + ti,hwmods = "spinlock"; + }; + i2c1: i2c@48070000 { compatible = "ti,omap4-i2c"; reg = <0x48070000 0x100>; |