[PATCH] sh-pfc: Remove dependency on GPIOLIB

[PATCH] sh-pfc: Remove dependency on GPIOLIB

[Laurent Pinchart]

Make GPIO support optional for platforms that don't support GPIOLIB.

Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
---
 drivers/pinctrl/sh-pfc/Kconfig  | 2 --
 drivers/pinctrl/sh-pfc/core.h   | 1 +
 drivers/pinctrl/sh-pfc/sh_pfc.h | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/drivers/pinctrl/sh-pfc/Kconfig b/drivers/pinctrl/sh-pfc/Kconfig
index 0e1f99c..3520088 100644
--- a/drivers/pinctrl/sh-pfc/Kconfig
+++ b/drivers/pinctrl/sh-pfc/Kconfig
@@ -5,8 +5,6 @@
 if ARCH_SHMOBILE || SUPERH
 
 config PINCTRL_SH_PFC
-	# XXX move off the gpio dependency
-	depends on GENERIC_GPIO
 	select GPIO_SH_PFC if ARCH_REQUIRE_GPIOLIB
 	select PINMUX
 	select PINCONF
diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h
index 89cb428..6b735b7 100644
--- a/drivers/pinctrl/sh-pfc/core.h
+++ b/drivers/pinctrl/sh-pfc/core.h
@@ -11,6 +11,7 @@
 #define __SH_PFC_CORE_H__
 
 #include <linux/compiler.h>
+#include <linux/spinlock.h>
 #include <linux/types.h>
 
 #include "sh_pfc.h"
diff --git a/drivers/pinctrl/sh-pfc/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h
index 3b785fc..b170761 100644
--- a/drivers/pinctrl/sh-pfc/sh_pfc.h
+++ b/drivers/pinctrl/sh-pfc/sh_pfc.h
@@ -11,8 +11,8 @@
 #ifndef __SH_PFC_H
 #define __SH_PFC_H
 
+#include <linux/bug.h>
 #include <linux/stringify.h>
-#include <asm-generic/gpio.h>
 
 typedef unsigned short pinmux_enum_t;
 
-- 
Regards,

Laurent Pinchart

Re: [PATCH] sh-pfc: Remove dependency on GPIOLIB

[Linus Walleij]

On Tue, Apr 9, 2013 at 4:06 PM, Laurent Pinchart
<laurent.pinchart+renesas@ideasonboard.com> wrote:

> Make GPIO support optional for platforms that don't support GPIOLIB.
>
> Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>

Acked-by: Linus Walleij <linus.walleij@linaro.org>

Just guessing this needs to go into Simon's tree?

Tell me if I should apply it to the pinctrl tree.

Yours,
Linus Walleij

Re: [PATCH] sh-pfc: Remove dependency on GPIOLIB

[Laurent Pinchart]

Hi Linus,

On Wednesday 10 April 2013 22:03:56 Linus Walleij wrote:
> On Tue, Apr 9, 2013 at 4:06 PM, Laurent Pinchart
> 
> <laurent.pinchart+renesas@ideasonboard.com> wrote:
> > Make GPIO support optional for platforms that don't support GPIOLIB.
> > 
> > Signed-off-by: Laurent Pinchart
> > <laurent.pinchart+renesas@ideasonboard.com>
> 
> Acked-by: Linus Walleij <linus.walleij@linaro.org>
> 
> Just guessing this needs to go into Simon's tree?
> 
> Tell me if I should apply it to the pinctrl tree.

It will go through Simon's tree, yes.

-- 
Regards,

Laurent Pinchart

Re: [PATCH] sh-pfc: Remove dependency on GPIOLIB

[Simon Horman]

On Wed, Apr 10, 2013 at 10:04:46PM +0200, Laurent Pinchart wrote:
> Hi Linus,
> 
> On Wednesday 10 April 2013 22:03:56 Linus Walleij wrote:
> > On Tue, Apr 9, 2013 at 4:06 PM, Laurent Pinchart
> > 
> > <laurent.pinchart+renesas@ideasonboard.com> wrote:
> > > Make GPIO support optional for platforms that don't support GPIOLIB.
> > > 
> > > Signed-off-by: Laurent Pinchart
> > > <laurent.pinchart+renesas@ideasonboard.com>
> > 
> > Acked-by: Linus Walleij <linus.walleij@linaro.org>
> > 
> > Just guessing this needs to go into Simon's tree?
> > 
> > Tell me if I should apply it to the pinctrl tree.
> 
> It will go through Simon's tree, yes.

Thanks. I have queued this up for v3.11 in the pinmux branch
of my renesas tree. I expect it to appear in linux-next in
the not to distant future.