From 2fd7c8893879bc0e0917ad9913121f1051689311 Mon Sep 17 00:00:00 2001
From: Peter Ujfalusi <peter.ujfalusi@ti.com>
Date: Fri, 8 Jun 2012 17:02:02 +0300
Subject: [PATCH] --- yaml --- r: 313279 b: refs/heads/master c:
 efd2af55b40d9f8fc12dc0187a1e0cbe4d9f42d1 h: refs/heads/master i:   313277:
 93844297e52b11a5a2c474a066c67abe30eeb123   313275:
 f1435ae88cbd2bb6176ab1f661dcd45bbb32a374   313271:
 3c54502af02967918205b508d5cad02e26b2f9f6   313263:
 7a4d41e2d72402cc321dc755b0c09231a41549a6   313247:
 5c7ccc6f829933c5f68c8903ce53deb1eac8ecc2   313215:
 a012f3e0069b36a96cd7d8d21311052a5f3ce9bd v: v3

---
 [refs]                                |  2 +-
 trunk/arch/arm/boot/dts/omap4-sdp.dts | 25 +++++++++++++++++++++++++
 2 files changed, 26 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 1199982d33f2..a6bf02f0da62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 4814f2f7a9b09866527c1e95a8947e47b348133e
+refs/heads/master: efd2af55b40d9f8fc12dc0187a1e0cbe4d9f42d1
diff --git a/trunk/arch/arm/boot/dts/omap4-sdp.dts b/trunk/arch/arm/boot/dts/omap4-sdp.dts
index b33f2617ebab..e54f481c38d8 100644
--- a/trunk/arch/arm/boot/dts/omap4-sdp.dts
+++ b/trunk/arch/arm/boot/dts/omap4-sdp.dts
@@ -89,6 +89,31 @@
 		interrupts = <0 7 4>; /* IRQ_SYS_1N cascaded to gic */
 		interrupt-parent = <&gic>;
 	};
+
+	twl6040: twl@4b {
+		compatible = "ti,twl6040";
+		reg = <0x4b>;
+		/* SPI = 0, IRQ# = 119, 4 = active high level-sensitive */
+		interrupts = <0 119 4>; /* IRQ_SYS_2N cascaded to gic */
+		interrupt-parent = <&gic>;
+		ti,audpwron-gpio = <&gpio4 31 0>;  /* gpio line 127 */
+
+		vio-supply = <&v1v8>;
+		v2v1-supply = <&v2v1>;
+		enable-active-high;
+
+		/* regulators for vibra motor */
+		vddvibl-supply = <&vbat>;
+		vddvibr-supply = <&vbat>;
+
+		vibra {
+			/* Vibra driver, motor resistance parameters */
+			ti,vibldrv-res = <8>;
+			ti,vibrdrv-res = <3>;
+			ti,viblmotor-res = <10>;
+			ti,vibrmotor-res = <10>;
+		};
+	};
 };
 
 /include/ "twl6030.dtsi"