From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 6/6] arm/mxc: move IMX_GPIO_NR into mach/hardware.h
Date: Fri, 12 Aug 2011 15:55:01 +0800 [thread overview]
Message-ID: <1313135701-22456-7-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1313135701-22456-1-git-send-email-shawn.guo@linaro.org>
The patch moves IMX_GPIO_NR into mach/hardware.h, so that mach/gpio.h
becomes an empty header and can wait for a global removal from
asm/gpio.h.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Cc: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/plat-mxc/include/mach/gpio.h | 8 --------
arch/arm/plat-mxc/include/mach/hardware.h | 4 ++++
2 files changed, 4 insertions(+), 8 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
index 8e5276c..54fe5cb 100644
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@ -19,12 +19,4 @@
#ifndef __ASM_ARCH_MXC_GPIO_H__
#define __ASM_ARCH_MXC_GPIO_H__
-#include <linux/spinlock.h>
-#include <mach/hardware.h>
-
-
-/* There's a off-by-one betweem the gpio bank number and the gpiochip */
-/* range e.g. GPIO_1_5 is gpio 5 under linux */
-#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
-
#endif
diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h
index 77f6556..f57ec47 100644
--- a/arch/arm/plat-mxc/include/mach/hardware.h
+++ b/arch/arm/plat-mxc/include/mach/hardware.h
@@ -116,6 +116,10 @@
.type = _type, \
}
+/* There's a off-by-one betweem the gpio bank number and the gpiochip */
+/* range e.g. GPIO_1_5 is gpio 5 under linux */
+#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr))
+
#define IMX_GPIO_TO_IRQ(gpio) (MXC_GPIO_IRQ_START + (gpio))
#endif /* __ASM_ARCH_MXC_HARDWARE_H__ */
--
1.7.4.1
next prev parent reply other threads:[~2011-08-12 7:55 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-12 7:54 [PATCH 0/6] Clean up plat-mxc/include/mach/gpio.h Shawn Guo
2011-08-12 7:54 ` [PATCH 1/6] arm/cpuimx51: gpio_to_irq() should be used to get irq from gpio number Shawn Guo
2011-08-12 9:36 ` Jason Liu
2011-08-12 11:13 ` Shawn Guo
2011-08-13 9:35 ` Russell King - ARM Linux
2011-08-13 12:12 ` Shawn Guo
2011-08-12 7:54 ` [PATCH 2/6] arm/imx: remove the uses of gpio_to_irq() Shawn Guo
2011-08-12 8:00 ` Russell King - ARM Linux
2011-08-12 8:22 ` Shawn Guo
2011-08-12 8:25 ` Shawn Guo
2011-08-12 8:57 ` Russell King - ARM Linux
2011-08-12 9:27 ` Shawn Guo
2011-08-12 7:54 ` [PATCH 3/6] gpio/mxc: add .to_irq for gpio chip Shawn Guo
2011-08-12 7:54 ` [PATCH 4/6] arm/imx: remove gpio_to_irq() from mach/gpio.h Shawn Guo
2011-08-12 7:55 ` [PATCH 5/6] gpio/mxc: move irq_to_gpio() into gpio-mxc driver Shawn Guo
2011-08-12 7:55 ` Shawn Guo [this message]
2011-08-12 8:02 ` [PATCH 6/6] arm/mxc: move IMX_GPIO_NR into mach/hardware.h Russell King - ARM Linux
2011-08-12 8:23 ` Shawn Guo
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=1313135701-22456-7-git-send-email-shawn.guo@linaro.org \
--to=shawn.guo@linaro.org \
--cc=linux-arm-kernel@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;
as well as URLs for NNTP newsgroup(s).