mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Sascha Hauer <s.hauer@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH 8/8] ARM: remove include of mach/gpio.h for gpiolib users
Date: Sat, 17 Aug 2013 11:25:37 +0200	[thread overview]
Message-ID: <1376731537-12102-9-git-send-email-s.hauer@pengutronix.de> (raw)
In-Reply-To: <1376731537-12102-1-git-send-email-s.hauer@pengutronix.de>

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>
---
 arch/arm/include/asm/gpio.h                | 5 ++++-
 arch/arm/mach-bcm2835/include/mach/gpio.h  | 1 -
 arch/arm/mach-clps711x/include/mach/gpio.h | 3 ---
 arch/arm/mach-highbank/include/mach/gpio.h | 1 -
 arch/arm/mach-imx/include/mach/gpio.h      | 6 ------
 arch/arm/mach-mvebu/include/mach/gpio.h    | 6 ------
 arch/arm/mach-omap/include/mach/gpio.h     | 1 -
 arch/arm/mach-tegra/include/mach/gpio.h    | 1 -
 8 files changed, 4 insertions(+), 20 deletions(-)
 delete mode 100644 arch/arm/mach-bcm2835/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-clps711x/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-highbank/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-imx/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-mvebu/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-omap/include/mach/gpio.h
 delete mode 100644 arch/arm/mach-tegra/include/mach/gpio.h

diff --git a/arch/arm/include/asm/gpio.h b/arch/arm/include/asm/gpio.h
index 166a7a3..b3c1efe 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 306ab4c..0000000
--- 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 3428fe5..0000000
--- 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 306ab4c..0000000
--- 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 fee693e..0000000
--- 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 fee693e..0000000
--- 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 306ab4c..0000000
--- 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 306ab4c..0000000
--- a/arch/arm/mach-tegra/include/mach/gpio.h
+++ /dev/null
@@ -1 +0,0 @@
-#include <asm-generic/gpio.h>
-- 
1.8.4.rc2


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

      parent reply	other threads:[~2013-08-17  9:26 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-17  9:25 [PATCH] cleanup gpio includes Sascha Hauer
2013-08-17  9:25 ` [PATCH 1/8] ARM: AT91: Add missing include Sascha Hauer
2013-08-17  9:25 ` [PATCH 2/8] ARM: include <gpio.h> instead of <mach/gpio.h> Sascha Hauer
2013-08-17  9:25 ` [PATCH 3/8] ARM: i.MX23: Fix double include protection Sascha Hauer
2013-08-17  9:25 ` [PATCH 4/8] ARM: AT91: move iomux definitions to iomux.h Sascha Hauer
2013-08-17  9:25 ` [PATCH 5/8] ARM: MXS: " Sascha Hauer
2013-08-17  9:25 ` [PATCH 6/8] ARM: Samsung: " Sascha Hauer
2013-08-17  9:25 ` [PATCH 7/8] ARM: i.MX: " Sascha Hauer
2013-08-17  9:25 ` Sascha Hauer [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1376731537-12102-9-git-send-email-s.hauer@pengutronix.de \
    --to=s.hauer@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox