From: ben-linux@fluff•org (Ben Dooks)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCH] Fix GPIOs bank H and J not being preserved during suspend
Date: Thu, 4 Mar 2010 23:21:15 +0000 [thread overview]
Message-ID: <20100304232115.GB31126@trinity.fluff.org> (raw)
In-Reply-To: <1267599637-9283-1-git-send-email-chripell@fsfe.org>
On Wed, Mar 03, 2010 at 08:00:37AM +0100, Christian Pellegrin wrote:
> This patch adds bank H and J GPIOs (present on S3C244X CPUs) to the list
> of registers that must be saved/resumed during suspend.
>
> Signed-off-by: Christian Pellegrin <chripell@fsfe•org>
> ---
> arch/arm/mach-s3c2410/include/mach/gpio-core.h | 5 +++++
> arch/arm/plat-s3c/pm-gpio.c | 4 ++--
> 2 files changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/mach-s3c2410/include/mach/gpio-core.h b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
> index f8b879a..de9697c 100644
> --- a/arch/arm/mach-s3c2410/include/mach/gpio-core.h
> +++ b/arch/arm/mach-s3c2410/include/mach/gpio-core.h
> @@ -24,8 +24,13 @@ static inline struct s3c_gpio_chip *s3c_gpiolib_getchip(unsigned int pin)
> {
> struct s3c_gpio_chip *chip;
>
> +#ifdef CONFIG_CPU_S3C244X
> + if (pin > S3C2410_GPJ(15))
> + return NULL;
> +#else
Hmm, could we use the arch define for number of GPIOs here instead
of an ifdef?
if (pin > S3C2410_GPG(10))
> return NULL;
> +#endif
>
> chip = &s3c24xx_gpios[pin/32];
> return (S3C2410_GPIO_OFFSET(pin) < chip->chip.ngpio) ? chip : NULL;
> diff --git a/arch/arm/plat-s3c/pm-gpio.c b/arch/arm/plat-s3c/pm-gpio.c
> index cfd326a..b3cc8db 100644
> --- a/arch/arm/plat-s3c/pm-gpio.c
> +++ b/arch/arm/plat-s3c/pm-gpio.c
> @@ -343,7 +343,7 @@ void s3c_pm_save_gpios(void)
> ourchip->pm_save[2],
> ourchip->pm_save[3]);
>
> - gpio_nr += ourchip->chip.ngpio;
> + gpio_nr += ourchip->chip.ngpio - 1;
> gpio_nr += CONFIG_S3C_GPIO_SPACE;
> }
> }
> @@ -374,7 +374,7 @@ void s3c_pm_restore_gpios(void)
>
> s3c_pm_resume_gpio(ourchip);
>
> - gpio_nr += ourchip->chip.ngpio;
> + gpio_nr += ourchip->chip.ngpio - 1;
> gpio_nr += CONFIG_S3C_GPIO_SPACE;
> }
> }
> --
> 1.5.6.5
>
>
> _______________________________________________
> linux-arm-kernel mailing list
> linux-arm-kernel at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
--
--
Ben
Q: What's a light-year?
A: One-third less calories than a regular year.
next prev parent reply other threads:[~2010-03-04 23:21 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-03-02 16:05 [PATCH] This patch adds support for GPIO bank J present on S3C244X CPUs. It Christian Pellegrin
2010-03-02 16:11 ` christian pellegrin
2010-03-02 16:11 ` [PATCH resend v2.6.33] Fix support for banks H and J on S3C244X CPUs Christian Pellegrin
2010-03-02 21:54 ` [PATCH] This patch adds support for GPIO bank J present on S3C244X CPUs. It Ben Dooks
2010-03-03 6:58 ` christian pellegrin
2010-03-03 7:00 ` [PATCH] Adds support for banks H and J on S3C244X CPUs Christian Pellegrin
2010-03-03 8:24 ` omap gpio help doron
2010-03-03 7:00 ` [PATCH] Fix GPIOs bank H and J not being preserved during suspend Christian Pellegrin
2010-03-04 23:21 ` Ben Dooks [this message]
2010-03-08 11:17 ` christian pellegrin
2010-03-08 11:21 ` [PATCH v2] " Christian Pellegrin
2010-03-08 15:55 ` Ben Dooks
2010-03-08 16:14 ` christian pellegrin
2010-03-08 16:16 ` Ben Dooks
2010-03-12 7:25 ` christian pellegrin
2010-03-12 7:28 ` [PATCH v2] Fix GPIOs banks " Christian Pellegrin
2010-03-12 7:29 ` [PATCH v2] Fix one-too-much bug when building list of regs to be preserved on PM Christian Pellegrin
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=20100304232115.GB31126@trinity.fluff.org \
--to=ben-linux@fluff$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
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