From: ben-linux@fluff.org (Ben Dooks)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 05/15] ARM: S5P6442: Change to using s3c_gpio_cfgpin_range()
Date: Fri, 28 May 2010 06:56:42 +0100 [thread overview]
Message-ID: <1275026212-27510-6-git-send-email-ben-linux@fluff.org> (raw)
In-Reply-To: <1275026212-27510-1-git-send-email-ben-linux@fluff.org>
Change the code setting ranges of GPIO pins using s3c_gpio_cfgpin() to
use the recently introduced s3c_gpio_cfgpin_range().
Signed-off-by: Ben Dooks <ben-linux@fluff.org>
---
arch/arm/mach-s5p6442/dev-audio.c | 30 ++++++++++--------------------
arch/arm/mach-s5p6442/dev-spi.c | 4 +---
2 files changed, 11 insertions(+), 23 deletions(-)
diff --git a/arch/arm/mach-s5p6442/dev-audio.c b/arch/arm/mach-s5p6442/dev-audio.c
index cb801e1..0e57caf 100644
--- a/arch/arm/mach-s5p6442/dev-audio.c
+++ b/arch/arm/mach-s5p6442/dev-audio.c
@@ -21,22 +21,16 @@
static int s5p6442_cfg_i2s(struct platform_device *pdev)
{
+ unsigned int base;
+
/* configure GPIO for i2s port */
switch (pdev->id) {
case 1:
- s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(2));
+ base = S5P6442_GPC1(0);
break;
case -1:
- s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(2));
+ base = S5P6442_GPC0(0);
break;
default:
@@ -44,6 +38,7 @@ static int s5p6442_cfg_i2s(struct platform_device *pdev)
return -EINVAL;
}
+ s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(2));
return 0;
}
@@ -111,21 +106,15 @@ struct platform_device s5p6442_device_iis1 = {
static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)
{
+ unsigned int base;
+
switch (pdev->id) {
case 0:
- s3c_gpio_cfgpin(S5P6442_GPC0(0), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC0(1), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC0(2), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC0(3), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC0(4), S3C_GPIO_SFN(3));
+ base = S5P6442_GPC0(0);
break;
case 1:
- s3c_gpio_cfgpin(S5P6442_GPC1(0), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC1(1), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC1(2), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC1(3), S3C_GPIO_SFN(3));
- s3c_gpio_cfgpin(S5P6442_GPC1(4), S3C_GPIO_SFN(3));
+ base = S5P6442_GPC1(0);
break;
default:
@@ -133,6 +122,7 @@ static int s5p6442_pcm_cfg_gpio(struct platform_device *pdev)
return -EINVAL;
}
+ s3c_gpio_cfgpin_range(base, 5, S3C_GPIO_SFN(3));
return 0;
}
diff --git a/arch/arm/mach-s5p6442/dev-spi.c b/arch/arm/mach-s5p6442/dev-spi.c
index 3019952..1c5c170 100644
--- a/arch/arm/mach-s5p6442/dev-spi.c
+++ b/arch/arm/mach-s5p6442/dev-spi.c
@@ -37,9 +37,7 @@ static int s5p6442_spi_cfg_gpio(struct platform_device *pdev)
{
switch (pdev->id) {
case 0:
- s3c_gpio_cfgpin(S5P6442_GPB(0), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPB(2), S3C_GPIO_SFN(2));
- s3c_gpio_cfgpin(S5P6442_GPB(3), S3C_GPIO_SFN(2));
+ s3c_gpio_cfgpin_range(S5P6442_GPB(0), 4, S3C_GPIO_SFN(2));
s3c_gpio_setpull(S5P6442_GPB(0), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6442_GPB(2), S3C_GPIO_PULL_UP);
s3c_gpio_setpull(S5P6442_GPB(3), S3C_GPIO_PULL_UP);
--
1.6.3.3
next prev parent reply other threads:[~2010-05-28 5:56 UTC|newest]
Thread overview: 22+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-05-28 5:56 GPIO updates for -next Ben Dooks
2010-05-28 5:56 ` [PATCH 01/15] ARM: SAMSUNG: Add GPIO configuration for a range of pins Ben Dooks
2010-05-28 9:53 ` Sergei Shtylyov
2010-05-28 5:56 ` [PATCH 02/15] ARM: S3C64XX: Change dev-audio.c to use S3C_GPIO_SFN() for special functions Ben Dooks
2010-05-28 5:56 ` [PATCH 03/15] ARM: S3C64XX: Change to using s3c_gpio_cfgpin_range() Ben Dooks
2010-05-28 5:56 ` [PATCH 04/15] ARM: S5P6440: " Ben Dooks
2010-05-28 5:56 ` Ben Dooks [this message]
2010-05-28 6:24 ` [PATCH 05/15] ARM: S5P6442: " Kyungmin Park
2010-05-28 6:35 ` Ben Dooks
2010-05-31 1:09 ` Ben Dooks
2010-05-31 1:18 ` Kyungmin Park
2010-05-28 5:56 ` [PATCH 06/15] ARM: S5PC100: " Ben Dooks
2010-05-28 5:56 ` [PATCH 07/15] ARM: S5PV210: " Ben Dooks
2010-05-28 5:56 ` [PATCH 08/15] ARM: SAMSUNG: Add s3c_gpio_cfgall_range() function Ben Dooks
2010-05-28 9:56 ` Sergei Shtylyov
2010-05-28 5:56 ` [PATCH 09/15] ARM: S3C64XX: Change to using s3c_gpio_cfgall_range() Ben Dooks
2010-05-28 5:56 ` [PATCH 10/15] ARM: S5PC100: " Ben Dooks
2010-05-28 5:56 ` [PATCH 11/15] ARM: S5PV210: " Ben Dooks
2010-05-28 5:56 ` [PATCH 12/15] ARM: SAMSUNG: Add s3c_gpio_cfgrange_nopull() helper Ben Dooks
2010-05-28 5:56 ` [PATCH 13/15] ARM: S3C64XX: Change to using s3c_gpio_cfgrange_nopull() Ben Dooks
2010-05-28 5:56 ` [PATCH 14/15] ARM: S5PC100: " Ben Dooks
2010-05-28 5:56 ` [PATCH 15/15] ARM: S5PV210: " Ben Dooks
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1275026212-27510-6-git-send-email-ben-linux@fluff.org \
--to=ben-linux@fluff.org \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).