From patchwork Thu Jun 16 08:59:03 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: MyungJoo Ham X-Patchwork-Id: 886472 Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by demeter2.kernel.org (8.14.4/8.14.4) with ESMTP id p5G8xbVY026691 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Thu, 16 Jun 2011 08:59:58 GMT Received: from canuck.infradead.org ([2001:4978:20e::1]) by merlin.infradead.org with esmtps (Exim 4.76 #1 (Red Hat Linux)) id 1QX8QB-0002tE-RM; Thu, 16 Jun 2011 08:59:28 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QX8QB-000428-Fk; Thu, 16 Jun 2011 08:59:27 +0000 Received: from mailout4.samsung.com ([203.254.224.34]) by canuck.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1QX8Pt-0003ys-Di for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2011 08:59:10 +0000 Received: from epcpsbgm2.samsung.com (mailout4.samsung.com [203.254.224.34]) by mailout4.samsung.com (Oracle Communications Messaging Exchange Server 7u4-19.01 64bit (built Sep 7 2010)) with ESMTP id <0LMV00GMEKYGFY60@mailout4.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2011 17:59:04 +0900 (KST) X-AuditID: cbfee61b-b7c62ae0000056ed-78-4df9c5d8c967 Received: from epmmp1 ( [203.254.227.16]) by epcpsbgm2.samsung.com (MMPCPMTA) with SMTP id DD.E6.22253.8D5C9FD4; Thu, 16 Jun 2011 17:59:04 +0900 (KST) Received: from TNRNDGASPAPP1.tn.corp.samsungelectronics.net ([165.213.149.150]) by mmp1.samsung.com (iPlanet Messaging Server 5.2 Patch 2 (built Jul 14 2004)) with ESMTPA id <0LMV001XAKYG39@mmp1.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 16 Jun 2011 17:59:04 +0900 (KST) Received: from localhost.localdomain ([165.213.219.116]) by TNRNDGASPAPP1.tn.corp.samsungelectronics.net with Microsoft SMTPSVC(6.0.3790.4675); Thu, 16 Jun 2011 17:58:50 +0900 Date: Thu, 16 Jun 2011 17:59:03 +0900 From: MyungJoo Ham Subject: [PATCH 2/2] ARM: Exynos4: ADC Support for NURI Board In-reply-to: <1308214743-16295-1-git-send-email-myungjoo.ham@samsung.com> To: linux-samsung-soc@vger.kernel.org Message-id: <1308214743-16295-2-git-send-email-myungjoo.ham@samsung.com> X-Mailer: git-send-email 1.7.4.1 References: <1308214743-16295-1-git-send-email-myungjoo.ham@samsung.com> X-OriginalArrivalTime: 16 Jun 2011 08:58:51.0002 (UTC) FILETIME=[9C8EA5A0:01CC2C03] X-Brightmail-Tracker: AAAAAA== X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110616_045909_716204_7295D479 X-CRM114-Status: GOOD ( 15.88 ) X-Spam-Score: -2.3 (--) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (-2.3 points) pts rule name description ---- ---------------------- -------------------------------------------------- -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at http://www.dnswl.org/, medium trust [203.254.224.34 listed in list.dnswl.org] -0.0 T_RP_MATCHES_RCVD Envelope sender domain matches handover relay domain 0.0 RFC_ABUSE_POST Both abuse and postmaster missing on sender domain Cc: Kukjin Kim , Russell King , linux-kernel@vger.kernel.org, dg77.kim@samsung.com, Kyungmin Park , myungjoo.ham@gmail.com, Sylwester Nawrocki , linux-arm-kernel@lists.infradead.org, Marek Szyprowski X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-arm-kernel-bounces@lists.infradead.org Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter2.kernel.org [140.211.167.43]); Thu, 16 Jun 2011 08:59:58 +0000 (UTC) Signed-off-by: MyungJoo Ham Signed-off-by: Kyungmin Park --- arch/arm/mach-exynos4/mach-nuri.c | 4 +++- 1 files changed, 3 insertions(+), 1 deletions(-) diff --git a/arch/arm/mach-exynos4/mach-nuri.c b/arch/arm/mach-exynos4/mach-nuri.c index 5ca6bdd..0604f5d 100644 --- a/arch/arm/mach-exynos4/mach-nuri.c +++ b/arch/arm/mach-exynos4/mach-nuri.c @@ -29,6 +29,7 @@ #include #include +#include #include #include #include @@ -350,7 +351,7 @@ static void __init nuri_tsp_init(void) } static struct regulator_consumer_supply nuri_max8997_ldo1_consumer[] = { - REGULATOR_SUPPLY("vadc", NULL), /* Used by CPU's ADC drv */ + REGULATOR_SUPPLY("vdd", "s5p-adc"), /* Used by CPU's ADC drv */ }; static struct regulator_consumer_supply nuri_max8997_ldo3_consumer[] = { REGULATOR_SUPPLY("vdd11", "s5p-mipi-csis.0"), /* MIPI */ @@ -1057,6 +1058,7 @@ static struct platform_device *nuri_devices[] __initdata = { &s3c_device_i2c3, &s3c_device_i2c5, &i2c9_gpio, + &s3c_device_adc, /* NURI Devices */ &nuri_gpio_keys,