diff options
author | Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com> | 2012-12-15 23:51:55 +0100 |
---|---|---|
committer | Simon Horman <horms+renesas@verge.net.au> | 2013-01-25 09:24:31 +0900 |
commit | c3323806a67c0c656e27956b7340e37ba6c6968b (patch) | |
tree | d4a0fb474386ba456dbed6ccbd82f6ea8891f151 | |
parent | b93911e3d59bcd665a810fdf8ec7040a74eb4ff4 (diff) | |
download | op-kernel-dev-c3323806a67c0c656e27956b7340e37ba6c6968b.zip op-kernel-dev-c3323806a67c0c656e27956b7340e37ba6c6968b.tar.gz |
sh-pfc: Move sh_pfc.h from include/linux/ to driver directory
The header file isn't used by arch code anymore. Make it private to the
driver.
Signed-off-by: Laurent Pinchart <laurent.pinchart+renesas@ideasonboard.com>
Acked-by: Paul Mundt <lethal@linux-sh.org>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
-rw-r--r-- | drivers/pinctrl/sh-pfc/core.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/core.h | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/gpio.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7740.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-r8a7779.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7203.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7264.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7269.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7372.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh73a0.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7720.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7722.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7723.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7724.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7734.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7757.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7785.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-sh7786.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pfc-shx3.c | 3 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/pinctrl.c | 1 | ||||
-rw-r--r-- | drivers/pinctrl/sh-pfc/sh_pfc.h (renamed from include/linux/sh_pfc.h) | 0 |
21 files changed, 34 insertions, 20 deletions
diff --git a/drivers/pinctrl/sh-pfc/core.c b/drivers/pinctrl/sh-pfc/core.c index 33181f4..d323c24f 100644 --- a/drivers/pinctrl/sh-pfc/core.c +++ b/drivers/pinctrl/sh-pfc/core.c @@ -21,7 +21,6 @@ #include <linux/module.h> #include <linux/pinctrl/machine.h> #include <linux/platform_device.h> -#include <linux/sh_pfc.h> #include <linux/slab.h> #include "core.h" diff --git a/drivers/pinctrl/sh-pfc/core.h b/drivers/pinctrl/sh-pfc/core.h index 8040826..ba7c33c 100644 --- a/drivers/pinctrl/sh-pfc/core.h +++ b/drivers/pinctrl/sh-pfc/core.h @@ -11,9 +11,10 @@ #define __SH_PFC_CORE_H__ #include <linux/compiler.h> -#include <linux/sh_pfc.h> #include <linux/types.h> +#include "sh_pfc.h" + struct sh_pfc_window { phys_addr_t phys; void __iomem *virt; diff --git a/drivers/pinctrl/sh-pfc/gpio.c b/drivers/pinctrl/sh-pfc/gpio.c index 3cbdfea..a535075 100644 --- a/drivers/pinctrl/sh-pfc/gpio.c +++ b/drivers/pinctrl/sh-pfc/gpio.c @@ -16,7 +16,6 @@ #include <linux/init.h> #include <linux/module.h> #include <linux/pinctrl/consumer.h> -#include <linux/sh_pfc.h> #include <linux/slab.h> #include <linux/spinlock.h> diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c index 0ab4cb6..214788c 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7740.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7740.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <mach/r8a7740.h> #include <mach/irqs.h> +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx), \ PORT_10(fn, pfx##10, sfx), PORT_90(fn, pfx##1, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c index 8147172..13feaa0 100644 --- a/drivers/pinctrl/sh-pfc/pfc-r8a7779.c +++ b/drivers/pinctrl/sh-pfc/pfc-r8a7779.c @@ -19,9 +19,10 @@ */ #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <mach/r8a7779.h> +#include "sh_pfc.h" + #define CPU_32_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7203.c b/drivers/pinctrl/sh-pfc/pfc-sh7203.c index 62bd173..01b425d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7203.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7203.c @@ -10,9 +10,10 @@ #include <linux/kernel.h> #include <linux/gpio.h> -#include <linux/sh_pfc.h> #include <cpu/sh7203.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7264.c b/drivers/pinctrl/sh-pfc/pfc-sh7264.c index 03d3f9c..2ba5639 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7264.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7264.c @@ -10,9 +10,10 @@ #include <linux/kernel.h> #include <linux/gpio.h> -#include <linux/sh_pfc.h> #include <cpu/sh7264.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7269.c b/drivers/pinctrl/sh-pfc/pfc-sh7269.c index dab04d4..b1b5d6d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7269.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7269.c @@ -11,9 +11,10 @@ #include <linux/kernel.h> #include <linux/gpio.h> -#include <linux/sh_pfc.h> #include <cpu/sh7269.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7372.c b/drivers/pinctrl/sh-pfc/pfc-sh7372.c index a52fabe..d44e7f0 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7372.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7372.c @@ -21,10 +21,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <mach/irqs.h> #include <mach/sh7372.h> +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_90(fn, pfx, sfx), \ PORT_10(fn, pfx##10, sfx), PORT_10(fn, pfx##11, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c index 8a0eee9..709008e 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh73a0.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh73a0.c @@ -19,10 +19,11 @@ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA */ #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <mach/sh73a0.h> #include <mach/irqs.h> +#include "sh_pfc.h" + #define CPU_ALL_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_10(fn, pfx##3, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7720.c b/drivers/pinctrl/sh-pfc/pfc-sh7720.c index 20d0577..10872ed 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7720.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7720.c @@ -10,9 +10,10 @@ #include <linux/kernel.h> #include <linux/gpio.h> -#include <linux/sh_pfc.h> #include <cpu/sh7720.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7722.c b/drivers/pinctrl/sh-pfc/pfc-sh7722.c index f58f009..2de0929 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7722.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7722.c @@ -1,9 +1,10 @@ #include <linux/init.h> #include <linux/kernel.h> #include <linux/gpio.h> -#include <linux/sh_pfc.h> #include <cpu/sh7722.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7723.c b/drivers/pinctrl/sh-pfc/pfc-sh7723.c index fa3d36b..609673d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7723.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7723.c @@ -10,9 +10,10 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7723.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7724.c b/drivers/pinctrl/sh-pfc/pfc-sh7724.c index 7ad72c20..233fbf7 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7724.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7724.c @@ -15,9 +15,10 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7724.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7734.c b/drivers/pinctrl/sh-pfc/pfc-sh7734.c index cbb5f4c..23d76d2 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7734.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7734.c @@ -10,9 +10,10 @@ */ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7734.h> +#include "sh_pfc.h" + #define CPU_32_PORT(fn, pfx, sfx) \ PORT_10(fn, pfx, sfx), PORT_10(fn, pfx##1, sfx), \ PORT_10(fn, pfx##2, sfx), PORT_1(fn, pfx##30, sfx), \ diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7757.c b/drivers/pinctrl/sh-pfc/pfc-sh7757.c index 6f707a0..5ed74cd 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7757.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7757.c @@ -15,9 +15,10 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7757.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7785.c b/drivers/pinctrl/sh-pfc/pfc-sh7785.c index 23f2c31..3b1825d 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7785.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7785.c @@ -10,9 +10,10 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7785.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-sh7786.c b/drivers/pinctrl/sh-pfc/pfc-sh7786.c index e1453cf..1e18b58 100644 --- a/drivers/pinctrl/sh-pfc/pfc-sh7786.c +++ b/drivers/pinctrl/sh-pfc/pfc-sh7786.c @@ -15,9 +15,10 @@ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/sh7786.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pfc-shx3.c b/drivers/pinctrl/sh-pfc/pfc-shx3.c index bd54042..ccf6918 100644 --- a/drivers/pinctrl/sh-pfc/pfc-shx3.c +++ b/drivers/pinctrl/sh-pfc/pfc-shx3.c @@ -9,9 +9,10 @@ */ #include <linux/init.h> #include <linux/kernel.h> -#include <linux/sh_pfc.h> #include <cpu/shx3.h> +#include "sh_pfc.h" + enum { PINMUX_RESERVED = 0, diff --git a/drivers/pinctrl/sh-pfc/pinctrl.c b/drivers/pinctrl/sh-pfc/pinctrl.c index fdfe7be..11e0e13 100644 --- a/drivers/pinctrl/sh-pfc/pinctrl.c +++ b/drivers/pinctrl/sh-pfc/pinctrl.c @@ -20,7 +20,6 @@ #include <linux/pinctrl/pinconf-generic.h> #include <linux/pinctrl/pinctrl.h> #include <linux/pinctrl/pinmux.h> -#include <linux/sh_pfc.h> #include <linux/slab.h> #include <linux/spinlock.h> diff --git a/include/linux/sh_pfc.h b/drivers/pinctrl/sh-pfc/sh_pfc.h index 13049c4..13049c4 100644 --- a/include/linux/sh_pfc.h +++ b/drivers/pinctrl/sh-pfc/sh_pfc.h |