From: shawn.guo@linaro.org (Shawn Guo)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v2 6/8] arm/mxc: move IMX_GPIO_NR into mach/hardware.h
Date: Sun, 14 Aug 2011 00:14:05 +0800 [thread overview]
Message-ID: <1313252047-8820-7-git-send-email-shawn.guo@linaro.org> (raw)
In-Reply-To: <1313252047-8820-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>
---
arch/arm/plat-mxc/include/mach/gpio.h | 31 +----------------------------
arch/arm/plat-mxc/include/mach/hardware.h | 4 +++
2 files changed, 5 insertions(+), 30 deletions(-)
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h
index 8e5276c..40a8c17 100644
--- a/arch/arm/plat-mxc/include/mach/gpio.h
+++ b/arch/arm/plat-mxc/include/mach/gpio.h
@@ -1,30 +1 @@
-/*
- * Copyright 2007 Freescale Semiconductor, Inc. All Rights Reserved.
- * Copyright 2008 Juergen Beisert, kernel at pengutronix.de
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * as published by the Free Software Foundation; either version 2
- * of the License, or (at your option) any later version.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
- */
-
-#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
+/* empty */
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-13 16:14 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-08-13 16:13 [PATCH v2 0/8] Clean up MXC and MXS mach/gpio.h Shawn Guo
2011-08-13 16:14 ` [PATCH v2 1/8] ARM: mx5: board-cpuimx51.c fixup irq_to_gpio() usage Shawn Guo
2011-08-13 16:14 ` [PATCH v2 2/8] arm/mxc: do not use gpio_to_irq() for static initializers Shawn Guo
2011-08-13 16:14 ` [PATCH v2 3/8] gpio/mxc: add .to_irq for gpio chip Shawn Guo
2011-08-13 16:14 ` [PATCH v2 4/8] arm/mxc: remove gpio_to_irq() from mach/gpio.h Shawn Guo
2011-08-13 16:14 ` [PATCH v2 5/8] gpio/mxc: move irq_to_gpio() into gpio-mxc driver Shawn Guo
2011-08-13 16:14 ` Shawn Guo [this message]
2011-08-13 16:14 ` [PATCH v2 7/8] gpio/mxs: move irq_to_gpio() into gpio-mxs driver Shawn Guo
2011-08-13 16:14 ` [PATCH v2 8/8] arm/mxs: move MXS_GPIO_NR into mach/mxs.h Shawn Guo
2011-08-16 7:19 ` [PATCH v2 0/8] Clean up MXC and MXS mach/gpio.h Sascha Hauer
2011-08-17 6:25 ` Shawn Guo
2011-08-17 6:47 ` Sascha Hauer
2011-08-17 7:10 ` 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=1313252047-8820-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).