| From 076c833527deb3c60f9bad786f4011ec7f1ca4a0 Mon Sep 17 00:00:00 2001 |
| From: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> |
| Date: Tue, 9 Apr 2013 14:06:01 +0000 |
| Subject: sh-pfc: Remove dependency on GPIOLIB |
| |
| 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> |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| (cherry picked from commit bf9f0674e39ee2070d39c2bd2febef42c31b3fc0) |
| Signed-off-by: Simon Horman <horms+renesas@verge.net.au> |
| --- |
| 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 9f0217bc..a0b6bd0b 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 GPIOLIB |
| 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 ee4a4d6d..6ec746f0 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 3b785fc4..b1707612 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; |
| |
| -- |
| 1.8.4.3.gca3854a |
| |