From patchwork Wed Jan 2 22:23:49 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925311 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from merlin.infradead.org (merlin.infradead.org [205.233.59.134]) by patchwork1.kernel.org (Postfix) with ESMTP id 0047D3FE37 for ; Wed, 2 Jan 2013 22:32:36 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWnY-0002Ww-1E; Wed, 02 Jan 2013 22:28:32 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWk4-0000qz-6X for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:24:59 +0000 Received: from epcpsbgm2.samsung.com (epcpsbgm2 [203.254.230.27]) by mailout3.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MG000LLVRKZPW30@mailout3.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:50 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 35.F0.12699.2B3B4E05; Thu, 03 Jan 2013 07:24:50 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-ac-50e4b3b20d4c Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id E4.F0.12699.2B3B4E05; Thu, 03 Jan 2013 07:24:50 +0900 (KST) Received: from localhost.localdomain ([105.128.18.183]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MG00028PRKVD920@mmp2.samsung.com> for linux-arm-kernel@lists.infradead.org; Thu, 03 Jan 2013 07:24:50 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 12/26] ARM: S3C24XX: make gta02.h local Date: Wed, 02 Jan 2013 14:23:49 -0800 Message-id: <1357165443-3716-13-git-send-email-kgene.kim@samsung.com> X-Mailer: git-send-email 1.7.10.4 In-reply-to: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> References: <1357165443-3716-1-git-send-email-kgene.kim@samsung.com> DLP-Filter: Pass X-MTR: 20000000000000000@CPGS X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFrrFLMWRmVeSWpSXmKPExsVy+t8zfd1Nm58EGLQtVrbY9PgaqwOjx+Yl 9QGMUVw2Kak5mWWpRfp2CVwZzz+fZyp4pVtxbMUbxgbGtepdjJwcEgImEvuOPWSDsMUkLtxb D2RzcQgJLGOUuPvwGTNM0d32vSwQiemMEltOTmGHcDYwSUy7dBmsnU1AQ+Lw+2dACQ4OEQFv ieXXFEHCzAJ1EjOaVrGC2MIC5hJnTxxiAilhEVCV+HexFiTMK+Aq8WcNzC5Fie5nE8AmcgLF +zZeAbOFBFwk5p95CVbDIiAg8W3yIRaQMRICshKbDjCDXCMhcJlNYsGBq4wQcyQlDq64wTKB UXgBI8MqRtHUguSC4qT0XCO94sTc4tK8dL3k/NxNjJAAlN7BuKrB4hCjAAejEg8vY/2TACHW xLLiytxDjBIczEoivNdzgEK8KYmVValF+fFFpTmpxYcYfYAumcgsJZqcD4yOvJJ4Q2NjEzMT UxNzS1NzUxzCSuK8zR4pAUIC6YklqdmpqQWpRTDjmDg4pRoYE2Z8jPl3JvXNvSfpOcrJ96zU NF47d3tPT2t+zjHVWX36hy/39KYeOb81fXeTUO+2ghuvVkxQeb4+5I9X7JOqmm16pyVrPqcL TDA0C9OMD/zAa3Eh+NXLq1PCklZ+XfMgdn9K4YY12reMY03+tdvofPmUzTbnUbWg0/KWxDbL xKMc15lzbyYlKbEUZyQaajEXFScCAFYlGi5tAgAA X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO6mzU8CDF41yllsenyN1YHRY/OS +gDGqAZGm4zUxJTUIoXUvOT8lMy8dFsl7+B453hTMwNDXUNLC3MlhbzE3FRbJRefAF23zByg qUoKZYk5pUChgMTiYiV9O0wTQkPcdC1gGiN0fUOC4HqMDNBAwjrGjOefzzMVvNKtOLbiDWMD 41r1LkZODgkBE4m77XtZIGwxiQv31rN1MXJxCAlMZ5TYcnIKO4SzgUli2qXLbCBVbAIaEoff PwNKcHCICHhLLL+mCBJmFqiTmNG0ihXEFhYwlzh74hATSAmLgKrEv4u1IGFeAVeJP2ueMUPs UpTofjYBbCInULxv4xUwW0jARWL+mZfMExh5FzAyrGIUTS1ILihOSs810itOzC0uzUvXS87P 3cQIDu9n0jsYVzVYHGIU4GBU4uFlrH8SIMSaWFZcmXuIUYKDWUmE93oOUIg3JbGyKrUoP76o NCe1+BCjD9BRE5mlRJPzgbGXVxJvaGxiZmRpZGZhZGJujkNYSZy32SMlQEggPbEkNTs1tSC1 CGYcEwenVANj8hH3UulWtwULWaR8nnKrGconHTB3aRRpyeuJNtn0M/psbtu1hwWHbm3iKfFe whrRlDLzkv67P3fEH3S+8njqYfP3xAqOi3F/j1b4bPXac6Zrn7xW98EzNz19V7As/xd1hPnC 5UB1f35jGe+TNnMCrqzbOrFQVvXsxDe50qt5JJ5oGHbtPlWmxFKckWioxVxUnAgA2+wBcpwC AAA= X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172456_567870_C38A24AB X-CRM114-Status: GOOD ( 16.37 ) X-Spam-Score: -7.6 (-------) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-7.6 points) pts rule name description ---- ---------------------- -------------------------------------------------- -5.0 RCVD_IN_DNSWL_HI RBL: Sender listed at http://www.dnswl.org/, high trust [203.254.224.33 listed in list.dnswl.org] -0.0 SPF_HELO_PASS SPF: HELO matches SPF record -0.7 RP_MATCHES_RCVD Envelope sender domain matches handover relay domain -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: Sangbeom Kim , Kukjin Kim , Mark Brown X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.14 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 The header can be local in mach-s3c24xx/ and sort out inclusions. Accordingly, the GTA02_ macro in driver can be replaced. Cc: Sangbeom Kim Cc: Mark Brown Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/{include/mach => }/gta02.h | 14 +++-- arch/arm/mach-s3c24xx/mach-gta02.c | 59 ++++++++++------------ sound/soc/samsung/neo1973_wm8753.c | 8 +-- 3 files changed, 42 insertions(+), 39 deletions(-) rename arch/arm/mach-s3c24xx/{include/mach => }/gta02.h (53%) diff --git a/arch/arm/mach-s3c24xx/include/mach/gta02.h b/arch/arm/mach-s3c24xx/gta02.h similarity index 53% rename from arch/arm/mach-s3c24xx/include/mach/gta02.h rename to arch/arm/mach-s3c24xx/gta02.h index 2173934..9430a71 100644 --- a/arch/arm/mach-s3c24xx/include/mach/gta02.h +++ b/arch/arm/mach-s3c24xx/gta02.h @@ -1,5 +1,13 @@ -#ifndef _GTA02_H -#define _GTA02_H +/* + * GTA02 header + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. +*/ + +#ifndef __MACH_S3C24XX_GTA02_H +#define __MACH_S3C24XX_GTA02_H __FILE__ #include @@ -12,4 +20,4 @@ #define GTA02_IRQ_PCF50633 IRQ_EINT9 -#endif /* _GTA02_H */ +#endif /* __MACH_S3C24XX_GTA02_H */ diff --git a/arch/arm/mach-s3c24xx/mach-gta02.c b/arch/arm/mach-s3c24xx/mach-gta02.c index 973b87c..1053706 100644 --- a/arch/arm/mach-s3c24xx/mach-gta02.c +++ b/arch/arm/mach-s3c24xx/mach-gta02.c @@ -1,6 +1,4 @@ /* - * linux/arch/arm/mach-s3c2442/mach-gta02.c - * * S3C2442 Machine Support for Openmoko GTA02 / FreeRunner. * * Copyright (C) 2006-2009 by Openmoko, Inc. @@ -23,7 +21,6 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, * MA 02111-1307 USA - * */ #include @@ -34,62 +31,60 @@ #include #include #include +#include #include #include #include -#include -#include +#include +#include +#include #include +#include +#include +#include +#include +#include +#include + #include #include #include #include #include -#include -#include #include -#include -#include -#include -#include -#include -#include - -#include -#include +#include +#include +#include +#include #include #include #include -#include -#include +#include +#include +#include +#include +#include -#include -#include #include - -#include -#include #include +#include +#include +#include -#include - -#include -#include -#include #include -#include -#include +#include #include -#include -#include +#include +#include #include "common.h" +#include "gta02.h" static struct pcf50633 *gta02_pcf; diff --git a/sound/soc/samsung/neo1973_wm8753.c b/sound/soc/samsung/neo1973_wm8753.c index c7e965f..a301d8c 100644 --- a/sound/soc/samsung/neo1973_wm8753.c +++ b/sound/soc/samsung/neo1973_wm8753.c @@ -237,7 +237,7 @@ static int lm4853_set_spk(struct snd_kcontrol *kcontrol, { gta02_speaker_enabled = ucontrol->value.integer.value[0]; - gpio_set_value(GTA02_GPIO_HP_IN, !gta02_speaker_enabled); + gpio_set_value(S3C2410_GPJ(2), !gta02_speaker_enabled); return 0; } @@ -252,7 +252,7 @@ static int lm4853_get_spk(struct snd_kcontrol *kcontrol, static int lm4853_event(struct snd_soc_dapm_widget *w, struct snd_kcontrol *k, int event) { - gpio_set_value(GTA02_GPIO_AMP_SHUT, SND_SOC_DAPM_EVENT_OFF(event)); + gpio_set_value(S3C2410_GPJ(1), SND_SOC_DAPM_EVENT_OFF(event)); return 0; } @@ -396,8 +396,8 @@ static struct snd_soc_codec_conf neo1973_codec_conf[] = { }; static const struct gpio neo1973_gta02_gpios[] = { - { GTA02_GPIO_HP_IN, GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" }, - { GTA02_GPIO_AMP_SHUT, GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" }, + { S3C2410_GPJ(2), GPIOF_OUT_INIT_HIGH, "GTA02_HP_IN" }, + { S3C2410_GPJ(1), GPIOF_OUT_INIT_HIGH, "GTA02_AMP_SHUT" }, }; static struct snd_soc_card neo1973 = {