From patchwork Wed Jan 2 22:23:50 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kim Kukjin X-Patchwork-Id: 1925411 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 E2AFE3FE37 for ; Wed, 2 Jan 2013 22:34:07 +0000 (UTC) Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWod-0003Fs-HH; Wed, 02 Jan 2013 22:29:40 +0000 Received: from mailout3.samsung.com ([203.254.224.33]) by merlin.infradead.org with esmtp (Exim 4.76 #1 (Red Hat Linux)) id 1TqWk7-0000qz-PJ for linux-arm-kernel@lists.infradead.org; Wed, 02 Jan 2013 22:25:05 +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:51 +0900 (KST) Received: from epcpsbgm2.samsung.com ( [203.254.230.47]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id 06.F0.12699.3B3B4E05; Thu, 03 Jan 2013 07:24:51 +0900 (KST) X-AuditID: cbfee61b-b7f616d00000319b-b2-50e4b3b37590 Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm2.samsung.com (EPCPMTA) with SMTP id D5.F0.12699.3B3B4E05; Thu, 03 Jan 2013 07:24:51 +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:51 +0900 (KST) From: Kukjin Kim To: linux-arm-kernel@lists.infradead.org, linux-samsung-soc@vger.kernel.org Subject: [PATCH 13/26] ARM: S3C24XX: make h1940.h and h1940-latch.h local Date: Wed, 02 Jan 2013 14:23:50 -0800 Message-id: <1357165443-3716-14-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+NgFrrJLMWRmVeSWpSXmKPExsVy+t8zfd3Nm58EGKzbrG+x6fE1VgdGj81L 6gMYo7hsUlJzMstSi/TtErgyfrw5zljwMaRi/tG1jA2MrR5djBwcEgImEus3lHUxcgKZYhIX 7q1n62Lk4hASWMYocXb2JRaIhInE+4Vn2CES0xkljsz9zQLhbGCSmLV0N1gVm4CGxOH3z9hB pooIeEssv6YIEmYWUJO4cegtM0hYWMBTYtdmGZAwi4CqxIG+7+wgNq+Aq8TNiYvYIXYpSnQ/ m8AGYnMCxfs2XgGzhQRcJOafeckM0Ssg8W3yIRaI+2UlNh1gBrlGQuAym8TKnxcYIeZIShxc cYNlAqPwAkaGVYyiqQXJBcVJ6blGesWJucWleel6yfm5mxgh4Se9g3FVg8UhRgEORiUeXsb6 JwFCrIllxZW5hxglOJiVRHiv5wCFeFMSK6tSi/Lji0pzUosPMfoAXTKRWUo0OR8YG3kl8YbG xiZmJqYm5pam5qY4hJXEeZs9UgKEBNITS1KzU1MLUotgxjFxcEo1MJrMyp7zYKvWl/BZMw4s 8xeVfZWeevxGo9+vJv55bMn3y6ean3eVvnknkcdQZFn3O2OvbtbpLmcEfr/9e2hBvNbCKSvq 3P9+/RVnufr5gv7MFa0l66uDlxxOOXFlusMK9Z4vvq+qjn1k9vOZcHFl2gomYzGdHQsj3n0x 27TSoH3G0lqrT9c+T5BUYinOSDTUYi4qTgQAhCoe/2wCAAA= X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFupkkeLIzCtJLcpLzFFi42I5/e+xoO7mzU8CDE7d07LY9PgaqwOjx+Yl 9QGMUQ2MNhmpiSmpRQqpecn5KZl56bZK3sHxzvGmZgaGuoaWFuZKCnmJuam2Si4+AbpumTlA U5UUyhJzSoFCAYnFxUr6dpgmhIa46VrANEbo+oYEwfUYGaCBhHWMGT/eHGcs+BhSMf/oWsYG xlaPLkZODgkBE4n3C8+wQ9hiEhfurWfrYuTiEBKYzihxZO5vFghnA5PErKW7WUCq2AQ0JA6/ fwbUwcEhIuAtsfyaIkiYWUBN4saht8wgYWEBT4ldm2VAwiwCqhIH+r6DzecVcJW4OXER1C5F ie5nE9hAbE6geN/GK2C2kICLxPwzL5knMPIuYGRYxSiaWpBcUJyUnmukV5yYW1yal66XnJ+7 iREc3s+kdzCuarA4xCjAwajEw8tY/yRAiDWxrLgy9xCjBAezkgjv9RygEG9KYmVValF+fFFp TmrxIUYfoKsmMkuJJucDYy+vJN7Q2MTMyNLIzMLIxNwch7CSOG+zR0qAkEB6YklqdmpqQWoR zDgmDk6pBsag+luxjfl17UuLe+/NTFzg6tSzjMn6svUSyaDlP0Uzm/YWFqexT1WezXbvt/At YWGn6W8envOqKj8u9Pad6IIP89Z1bVn/75fk+a6Vmnd/K/PwrxSbE33giY/4pvhbG/lmPTnp ZszupGchyLSsxXV68++ClWxrlaft4FafpmQ/vZG79oSswCQlluKMREMt5qLiRADkh+9KnAIA AA== X-CFilter-Loop: Reflected X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130102_172500_340039_337F9892 X-CRM114-Status: GOOD ( 18.76 ) 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: Kukjin Kim 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 headers can be local in mach-s3c24xx/. Signed-off-by: Kukjin Kim --- arch/arm/mach-s3c24xx/h1940-bluetooth.c | 6 ++-- .../{include/mach/h1940-latch.h => h1940.h} | 22 ++++++++---- arch/arm/mach-s3c24xx/include/mach/h1940.h | 24 -------------- arch/arm/mach-s3c24xx/mach-h1940.c | 35 +++++++++----------- arch/arm/mach-s3c24xx/mach-rx1950.c | 32 +++++++++--------- arch/arm/mach-s3c24xx/mach-rx3715.c | 16 ++++----- arch/arm/mach-s3c24xx/pm-s3c2410.c | 6 ++-- sound/soc/samsung/h1940_uda1380.c | 13 ++++---- 8 files changed, 68 insertions(+), 86 deletions(-) rename arch/arm/mach-s3c24xx/{include/mach/h1940-latch.h => h1940.h} (70%) delete mode 100644 arch/arm/mach-s3c24xx/include/mach/h1940.h diff --git a/arch/arm/mach-s3c24xx/h1940-bluetooth.c b/arch/arm/mach-s3c24xx/h1940-bluetooth.c index 57aee91..93bdb92 100644 --- a/arch/arm/mach-s3c24xx/h1940-bluetooth.c +++ b/arch/arm/mach-s3c24xx/h1940-bluetooth.c @@ -19,10 +19,10 @@ #include #include -#include #include -#include -#include +#include + +#include "h1940.h" #define DRV_NAME "h1940-bt" diff --git a/arch/arm/mach-s3c24xx/include/mach/h1940-latch.h b/arch/arm/mach-s3c24xx/h1940.h similarity index 70% rename from arch/arm/mach-s3c24xx/include/mach/h1940-latch.h rename to arch/arm/mach-s3c24xx/h1940.h index fc897d3..2950cc4 100644 --- a/arch/arm/mach-s3c24xx/include/mach/h1940-latch.h +++ b/arch/arm/mach-s3c24xx/h1940.h @@ -1,20 +1,30 @@ -/* arch/arm/mach-s3c2410/include/mach/h1940-latch.h +/* + * Copyright 2006 Ben Dooks * * Copyright (c) 2005 Simtec Electronics * http://armlinux.simtec.co.uk/ * Ben Dooks * - * iPAQ H1940 series - latch definitions + * iPAQ H1940 series definitions * * 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 __ASM_ARCH_H1940_LATCH_H -#define __ASM_ARCH_H1940_LATCH_H +#ifndef __MACH_S3C24XX_H1940_H +#define __MACH_S3C24XX_H1940_H __FILE__ -#include +#define H1940_SUSPEND_CHECKSUM (0x30003ff8) +#define H1940_SUSPEND_RESUMEAT (0x30081000) +#define H1940_SUSPEND_CHECK (0x30080000) + +extern void h1940_pm_return(void); +extern int h1940_led_blink_set(unsigned gpio, int state, + unsigned long *delay_on, + unsigned long *delay_off); + +#include #define H1940_LATCH_GPIO(x) (S3C_GPIO_END + (x)) @@ -40,4 +50,4 @@ #define H1940_LATCH_LED_GREEN H1940_LATCH_GPIO(14) #define H1940_LATCH_LED_FLASH H1940_LATCH_GPIO(15) -#endif /* __ASM_ARCH_H1940_LATCH_H */ +#endif /* __MACH_S3C24XX_H1940_H */ diff --git a/arch/arm/mach-s3c24xx/include/mach/h1940.h b/arch/arm/mach-s3c24xx/include/mach/h1940.h deleted file mode 100644 index 2aa683c..0000000 --- a/arch/arm/mach-s3c24xx/include/mach/h1940.h +++ /dev/null @@ -1,24 +0,0 @@ -/* arch/arm/mach-s3c2410/include/mach/h1940.h - * - * Copyright 2006 Ben Dooks - * - * H1940 definitions - * - * 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 __ASM_ARCH_H1940_H -#define __ASM_ARCH_H1940_H - -#define H1940_SUSPEND_CHECKSUM (0x30003ff8) -#define H1940_SUSPEND_RESUMEAT (0x30081000) -#define H1940_SUSPEND_CHECK (0x30080000) - -extern void h1940_pm_return(void); -extern int h1940_led_blink_set(unsigned gpio, int state, - unsigned long *delay_on, unsigned long *delay_off); - - -#endif /* __ASM_ARCH_H1940_H */ diff --git a/arch/arm/mach-s3c24xx/mach-h1940.c b/arch/arm/mach-s3c24xx/mach-h1940.c index e208dda..afc05a7 100644 --- a/arch/arm/mach-s3c24xx/mach-h1940.c +++ b/arch/arm/mach-s3c24xx/mach-h1940.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2410/mach-h1940.c - * +/* * Copyright (c) 2003-2005 Simtec Electronics * Ben Dooks * @@ -37,38 +36,36 @@ #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 "h1940.h" #define H1940_LATCH ((void __force __iomem *)0xF8000000) diff --git a/arch/arm/mach-s3c24xx/mach-rx1950.c b/arch/arm/mach-s3c24xx/mach-rx1950.c index 0606f2f..bdcfb8b 100644 --- a/arch/arm/mach-s3c24xx/mach-rx1950.c +++ b/arch/arm/mach-s3c24xx/mach-rx1950.c @@ -1,5 +1,4 @@ -/* linux/arch/arm/mach-s3c2440/mach-rx1950.c - * +/* * Copyright (c) 2006-2009 Victor Chukhantsev, Denis Grigoriev, * Copyright (c) 2007-2010 Vasily Khoruzhick * @@ -37,31 +36,32 @@ #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 "h1940.h" #define LCD_PWM_PERIOD 192960 #define LCD_PWM_DUTY 127353 diff --git a/arch/arm/mach-s3c24xx/mach-rx3715.c b/arch/arm/mach-s3c24xx/mach-rx3715.c index dacbb9a..b261dd3 100644 --- a/arch/arm/mach-s3c24xx/mach-rx3715.c +++ b/arch/arm/mach-s3c24xx/mach-rx3715.c @@ -31,27 +31,27 @@ #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 "h1940.h" static struct map_desc rx3715_iodesc[] __initdata = { /* dump ISA space somewhere unused */ diff --git a/arch/arm/mach-s3c24xx/pm-s3c2410.c b/arch/arm/mach-s3c24xx/pm-s3c2410.c index 949ae05..2d82c4f 100644 --- a/arch/arm/mach-s3c24xx/pm-s3c2410.c +++ b/arch/arm/mach-s3c24xx/pm-s3c2410.c @@ -29,16 +29,16 @@ #include #include -#include - #include +#include #include -#include #include #include +#include "h1940.h" + static void s3c2410_pm_prepare(void) { /* ensure at least GSTATUS3 has the resume address */ diff --git a/sound/soc/samsung/h1940_uda1380.c b/sound/soc/samsung/h1940_uda1380.c index 3870e96..15a3817 100644 --- a/sound/soc/samsung/h1940_uda1380.c +++ b/sound/soc/samsung/h1940_uda1380.c @@ -21,7 +21,6 @@ #include #include -#include #include #include "s3c24xx-i2s.h" @@ -147,9 +146,9 @@ static int h1940_spk_power(struct snd_soc_dapm_widget *w, struct snd_kcontrol *kcontrol, int event) { if (SND_SOC_DAPM_EVENT_ON(event)) - gpio_set_value(H1940_LATCH_AUDIO_POWER, 1); + gpio_set_value(S3C_GPIO_END + 9, 1); else - gpio_set_value(H1940_LATCH_AUDIO_POWER, 0); + gpio_set_value(S3C_GPIO_END + 9, 0); return 0; } @@ -233,11 +232,11 @@ static int __init h1940_init(void) return -ENODEV; /* configure some gpios */ - ret = gpio_request(H1940_LATCH_AUDIO_POWER, "speaker-power"); + ret = gpio_request(S3C_GPIO_END + 9, "speaker-power"); if (ret) goto err_out; - ret = gpio_direction_output(H1940_LATCH_AUDIO_POWER, 0); + ret = gpio_direction_output(S3C_GPIO_END + 9, 0); if (ret) goto err_gpio; @@ -258,7 +257,7 @@ static int __init h1940_init(void) err_plat: platform_device_put(s3c24xx_snd_device); err_gpio: - gpio_free(H1940_LATCH_AUDIO_POWER); + gpio_free(S3C_GPIO_END + 9); err_out: return ret; @@ -269,7 +268,7 @@ static void __exit h1940_exit(void) platform_device_unregister(s3c24xx_snd_device); snd_soc_jack_free_gpios(&hp_jack, ARRAY_SIZE(hp_jack_gpios), hp_jack_gpios); - gpio_free(H1940_LATCH_AUDIO_POWER); + gpio_free(S3C_GPIO_END + 9); } module_init(h1940_init);