From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH RESEND 08/15] ARM: clps711x: Move specific definitions from hardware.h to boards files
Date: Wed, 5 Jun 2013 09:59:16 +0400 [thread overview]
Message-ID: <1370411967-29451-9-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1370411967-29451-1-git-send-email-shc_work@mail.ru>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/mach-clps711x/board-edb7211.c | 8 ++++++--
arch/arm/mach-clps711x/include/mach/hardware.h | 7 -------
2 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/arch/arm/mach-clps711x/board-edb7211.c b/arch/arm/mach-clps711x/board-edb7211.c
index e1c5573..3ba4b9e 100644
--- a/arch/arm/mach-clps711x/board-edb7211.c
+++ b/arch/arm/mach-clps711x/board-edb7211.c
@@ -39,9 +39,13 @@
#define EDB7211_FLASH0_BASE (CS0_PHYS_BASE)
#define EDB7211_FLASH1_BASE (CS1_PHYS_BASE)
+
#define EDB7211_CS8900_BASE (CS2_PHYS_BASE + 0x300)
#define EDB7211_CS8900_IRQ (IRQ_EINT3)
+/* The extra 8 lines of the keyboard matrix */
+#define EDB7211_EXTKBD_BASE (CS3_PHYS_BASE)
+
static struct resource edb7211_cs8900_resource[] __initdata = {
DEFINE_RES_MEM(EDB7211_CS8900_BASE, SZ_1K),
DEFINE_RES_IRQ(EDB7211_CS8900_IRQ),
@@ -113,8 +117,8 @@ static struct gpio edb7211_gpios[] __initconst = {
static struct map_desc edb7211_io_desc[] __initdata = {
{ /* Memory-mapped extra keyboard row */
- .virtual = IO_ADDRESS(EP7211_PHYS_EXTKBD),
- .pfn = __phys_to_pfn(EP7211_PHYS_EXTKBD),
+ .virtual = IO_ADDRESS(EDB7211_EXTKBD_BASE),
+ .pfn = __phys_to_pfn(EDB7211_EXTKBD_BASE),
.length = SZ_1M,
.type = MT_DEVICE,
},
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index 2f23dd5..c5a8ea6 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -70,11 +70,4 @@
#define CLPS711X_SDRAM0_BASE (0xc0000000)
#define CLPS711X_SDRAM1_BASE (0xd0000000)
-#if defined (CONFIG_ARCH_EDB7211)
-
-/* The extra 8 lines of the keyboard matrix are wired to chip select 3 */
-#define EP7211_PHYS_EXTKBD CS3_PHYS_BASE
-
-#endif /* CONFIG_ARCH_EDB7211 */
-
#endif
--
1.8.1.5
next prev parent reply other threads:[~2013-06-05 5:59 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-06-05 5:59 [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 02/15] ARM: clps711x: Set PLL clock to zero if we work from 13 mHz source Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 03/15] ARM: clps711x: autcpu12: Move LCD DPOT definitions to board file Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 04/15] ARM: clps711x: autcpu12: Add support for NOR flash Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 05/15] ARM: clps711x: autcpu12: Special driver for handling memory is removed Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 06/15] ARM: clps711x: autcpu12: Move remaining specific definitions to board file Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-05 5:59 ` Alexander Shiyan [this message]
2013-06-05 5:59 ` [PATCH RESEND 09/15] ARM: clps711x: Replace "arch_initcall" in common code with ".init_early" Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 10/15] ARM: clps711x: Add clocksource framework Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 11/15] ARM: clps711x: Optimize interrupt handling Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 12/15] ARM: clps711x: edb7211: Add support for I2C Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 13/15] ARM: clps711x: edb7211: Control LCD backlight via PWM Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 14/15] ARM: clps711x: Add support for SYSCON driver Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 15/15] ARM: clps711x: Update defconfig Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 1/3] GPIO: clps711x: Rewrite driver for using generic GPIO code Alexander Shiyan
2013-06-17 6:24 ` Linus Walleij
2013-06-17 6:29 ` Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 2/3] ARM: clps711x: Re-add GPIO support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND v2 3/3] GPIO: clps711x: Add DT support Alexander Shiyan
2013-06-05 5:59 ` [PATCH RESEND 07/15] ARM: clps711x: p720t: Define PLD registers as GPIOs Alexander Shiyan
2013-06-19 16:18 ` [PATCH RESEND 01/15] ARM: clps711x: Remove NEED_MACH_MEMORY_H dependency Arnd Bergmann
2013-06-19 16:25 ` Re[2]: " Alexander Shiyan
2013-06-19 17:59 ` Arnd Bergmann
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=1370411967-29451-9-git-send-email-shc_work@mail.ru \
--to=shc_work@mail.ru \
--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).