diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-16 12:46:07 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2013-08-16 15:58:33 +0200 |
commit | 8c1180c3eda1c4c50ffa31fdd6a764026ce51a65 (patch) | |
tree | 27bc7479db693bb892b5b248c3810dab8f9e5f45 /arch/arm | |
parent | 1068e0a545a72fcdf329481d94f615dd00498786 (diff) | |
download | barebox-8c1180c3eda1c4c50ffa31fdd6a764026ce51a65.tar.gz barebox-8c1180c3eda1c4c50ffa31fdd6a764026ce51a65.tar.xz |
ARM: remove include of mach/gpio.h for gpiolib users
gpiolib user have nothing to define in their machine
specific gpio.h, so do not include it.
The only thing they could define would be ARCH_NR_GPIOS,
but currently no architecture defines it. Should an architecure
feel the need to do it this would be a good opportunity to
get rid of this limitation.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm')
-rw-r--r-- | arch/arm/include/asm/gpio.h | 5 | ||||
-rw-r--r-- | arch/arm/mach-bcm2835/include/mach/gpio.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-clps711x/include/mach/gpio.h | 3 | ||||
-rw-r--r-- | arch/arm/mach-highbank/include/mach/gpio.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-imx/include/mach/gpio.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-mvebu/include/mach/gpio.h | 6 | ||||
-rw-r--r-- | arch/arm/mach-omap/include/mach/gpio.h | 1 | ||||
-rw-r--r-- | arch/arm/mach-tegra/include/mach/gpio.h | 1 |
8 files changed, 4 insertions, 20 deletions
diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h index 166a7a3e28..b3c1efe739 100644 --- a/arch/arm/include/asm/gpio.h +++ b/arch/arm/include/asm/gpio.h @@ -1,7 +1,10 @@ #ifndef _ARCH_ARM_GPIO_H #define _ARCH_ARM_GPIO_H -/* not all ARM platforms necessarily support this API ... */ +#ifndef CONFIG_GPIOLIB #include <mach/gpio.h> +#else +#include <asm-generic/gpio.h> +#endif #endif /* _ARCH_ARM_GPIO_H */ diff --git a/arch/arm/mach-bcm2835/include/mach/gpio.h b/arch/arm/mach-bcm2835/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-bcm2835/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-clps711x/include/mach/gpio.h b/arch/arm/mach-clps711x/include/mach/gpio.h deleted file mode 100644 index 3428fe54bb..0000000000 --- a/arch/arm/mach-clps711x/include/mach/gpio.h +++ /dev/null @@ -1,3 +0,0 @@ -#include <asm-generic/gpio.h> - -#define CLPS711X_GPIO(prt,bit) ((prt) * 8 + (bit)) diff --git a/arch/arm/mach-highbank/include/mach/gpio.h b/arch/arm/mach-highbank/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-highbank/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-imx/include/mach/gpio.h b/arch/arm/mach-imx/include/mach/gpio.h deleted file mode 100644 index fee693e557..0000000000 --- a/arch/arm/mach-imx/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include <asm-generic/gpio.h> - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-mvebu/include/mach/gpio.h b/arch/arm/mach-mvebu/include/mach/gpio.h deleted file mode 100644 index fee693e557..0000000000 --- a/arch/arm/mach-mvebu/include/mach/gpio.h +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef __ASM_ARCH_GPIO_H -#define __ASM_ARCH_GPIO_H - -#include <asm-generic/gpio.h> - -#endif /* __ASM_ARCH_GPIO_H */ diff --git a/arch/arm/mach-omap/include/mach/gpio.h b/arch/arm/mach-omap/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-omap/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> diff --git a/arch/arm/mach-tegra/include/mach/gpio.h b/arch/arm/mach-tegra/include/mach/gpio.h deleted file mode 100644 index 306ab4c9f2..0000000000 --- a/arch/arm/mach-tegra/include/mach/gpio.h +++ /dev/null @@ -1 +0,0 @@ -#include <asm-generic/gpio.h> |