* [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition
@ 2013-07-29 19:33 Laurent Pinchart
2013-07-30 0:02 ` Simon Horman
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Laurent Pinchart @ 2013-07-29 19:33 UTC (permalink / raw)
To: linux-sh
The total number of SoC GPIOs is only used to compute the base GPIO
number of th PCF8575 GPIO extender on the KZM9G board. As GPIO
allocation became fully dynamic with DT, no other SH73A0 board will use
the GPIO_NR macro. Move it to the KZM9G board file.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
arch/arm/mach-shmobile/board-kzm9g.c | 16 ++++++++--------
arch/arm/mach-shmobile/include/mach/sh73a0.h | 2 --
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
index 1068120..f199496 100644
--- a/arch/arm/mach-shmobile/board-kzm9g.c
+++ b/arch/arm/mach-shmobile/board-kzm9g.c
@@ -54,14 +54,14 @@
/*
* external GPIO
*/
-#define GPIO_PCF8575_BASE (GPIO_NR)
-#define GPIO_PCF8575_PORT10 (GPIO_NR + 8)
-#define GPIO_PCF8575_PORT11 (GPIO_NR + 9)
-#define GPIO_PCF8575_PORT12 (GPIO_NR + 10)
-#define GPIO_PCF8575_PORT13 (GPIO_NR + 11)
-#define GPIO_PCF8575_PORT14 (GPIO_NR + 12)
-#define GPIO_PCF8575_PORT15 (GPIO_NR + 13)
-#define GPIO_PCF8575_PORT16 (GPIO_NR + 14)
+#define GPIO_PCF8575_BASE (310)
+#define GPIO_PCF8575_PORT10 (GPIO_PCF8575_BASE + 8)
+#define GPIO_PCF8575_PORT11 (GPIO_PCF8575_BASE + 9)
+#define GPIO_PCF8575_PORT12 (GPIO_PCF8575_BASE + 10)
+#define GPIO_PCF8575_PORT13 (GPIO_PCF8575_BASE + 11)
+#define GPIO_PCF8575_PORT14 (GPIO_PCF8575_BASE + 12)
+#define GPIO_PCF8575_PORT15 (GPIO_PCF8575_BASE + 13)
+#define GPIO_PCF8575_PORT16 (GPIO_PCF8575_BASE + 14)
/* Dummy supplies, where voltage doesn't matter */
static struct regulator_consumer_supply dummy_supplies[] = {
diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
index 680dc5f..359b582 100644
--- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
+++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
@@ -1,8 +1,6 @@
#ifndef __ASM_SH73A0_H__
#define __ASM_SH73A0_H__
-#define GPIO_NR 310
-
/* DMA slave IDs */
enum {
SHDMA_SLAVE_INVALID,
--
Regards,
Laurent Pinchart
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition
2013-07-29 19:33 [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition Laurent Pinchart
@ 2013-07-30 0:02 ` Simon Horman
2013-07-30 0:52 ` Kuninori Morimoto
2013-08-05 7:43 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-07-30 0:02 UTC (permalink / raw)
To: linux-sh
On Mon, Jul 29, 2013 at 09:33:54PM +0200, Laurent Pinchart wrote:
> The total number of SoC GPIOs is only used to compute the base GPIO
> number of th PCF8575 GPIO extender on the KZM9G board. As GPIO
> allocation became fully dynamic with DT, no other SH73A0 board will use
> the GPIO_NR macro. Move it to the KZM9G board file.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
I am happy with this.
But I will wait to give others a chance to review it before
queueing it up.
> ---
> arch/arm/mach-shmobile/board-kzm9g.c | 16 ++++++++--------
> arch/arm/mach-shmobile/include/mach/sh73a0.h | 2 --
> 2 files changed, 8 insertions(+), 10 deletions(-)
>
> diff --git a/arch/arm/mach-shmobile/board-kzm9g.c b/arch/arm/mach-shmobile/board-kzm9g.c
> index 1068120..f199496 100644
> --- a/arch/arm/mach-shmobile/board-kzm9g.c
> +++ b/arch/arm/mach-shmobile/board-kzm9g.c
> @@ -54,14 +54,14 @@
> /*
> * external GPIO
> */
> -#define GPIO_PCF8575_BASE (GPIO_NR)
> -#define GPIO_PCF8575_PORT10 (GPIO_NR + 8)
> -#define GPIO_PCF8575_PORT11 (GPIO_NR + 9)
> -#define GPIO_PCF8575_PORT12 (GPIO_NR + 10)
> -#define GPIO_PCF8575_PORT13 (GPIO_NR + 11)
> -#define GPIO_PCF8575_PORT14 (GPIO_NR + 12)
> -#define GPIO_PCF8575_PORT15 (GPIO_NR + 13)
> -#define GPIO_PCF8575_PORT16 (GPIO_NR + 14)
> +#define GPIO_PCF8575_BASE (310)
> +#define GPIO_PCF8575_PORT10 (GPIO_PCF8575_BASE + 8)
> +#define GPIO_PCF8575_PORT11 (GPIO_PCF8575_BASE + 9)
> +#define GPIO_PCF8575_PORT12 (GPIO_PCF8575_BASE + 10)
> +#define GPIO_PCF8575_PORT13 (GPIO_PCF8575_BASE + 11)
> +#define GPIO_PCF8575_PORT14 (GPIO_PCF8575_BASE + 12)
> +#define GPIO_PCF8575_PORT15 (GPIO_PCF8575_BASE + 13)
> +#define GPIO_PCF8575_PORT16 (GPIO_PCF8575_BASE + 14)
>
> /* Dummy supplies, where voltage doesn't matter */
> static struct regulator_consumer_supply dummy_supplies[] = {
> diff --git a/arch/arm/mach-shmobile/include/mach/sh73a0.h b/arch/arm/mach-shmobile/include/mach/sh73a0.h
> index 680dc5f..359b582 100644
> --- a/arch/arm/mach-shmobile/include/mach/sh73a0.h
> +++ b/arch/arm/mach-shmobile/include/mach/sh73a0.h
> @@ -1,8 +1,6 @@
> #ifndef __ASM_SH73A0_H__
> #define __ASM_SH73A0_H__
>
> -#define GPIO_NR 310
> -
> /* DMA slave IDs */
> enum {
> SHDMA_SLAVE_INVALID,
> --
> Regards,
>
> Laurent Pinchart
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-sh" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition
2013-07-29 19:33 [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition Laurent Pinchart
2013-07-30 0:02 ` Simon Horman
@ 2013-07-30 0:52 ` Kuninori Morimoto
2013-08-05 7:43 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Kuninori Morimoto @ 2013-07-30 0:52 UTC (permalink / raw)
To: linux-sh
Hi
> On Mon, Jul 29, 2013 at 09:33:54PM +0200, Laurent Pinchart wrote:
> > The total number of SoC GPIOs is only used to compute the base GPIO
> > number of th PCF8575 GPIO extender on the KZM9G board. As GPIO
> > allocation became fully dynamic with DT, no other SH73A0 board will use
> > the GPIO_NR macro. Move it to the KZM9G board file.
> >
> > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
>
> I am happy with this.
> But I will wait to give others a chance to review it before
> queueing it up.
This patch looks good to me
Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Best regards
---
Kuninori Morimoto
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition
2013-07-29 19:33 [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition Laurent Pinchart
2013-07-30 0:02 ` Simon Horman
2013-07-30 0:52 ` Kuninori Morimoto
@ 2013-08-05 7:43 ` Simon Horman
2 siblings, 0 replies; 4+ messages in thread
From: Simon Horman @ 2013-08-05 7:43 UTC (permalink / raw)
To: linux-sh
On Mon, Jul 29, 2013 at 05:52:42PM -0700, Kuninori Morimoto wrote:
>
> Hi
>
> > On Mon, Jul 29, 2013 at 09:33:54PM +0200, Laurent Pinchart wrote:
> > > The total number of SoC GPIOs is only used to compute the base GPIO
> > > number of th PCF8575 GPIO extender on the KZM9G board. As GPIO
> > > allocation became fully dynamic with DT, no other SH73A0 board will use
> > > the GPIO_NR macro. Move it to the KZM9G board file.
> > >
> > > Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
> >
> > I am happy with this.
> > But I will wait to give others a chance to review it before
> > queueing it up.
>
> This patch looks good to me
>
> Acked-by: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com>
Thanks, I have queued this up for v3.12 in the cleanup4 branch.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2013-08-05 7:43 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-29 19:33 [PATCH] ARM: shmobile: sh73a0: Remove global GPIO_NR definition Laurent Pinchart
2013-07-30 0:02 ` Simon Horman
2013-07-30 0:52 ` Kuninori Morimoto
2013-08-05 7:43 ` Simon Horman
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).