* [GIT PULL] Please pull tegra cleanups for 3.2
@ 2011-10-12 23:34 Olof Johansson
2011-10-13 15:16 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Olof Johansson @ 2011-10-12 23:34 UTC (permalink / raw)
To: linux-arm-kernel
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.
Thanks!
-Olof
The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84:
Linux 3.1-rc9 (2011-10-04 18:11:50 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.2/cleanup
Olof Johansson (14):
ARM: tegra: annotate IO_*_VIRT pointers
ARM: tegra: timer: don't cast __iomem pointers
ARM: tegra: tegra2_clocks: don't cast __iomem pointers
ARM: tegra: tegra2_clocks: 0 -> NULL changes
ARM: tegra: pcie: don't cast __iomem pointers
ARM: tegra: pcie: include board.h
ARM: tegra: pcie: 0 -> NULL changes
ARM: tegra: tegra_init_cache should be static
ARM: tegra: tegra_rtc_read_ms should be static
ARM: tegra: tegra_powergate_is_powered should be static
ARM: tegra: tegra2_clocks: don't export some tables
ARM: tegra: dma: staticify some tables and functions
ARM: tegra: cpu-tegra: sparse type fix
ARM: tegra: cpu-tegra: unexport two functions
arch/arm/mach-tegra/common.c | 2 +-
arch/arm/mach-tegra/cpu-tegra.c | 6 ++--
arch/arm/mach-tegra/dma.c | 14 +++++---
arch/arm/mach-tegra/include/mach/io.h | 18 ++++++---
arch/arm/mach-tegra/include/mach/powergate.h | 1 -
arch/arm/mach-tegra/io.c | 8 ++--
arch/arm/mach-tegra/pcie.c | 8 +++--
arch/arm/mach-tegra/powergate.c | 5 +--
arch/arm/mach-tegra/tegra2_clocks.c | 50 +++++++++++++-------------
arch/arm/mach-tegra/timer.c | 6 ++--
10 files changed, 64 insertions(+), 54 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] Please pull tegra cleanups for 3.2
2011-10-12 23:34 [GIT PULL] Please pull tegra cleanups for 3.2 Olof Johansson
@ 2011-10-13 15:16 ` Arnd Bergmann
2011-10-13 22:27 ` Olof Johansson
0 siblings, 1 reply; 4+ messages in thread
From: Arnd Bergmann @ 2011-10-13 15:16 UTC (permalink / raw)
To: linux-arm-kernel
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)))
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [GIT PULL] Please pull tegra cleanups for 3.2
2011-10-13 15:16 ` Arnd Bergmann
@ 2011-10-13 22:27 ` Olof Johansson
2011-10-20 13:00 ` Arnd Bergmann
0 siblings, 1 reply; 4+ messages in thread
From: Olof Johansson @ 2011-10-13 22:27 UTC (permalink / raw)
To: linux-arm-kernel
Hi,
On Thu, Oct 13, 2011 at 8:16 AM, Arnd Bergmann <arnd@arndb.de> wrote:
> 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.
Based on discussion on IRC, I pulled in the edit into the original
commit instead and rebased the branch.
I also added the devices.c fix that I posted yesterday, so here is a
new pull request.
Thanks!
-Olof
The following changes since commit 976d167615b64e14bc1491ca51d424e2ba9a5e84:
Linux 3.1-rc9 (2011-10-04 18:11:50 -0700)
are available in the git repository at:
git://git.kernel.org/pub/scm/linux/kernel/git/olof/tegra.git for-3.2/cleanup
Olof Johansson (15):
ARM: tegra: annotate IO_*_VIRT pointers
ARM: tegra: timer: don't cast __iomem pointers
ARM: tegra: tegra2_clocks: don't cast __iomem pointers
ARM: tegra: tegra2_clocks: 0 -> NULL changes
ARM: tegra: pcie: don't cast __iomem pointers
ARM: tegra: pcie: include board.h
ARM: tegra: pcie: 0 -> NULL changes
ARM: tegra: tegra_init_cache should be static
ARM: tegra: tegra_rtc_read_ms should be static
ARM: tegra: tegra_powergate_is_powered should be static
ARM: tegra: tegra2_clocks: don't export some tables
ARM: tegra: dma: staticify some tables and functions
ARM: tegra: cpu-tegra: sparse type fix
ARM: tegra: cpu-tegra: unexport two functions
ARM: tegra: devices.c should include devices.h
arch/arm/mach-tegra/common.c | 2 +-
arch/arm/mach-tegra/cpu-tegra.c | 6 ++--
arch/arm/mach-tegra/devices.c | 2 +
arch/arm/mach-tegra/dma.c | 14 +++++---
arch/arm/mach-tegra/include/mach/io.h | 18 ++++++---
arch/arm/mach-tegra/include/mach/powergate.h | 1 -
arch/arm/mach-tegra/io.c | 8 ++--
arch/arm/mach-tegra/pcie.c | 8 +++--
arch/arm/mach-tegra/powergate.c | 5 +--
arch/arm/mach-tegra/tegra2_clocks.c | 50 +++++++++++++-------------
arch/arm/mach-tegra/timer.c | 6 ++--
11 files changed, 66 insertions(+), 54 deletions(-)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [GIT PULL] Please pull tegra cleanups for 3.2
2011-10-13 22:27 ` Olof Johansson
@ 2011-10-20 13:00 ` Arnd Bergmann
0 siblings, 0 replies; 4+ messages in thread
From: Arnd Bergmann @ 2011-10-20 13:00 UTC (permalink / raw)
To: linux-arm-kernel
On Friday 14 October 2011, Olof Johansson wrote:
> Based on discussion on IRC, I pulled in the edit into the original
> commit instead and rebased the branch.
>
> I also added the devices.c fix that I posted yesterday, so here is a
> new pull request.
Pulled now, thanks!
Arnd
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2011-10-20 13:00 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-10-12 23:34 [GIT PULL] Please pull tegra cleanups for 3.2 Olof Johansson
2011-10-13 15:16 ` Arnd Bergmann
2011-10-13 22:27 ` Olof Johansson
2011-10-20 13:00 ` Arnd Bergmann
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).