From: Arnd Bergmann <arnd@arndb.de>
To: Olof Johansson <olof@lixom.net>
Cc: linux-tegra@vger.kernel.org,
Russell King - ARM Linux <linux@arm.linux.org.uk>,
Stephen Warren <swarren@nvidia.com>,
linux-arm-kernel@lists.infradead.org,
Colin Cross <ccross@android.com>
Subject: Re: [GIT PULL] Please pull tegra cleanups for 3.2
Date: Thu, 13 Oct 2011 17:16:17 +0200 [thread overview]
Message-ID: <201110131716.18358.arnd@arndb.de> (raw)
In-Reply-To: <CAOesGMjVAJK2ArOdpYNmKa11vqCfppi8Ofc0qGn4WxuMxLvd_Q@mail.gmail.com>
On Thursday 13 October 2011, Olof Johansson wrote:
> Hi Arnd,
>
> Please pull the below branch of cleanups for the 3.2 merge window.
> They have been included in linux-next for a couple of days already.
I saw Russell had a comment on the macro name should be addressed.
I've put your series plus an additional commit to fix this up
into the tegra/cleanup branch. When you ack this patch, I'll include
this branch into next/cleanup and the for-next branch.
Thanks,
Arnd
---
ARM: tegra renamed __IOVADDR to IOMEM
This matches how other platforms name the same macro, as pointed
out by Russell King.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h
index 971be4b..35a011f 100644
--- a/arch/arm/mach-tegra/include/mach/io.h
+++ b/arch/arm/mach-tegra/include/mach/io.h
@@ -34,25 +34,25 @@
*/
#ifdef __ASSEMBLY__
-#define __IOVADDR(x) (x)
+#define IOMEM(x) (x)
#else
-#define __IOVADDR(x) ((void __force __iomem *)(x))
+#define IOMEM(x) ((void __force __iomem *)(x))
#endif
#define IO_IRAM_PHYS 0x40000000
-#define IO_IRAM_VIRT __IOVADDR(0xFE400000)
+#define IO_IRAM_VIRT IOMEM(0xFE400000)
#define IO_IRAM_SIZE SZ_256K
#define IO_CPU_PHYS 0x50040000
-#define IO_CPU_VIRT __IOVADDR(0xFE000000)
+#define IO_CPU_VIRT IOMEM(0xFE000000)
#define IO_CPU_SIZE SZ_16K
#define IO_PPSB_PHYS 0x60000000
-#define IO_PPSB_VIRT __IOVADDR(0xFE200000)
+#define IO_PPSB_VIRT IOMEM(0xFE200000)
#define IO_PPSB_SIZE SZ_1M
#define IO_APB_PHYS 0x70000000
-#define IO_APB_VIRT __IOVADDR(0xFE300000)
+#define IO_APB_VIRT IOMEM(0xFE300000)
#define IO_APB_SIZE SZ_1M
#define IO_TO_VIRT_BETWEEN(p, st, sz) ((p) >= (st) && (p) < ((st) + (sz)))
WARNING: multiple messages have this Message-ID (diff)
From: arnd@arndb.de (Arnd Bergmann)
To: linux-arm-kernel@lists.infradead.org
Subject: [GIT PULL] Please pull tegra cleanups for 3.2
Date: Thu, 13 Oct 2011 17:16:17 +0200 [thread overview]
Message-ID: <201110131716.18358.arnd@arndb.de> (raw)
In-Reply-To: <CAOesGMjVAJK2ArOdpYNmKa11vqCfppi8Ofc0qGn4WxuMxLvd_Q@mail.gmail.com>
On Thursday 13 October 2011, Olof Johansson wrote:
> Hi Arnd,
>
> Please pull the below branch of cleanups for the 3.2 merge window.
> They have been included in linux-next for a couple of days already.
I saw Russell had a comment on the macro name should be addressed.
I've put your series plus an additional commit to fix this up
into the tegra/cleanup branch. When you ack this patch, I'll include
this branch into next/cleanup and the for-next branch.
Thanks,
Arnd
---
ARM: tegra renamed __IOVADDR to IOMEM
This matches how other platforms name the same macro, as pointed
out by Russell King.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/arch/arm/mach-tegra/include/mach/io.h b/arch/arm/mach-tegra/include/mach/io.h
index 971be4b..35a011f 100644
--- a/arch/arm/mach-tegra/include/mach/io.h
+++ b/arch/arm/mach-tegra/include/mach/io.h
@@ -34,25 +34,25 @@
*/
#ifdef __ASSEMBLY__
-#define __IOVADDR(x) (x)
+#define IOMEM(x) (x)
#else
-#define __IOVADDR(x) ((void __force __iomem *)(x))
+#define IOMEM(x) ((void __force __iomem *)(x))
#endif
#define IO_IRAM_PHYS 0x40000000
-#define IO_IRAM_VIRT __IOVADDR(0xFE400000)
+#define IO_IRAM_VIRT IOMEM(0xFE400000)
#define IO_IRAM_SIZE SZ_256K
#define IO_CPU_PHYS 0x50040000
-#define IO_CPU_VIRT __IOVADDR(0xFE000000)
+#define IO_CPU_VIRT IOMEM(0xFE000000)
#define IO_CPU_SIZE SZ_16K
#define IO_PPSB_PHYS 0x60000000
-#define IO_PPSB_VIRT __IOVADDR(0xFE200000)
+#define IO_PPSB_VIRT IOMEM(0xFE200000)
#define IO_PPSB_SIZE SZ_1M
#define IO_APB_PHYS 0x70000000
-#define IO_APB_VIRT __IOVADDR(0xFE300000)
+#define IO_APB_VIRT IOMEM(0xFE300000)
#define IO_APB_SIZE SZ_1M
#define IO_TO_VIRT_BETWEEN(p, st, sz) ((p) >= (st) && (p) < ((st) + (sz)))
next prev parent reply other threads:[~2011-10-13 15:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 23:34 [GIT PULL] Please pull tegra cleanups for 3.2 Olof Johansson
2011-10-12 23:34 ` Olof Johansson
2011-10-13 15:16 ` Arnd Bergmann [this message]
2011-10-13 15:16 ` Arnd Bergmann
[not found] ` <201110131716.18358.arnd-r2nGTMty4D4@public.gmane.org>
2011-10-13 22:27 ` Olof Johansson
2011-10-13 22:27 ` Olof Johansson
2011-10-20 13:00 ` Arnd Bergmann
2011-10-20 13:00 ` 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=201110131716.18358.arnd@arndb.de \
--to=arnd@arndb.de \
--cc=ccross@android.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-tegra@vger.kernel.org \
--cc=linux@arm.linux.org.uk \
--cc=olof@lixom.net \
--cc=swarren@nvidia.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.