Merge git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6

[karo-tx-linux.git] / arch / arm / boot / dts / omap4-var-som.dts

diff --git a/arch/arm/boot/dts/omap4-var-som.dts b/arch/arm/boot/dts/omap4-var-som.dts
index 7e04103779c43d1aa336ac6e57d983c87fbb6884..b41269e871dd2bc6f33a093010c4bd428713498b 100644 (file)
--- a/arch/arm/boot/dts/omap4-var-som.dts
+++ b/arch/arm/boot/dts/omap4-var-som.dts
@@ -7,7 +7,7 @@
  */
 /dts-v1/;
 
-/include/ "omap443x.dtsi"
+#include "omap443x.dtsi"
 
 / {
        model = "Variscite OMAP4 SOM";
@@ -34,12 +34,12 @@
        twl: twl@48 {
                reg = <0x48>;
                /* SPI = 0, IRQ# = 7, 4 = active high level-sensitive */
-               interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
+               interrupts = <GIC_SPI 7 IRQ_TYPE_LEVEL_HIGH>; /* IRQ_SYS_1N cascaded to gic */
                interrupt-parent = <&gic>;
        };
 };
 
-/include/ "twl6030.dtsi"
+#include "twl6030.dtsi"
 
 &i2c2 {
        clock-frequency = <400000>;
@@ -68,7 +68,7 @@
                spi-max-frequency = <24000000>;
                reg = <0>;
                interrupt-parent = <&gpio6>;
-               interrupts = <11 8>; /* gpio line 171, low triggered */
+               interrupts = <11 IRQ_TYPE_LEVEL_LOW>; /* gpio line 171 */
                vdd-supply = <&vdd_eth>;
        };
 };