From aed2bd4941f6294cd6b12facfce70f7d2d2b2867 Mon Sep 17 00:00:00 2001
From: Lee Jones <lee.jones@linaro.org>
Date: Mon, 28 May 2012 16:59:26 +0800
Subject: [PATCH] --- yaml --- r: 313339 b: refs/heads/master c:
 4eda912908935946ba64e71cb3f5909843a1a566 h: refs/heads/master i:   313337:
 0d54cbae4daba5ec3b1c619d851e926bd7fcab1f   313335:
 27feae3723a82e674494a08285e1e00a51fdc5e1 v: v3

---
 [refs]                              | 2 +-
 trunk/arch/arm/boot/dts/db8500.dtsi | 8 ++++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 6857dc3313ff..156b70d24e62 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7fd975fabe65ee8cc1d53811c9aa607e95def406
+refs/heads/master: 4eda912908935946ba64e71cb3f5909843a1a566
diff --git a/trunk/arch/arm/boot/dts/db8500.dtsi b/trunk/arch/arm/boot/dts/db8500.dtsi
index 4ad5160018cb..84032d17ea23 100644
--- a/trunk/arch/arm/boot/dts/db8500.dtsi
+++ b/trunk/arch/arm/boot/dts/db8500.dtsi
@@ -313,6 +313,14 @@
 				reg = <5>; /* mailbox 5 is i2c */
 				interrupts = <0 40 0x4>;
 
+				ab8500-gpadc {
+					compatible = "stericsson,ab8500-gpadc";
+					interrupts = <0 32 0x4
+						      0 39 0x4>;
+					interrupt-names = "HW_CONV_END", "SW_CONV_END";
+					vddadc-supply = <&ab8500_ldo_tvout_reg>;
+				};
+
 				ab8500-regulators {
 					compatible = "stericsson,ab8500-regulator";