From: shc_work@mail.ru (Alexander Shiyan)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 11/17] ARM clps711x: Move definitions of register address in one unit
Date: Sat, 21 Apr 2012 13:11:24 +0400 [thread overview]
Message-ID: <1334999490-27177-12-git-send-email-shc_work@mail.ru> (raw)
In-Reply-To: <1334999490-27177-1-git-send-email-shc_work@mail.ru>
Signed-off-by: Alexander Shiyan <shc_work@mail.ru>
---
arch/arm/include/asm/hardware/clps7111.h | 11 -----------
arch/arm/mach-clps711x/include/mach/entry-macro.S | 2 +-
arch/arm/mach-clps711x/include/mach/hardware.h | 15 ++++++++++++---
arch/arm/mach-clps711x/include/mach/uncompress.h | 9 ++++-----
4 files changed, 17 insertions(+), 20 deletions(-)
diff --git a/arch/arm/include/asm/hardware/clps7111.h b/arch/arm/include/asm/hardware/clps7111.h
index b63ed8c..f4a3ac9 100644
--- a/arch/arm/include/asm/hardware/clps7111.h
+++ b/arch/arm/include/asm/hardware/clps7111.h
@@ -23,17 +23,6 @@
#ifndef __ASM_HARDWARE_CLPS7111_H
#define __ASM_HARDWARE_CLPS7111_H
-#define CLPS711X_PHYS_BASE (0x80000000)
-
-#ifndef __ASSEMBLY__
-#define clps_readb(off) __raw_readb(CLPS7111_BASE + (off))
-#define clps_readw(off) __raw_readw(CLPS7111_BASE + (off))
-#define clps_readl(off) __raw_readl(CLPS7111_BASE + (off))
-#define clps_writeb(val,off) __raw_writeb(val, CLPS7111_BASE + (off))
-#define clps_writew(val,off) __raw_writew(val, CLPS7111_BASE + (off))
-#define clps_writel(val,off) __raw_writel(val, CLPS7111_BASE + (off))
-#endif
-
#define PADR (0x0000)
#define PBDR (0x0001)
#define PCDR (0x0002)
diff --git a/arch/arm/mach-clps711x/include/mach/entry-macro.S b/arch/arm/mach-clps711x/include/mach/entry-macro.S
index 4ff5e77..56e5c2c 100644
--- a/arch/arm/mach-clps711x/include/mach/entry-macro.S
+++ b/arch/arm/mach-clps711x/include/mach/entry-macro.S
@@ -17,7 +17,7 @@
#endif
.macro get_irqnr_and_base, irqnr, stat, base, mask
- mov \base, #CLPS7111_BASE
+ mov \base, #CLPS711X_VIRT_BASE
ldr \stat, [\base, #INTSR1]
ldr \mask, [\base, #INTMR1]
mov \irqnr, #4
diff --git a/arch/arm/mach-clps711x/include/mach/hardware.h b/arch/arm/mach-clps711x/include/mach/hardware.h
index f5d8313..495d57b 100644
--- a/arch/arm/mach-clps711x/include/mach/hardware.h
+++ b/arch/arm/mach-clps711x/include/mach/hardware.h
@@ -22,11 +22,20 @@
#ifndef __ASM_ARCH_HARDWARE_H
#define __ASM_ARCH_HARDWARE_H
-#define CLPS711X_VIRT_BASE 0xff000000
-#define CLPS7111_BASE CLPS711X_VIRT_BASE
-
#include <asm/hardware/clps7111.h>
+#define CLPS711X_PHYS_BASE (0x80000000)
+#define CLPS711X_VIRT_BASE (0xff000000)
+
+#ifndef __ASSEMBLY__
+#define clps_readb(off) __raw_readb(CLPS711X_VIRT_BASE + (off))
+#define clps_readw(off) __raw_readw(CLPS711X_VIRT_BASE + (off))
+#define clps_readl(off) __raw_readl(CLPS711X_VIRT_BASE + (off))
+#define clps_writeb(val,off) __raw_writeb(val, CLPS711X_VIRT_BASE + (off))
+#define clps_writew(val,off) __raw_writew(val, CLPS711X_VIRT_BASE + (off))
+#define clps_writel(val,off) __raw_writel(val, CLPS711X_VIRT_BASE + (off))
+#endif
+
/*
* The physical addresses that the external chip select signals map to is
* dependent on the setting of the nMEDCHG signal on EP7211 and EP7212
diff --git a/arch/arm/mach-clps711x/include/mach/uncompress.h b/arch/arm/mach-clps711x/include/mach/uncompress.h
index bf7b112..f0e8a32 100644
--- a/arch/arm/mach-clps711x/include/mach/uncompress.h
+++ b/arch/arm/mach-clps711x/include/mach/uncompress.h
@@ -19,11 +19,10 @@
*/
#include <mach/hardware.h>
-#undef CLPS7111_BASE
-#define CLPS7111_BASE CLPS711X_PHYS_BASE
-
-#define __raw_readl(p) (*(unsigned long *)(p))
-#define __raw_writel(v,p) (*(unsigned long *)(p) = (v))
+#undef clps_readl
+#undef clps_writel
+#define clps_readl(p) (*(unsigned long *)(CLPS711X_PHYS_BASE+p))
+#define clps_writel(v,p) (*(unsigned long *)(CLPS711X_PHYS_BASE+p) = (v))
#ifdef CONFIG_DEBUG_CLPS711X_UART2
#define SYSFLGx SYSFLG2
--
1.7.3.4
next prev parent reply other threads:[~2012-04-21 9:11 UTC|newest]
Thread overview: 33+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-04-21 9:11 clps711x patchset Alexander Shiyan
2012-04-21 9:11 ` [PATCH 01/17] ARM clps711x: Cleanup: Rename ARCH_EP7211 and ARCH_EP7212 to SOC_xxx Alexander Shiyan
2012-04-21 9:11 ` [PATCH 02/17] ARM clps711x: Added Cirrus Logic EP7312 CPU variant Alexander Shiyan
2012-04-21 11:21 ` Arnd Bergmann
2012-04-21 11:30 ` Re[2]: " Alexander Shiyan
2012-04-21 11:48 ` Russell King - ARM Linux
2012-04-21 12:11 ` Arnd Bergmann
2012-04-21 12:20 ` Russell King - ARM Linux
2012-04-22 13:58 ` Arnd Bergmann
2012-04-22 14:13 ` Russell King - ARM Linux
2012-04-22 14:24 ` Re[2]: " Alexander Shiyan
2012-04-21 9:11 ` [PATCH 03/17] ARM clps711x: Selecting CPU-variant automatically for clps711x targets Alexander Shiyan
2012-04-21 9:11 ` [PATCH 04/17] ARM clps711x: Using a single definition for virtual address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 05/17] ARM clps711x: Added missing definitions for PORT C Alexander Shiyan
2012-04-21 9:11 ` [PATCH 06/17] ARM clps711x: Remove now unused cs89712 board header Alexander Shiyan
2012-04-21 9:11 ` [PATCH 07/17] ARM clps711x: Remove unused includes Alexander Shiyan
2012-04-21 9:11 ` [PATCH 08/17] ARM clps711x: Cleanup: remove unused definitions for ep_readl/ep_writel Alexander Shiyan
2012-04-21 9:11 ` [PATCH 09/17] ARM clps711x: Using a single definition for physical address register Alexander Shiyan
2012-04-21 9:11 ` [PATCH 10/17] ARM clps711x: Address register renaming to reflect the fact that the name is the same for all arch Alexander Shiyan
2012-04-21 9:11 ` Alexander Shiyan [this message]
2012-04-21 9:11 ` [PATCH 12/17] ARM clps711x: Simple optimise debug_macro by removing one NOP Alexander Shiyan
2012-04-21 10:46 ` Russell King - ARM Linux
2012-04-21 10:50 ` Re[2]: " Alexander Shiyan
2012-04-21 11:18 ` Arnd Bergmann
2012-04-21 11:49 ` Arnd Bergmann
2012-04-21 9:11 ` [PATCH 13/17] ARM clps711x: Removed unused header mach/time.h Alexander Shiyan
2012-04-21 9:11 ` [PATCH 14/17] ARM clps711x: Do not mask interrupts in ack procedure Alexander Shiyan
2012-04-21 9:11 ` [PATCH 15/17] ARM clps711x: Removed unused definitions from mach/irqs.h Alexander Shiyan
2012-04-21 9:11 ` [PATCH 16/17] ARM clps711x: Replaced frequency settings to definition Alexander Shiyan
2012-04-21 9:11 ` [PATCH 17/17] ARM clps711x: Make select CPU spees as KConfig option Alexander Shiyan
2012-04-21 11:40 ` clps711x patchset Arnd Bergmann
2012-04-21 12:04 ` Re[2]: " Alexander Shiyan
2012-04-21 12:14 ` 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=1334999490-27177-12-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).