]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
Merge tag 'omap-for-v3.13/dt-fixes-for-merge-window' of git://git.kernel.org/pub...
authorOlof Johansson <olof@lixom.net>
Tue, 29 Oct 2013 23:11:03 +0000 (16:11 -0700)
committerOlof Johansson <olof@lixom.net>
Tue, 29 Oct 2013 23:11:03 +0000 (16:11 -0700)
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>
1  2 
arch/arm/boot/dts/omap4.dtsi

index e8d97b46690c24ed499e9c43dc44b50fefd318a2,01caa89a8df1da09b2196d1e6b9f9a5b083cde8e..a5b6e88a41a58e558098f329df03d23a2e0b16b4
                        reg = <0x4a100040 0x0196>;
                        #address-cells = <1>;
                        #size-cells = <0>;
 +                      #interrupt-cells = <1>;
 +                      interrupt-controller;
                        pinctrl-single,register-width = <16>;
                        pinctrl-single,function-mask = <0x7fff>;
                };
                        reg = <0x4a31e040 0x0038>;
                        #address-cells = <1>;
                        #size-cells = <0>;
 +                      #interrupt-cells = <1>;
 +                      interrupt-controller;
                        pinctrl-single,register-width = <16>;
                        pinctrl-single,function-mask = <0x7fff>;
                };
                        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>;