From: kgene.kim@samsung.com (Kukjin Kim)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations
Date: Thu, 11 Aug 2011 20:47:18 +0900 [thread overview]
Message-ID: <017101cc581c$6e277530$4a765f90$%kim@samsung.com> (raw)
In-Reply-To: <E1QqhM1-0003af-U5@rmk-PC.arm.linux.org.uk>
Russell King - ARM Linux wrote:
>
> Consolidate 24 trivial gpiolib implementions out of mach/gpio.h
> into asm/gpio.h. This is basically the include of asm-generic/gpio.h
> and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep
> as described in Documentation/gpio.txt
>
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Kukjin Kim <kgene.kim@samsung.com>
on following Samsung stuff...
As a note, there were duplicated e-mail address Grant and Nicolas in Cc ;)
I just pushed 'reply all' :)
Thanks.
Best regards,
Kgene.
--
Kukjin Kim <kgene.kim@samsung.com>, Senior Engineer,
SW Solution Development Team, Samsung Electronics Co., Ltd.
> ---
> arch/arm/include/asm/gpio.h | 10 ++++++++++
...
> arch/arm/mach-exynos4/include/mach/gpio.h | 5 +----
...
> arch/arm/mach-s3c2410/include/mach/gpio.h | 5 +----
> arch/arm/mach-s3c64xx/include/mach/gpio.h | 6 +-----
> arch/arm/mach-s5p64x0/include/mach/gpio.h | 6 +-----
> arch/arm/mach-s5pc100/include/mach/gpio.h | 6 +-----
> arch/arm/mach-s5pv210/include/mach/gpio.h | 6 +-----
>
> diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
> index 166a7a3..15e8970 100644
> --- a/arch/arm/include/asm/gpio.h
> +++ b/arch/arm/include/asm/gpio.h
> @@ -4,4 +4,14 @@
> /* not all ARM platforms necessarily support this API ... */
> #include <mach/gpio.h>
>
> +#ifdef __ARM_GPIOLIB_TRIVIAL
> +/* Note: this may rely upon the value of ARCH_NR_GPIOS set in mach/gpio.h
*/
> +#include <asm-generic/gpio.h>
> +
> +/* The trivial gpiolib dispatchers */
> +#define gpio_get_value __gpio_get_value
> +#define gpio_set_value __gpio_set_value
> +#define gpio_cansleep __gpio_cansleep
> +#endif
> +
> #endif /* _ARCH_ARM_GPIO_H */
> diff --git a/arch/arm/mach-exynos4/include/mach/gpio.h b/arch/arm/mach-
> exynos4/include/mach/gpio.h
> index be9266b..b2e3595 100644
> --- a/arch/arm/mach-exynos4/include/mach/gpio.h
> +++ b/arch/arm/mach-exynos4/include/mach/gpio.h
> @@ -13,9 +13,6 @@
> #ifndef __ASM_ARCH_GPIO_H
> #define __ASM_ARCH_GPIO_H __FILE__
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> #define gpio_to_irq __gpio_to_irq
>
> /* Practically, GPIO banks up to GPZ are the configurable gpio banks */
> @@ -151,6 +148,6 @@ enum s5p_gpio_number {
> #define ARCH_NR_GPIOS
> (EXYNOS4_GPZ(EXYNOS4_GPIO_Z_NR) + \
> CONFIG_SAMSUNG_GPIO_EXTRA + 1)
>
> -#include <asm-generic/gpio.h>
> +#define __ARM_GPIOLIB_TRIVIAL
>
> #endif /* __ASM_ARCH_GPIO_H */
> diff --git a/arch/arm/mach-s3c2410/include/mach/gpio.h b/arch/arm/mach-
> s3c2410/include/mach/gpio.h
> index f7f6b07..998ef4c 100644
> --- a/arch/arm/mach-s3c2410/include/mach/gpio.h
> +++ b/arch/arm/mach-s3c2410/include/mach/gpio.h
> @@ -11,9 +11,7 @@
> * published by the Free Software Foundation.
> */
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> +#define __ARM_GPIOLIB_TRIVIAL
> #define gpio_to_irq __gpio_to_irq
>
> /* some boards require extra gpio capacity to support external
> @@ -28,7 +26,6 @@
> #define ARCH_NR_GPIOS (256 + CONFIG_S3C24XX_GPIO_EXTRA)
> #endif
>
> -#include <asm-generic/gpio.h>
> #include <mach/gpio-nrs.h>
> #include <mach/gpio-fns.h>
>
> diff --git a/arch/arm/mach-s3c64xx/include/mach/gpio.h b/arch/arm/mach-
> s3c64xx/include/mach/gpio.h
> index 0d46e99..6958b3f 100644
> --- a/arch/arm/mach-s3c64xx/include/mach/gpio.h
> +++ b/arch/arm/mach-s3c64xx/include/mach/gpio.h
> @@ -12,9 +12,7 @@
> * published by the Free Software Foundation.
> */
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> +#define __ARM_GPIOLIB_TRIVIAL
> #define gpio_to_irq __gpio_to_irq
>
> /* GPIO bank sizes */
> @@ -96,5 +94,3 @@ enum s3c_gpio_number {
> #define BOARD_NR_GPIOS 16
>
> #define ARCH_NR_GPIOS (GPIO_BOARD_START + BOARD_NR_GPIOS)
> -
> -#include <asm-generic/gpio.h>
> diff --git a/arch/arm/mach-s5p64x0/include/mach/gpio.h b/arch/arm/mach-
> s5p64x0/include/mach/gpio.h
> index adb5f29..a25160b 100644
> --- a/arch/arm/mach-s5p64x0/include/mach/gpio.h
> +++ b/arch/arm/mach-s5p64x0/include/mach/gpio.h
> @@ -13,9 +13,7 @@
> #ifndef __ASM_ARCH_GPIO_H
> #define __ASM_ARCH_GPIO_H __FILE__
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> +#define __ARM_GPIOLIB_TRIVIAL
> #define gpio_to_irq __gpio_to_irq
>
> /* GPIO bank sizes */
> @@ -134,6 +132,4 @@ enum s5p6450_gpio_number {
>
> #define ARCH_NR_GPIOS (S5P64X0_GPIO_END +
> CONFIG_SAMSUNG_GPIO_EXTRA)
>
> -#include <asm-generic/gpio.h>
> -
> #endif /* __ASM_ARCH_GPIO_H */
> diff --git a/arch/arm/mach-s5pc100/include/mach/gpio.h b/arch/arm/mach-
> s5pc100/include/mach/gpio.h
> index 29a8a12..f515bfb 100644
> --- a/arch/arm/mach-s5pc100/include/mach/gpio.h
> +++ b/arch/arm/mach-s5pc100/include/mach/gpio.h
> @@ -15,9 +15,7 @@
> #ifndef __ASM_ARCH_GPIO_H
> #define __ASM_ARCH_GPIO_H __FILE__
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> +#define __ARM_GPIOLIB_TRIVIAL
> #define gpio_to_irq __gpio_to_irq
>
> /* GPIO bank sizes */
> @@ -146,6 +144,4 @@ enum s5p_gpio_number {
> /* define the number of gpios we need to the one after the MP04() range
*/
> #define ARCH_NR_GPIOS (S5PC100_GPIO_END + 1)
>
> -#include <asm-generic/gpio.h>
> -
> #endif /* __ASM_ARCH_GPIO_H */
> diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-
> s5pv210/include/mach/gpio.h
> index a5a1e33..27f2139 100644
> --- a/arch/arm/mach-s5pv210/include/mach/gpio.h
> +++ b/arch/arm/mach-s5pv210/include/mach/gpio.h
> @@ -13,9 +13,7 @@
> #ifndef __ASM_ARCH_GPIO_H
> #define __ASM_ARCH_GPIO_H __FILE__
>
> -#define gpio_get_value __gpio_get_value
> -#define gpio_set_value __gpio_set_value
> -#define gpio_cansleep __gpio_cansleep
> +#define __ARM_GPIOLIB_TRIVIAL
> #define gpio_to_irq __gpio_to_irq
>
> /* Practically, GPIO banks up to MP03 are the configurable gpio banks */
> @@ -142,6 +140,4 @@ enum s5p_gpio_number {
> #define ARCH_NR_GPIOS
> (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \
> CONFIG_SAMSUNG_GPIO_EXTRA + 1)
>
> -#include <asm-generic/gpio.h>
> -
> #endif /* __ASM_ARCH_GPIO_H */
next prev parent reply other threads:[~2011-08-11 11:47 UTC|newest]
Thread overview: 35+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-09 8:04 [PATCH 00/13] Clean up mach/gpio.h headers Russell King - ARM Linux
2011-08-09 8:04 ` [PATCH 01/13] ARM: gpio: at91: remove redundant include of mach/gpio.h Russell King - ARM Linux
2011-08-09 8:05 ` [PATCH 02/13] ARM: gpio: convert includes of mach/gpio.h and asm/gpio.h to linux/gpio.h Russell King - ARM Linux
2011-08-09 8:05 ` [PATCH 03/13] ARM: gpio: omap: convert drivers to use asm/gpio.h rather than mach/gpio.h Russell King - ARM Linux
2011-08-29 18:20 ` Kevin Hilman
2011-08-09 8:05 ` [PATCH 04/13] ARM: gpio: at91: " Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 05/13] ARM: gpio: nomadik: " Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 06/13] ARM: gpio: davinci: " Russell King - ARM Linux
2011-08-09 12:06 ` Sergei Shtylyov
2011-08-09 19:45 ` Russell King - ARM Linux
2011-08-09 8:06 ` [PATCH 07/13] ARM: gpio: pnx4008: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 08/13] ARM: gpio: ixp2000: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 09/13] ARM: gpio: tegra: " Russell King - ARM Linux
2011-08-09 8:07 ` [PATCH 10/13] ARM: gpio: pxa: " Russell King - ARM Linux
2011-08-09 8:08 ` [PATCH 11/13] ARM: gpio: consolidate trivial gpiolib implementations Russell King - ARM Linux
2011-08-09 17:02 ` H Hartley Sweeten
2011-08-09 17:59 ` David Brown
2011-08-10 7:54 ` Linus Walleij
2011-08-11 11:47 ` Kukjin Kim [this message]
2011-08-11 15:08 ` Russell King - ARM Linux
2011-08-11 16:24 ` David Brown
2011-08-11 14:15 ` Felipe Balbi
2011-08-11 15:07 ` Russell King - ARM Linux
2011-08-11 18:50 ` Felipe Balbi
2011-08-12 5:54 ` Shawn Guo
2011-08-29 18:23 ` Kevin Hilman
2011-08-09 8:08 ` [PATCH 12/13] ARM: gpio: consolidate gpio_to_irq Russell King - ARM Linux
2011-08-11 11:58 ` Kukjin Kim
2011-08-09 8:08 ` [PATCH 13/13] ARM: gpio: make trivial GPIOLIB implementation the default Russell King - ARM Linux
2011-08-09 17:04 ` H Hartley Sweeten
2011-08-11 12:02 ` Kukjin Kim
2011-08-09 9:58 ` [PATCH 00/13] Clean up mach/gpio.h headers Jamie Iles
2011-08-09 21:00 ` Grant Likely
2011-08-09 21:32 ` Russell King - ARM Linux
2011-08-09 21:50 ` Grant Likely
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='017101cc581c$6e277530$4a765f90$%kim@samsung.com' \
--to=kgene.kim@samsung.com \
--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).