From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 06/15] ARM: msm: clean-up mach/io.h
Date: Mon, 13 Feb 2012 15:43:19 -0600 [thread overview]
Message-ID: <1329169408-17253-7-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1329169408-17253-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
Move msm specifics in mach/io.h to respective msm_iomap-*.h headers.
Signed-off-by: Rob Herring <rob.herring@calxeda.com>
---
arch/arm/mach-msm/include/mach/io.h | 7 -------
arch/arm/mach-msm/include/mach/msm_iomap-7x30.h | 4 ++++
arch/arm/mach-msm/include/mach/msm_iomap-8960.h | 4 ++++
arch/arm/mach-msm/include/mach/msm_iomap-8x50.h | 4 ++++
arch/arm/mach-msm/include/mach/msm_iomap-8x60.h | 4 ++++
5 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/arch/arm/mach-msm/include/mach/io.h b/arch/arm/mach-msm/include/mach/io.h
index c6ff9bb..1071f98 100644
--- a/arch/arm/mach-msm/include/mach/io.h
+++ b/arch/arm/mach-msm/include/mach/io.h
@@ -21,11 +21,4 @@
#define __io(a) __typesafe_io(a)
#define __mem_pci(a) (a)
-void msm_map_qsd8x50_io(void);
-void msm_map_msm7x30_io(void);
-void msm_map_msm8x60_io(void);
-void msm_map_msm8960_io(void);
-
-extern unsigned int msm_shared_ram_phys;
-
#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
index 198202c..f944fe6 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-7x30.h
@@ -100,4 +100,8 @@
#define MSM_HSUSB_PHYS 0xA3600000
#define MSM_HSUSB_SIZE SZ_1K
+#ifndef __ASSEMBLY__
+extern void msm_map_msm7x30_io(void);
+#endif
+
#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
index 800b557..a1752c0 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8960.h
@@ -50,4 +50,8 @@
#define MSM_DEBUG_UART_PHYS 0x16440000
#endif
+#ifndef __ASSEMBLY__
+extern void msm_map_msm8960_io(void);
+#endif
+
#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
index 0faa894..da77cc1 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x50.h
@@ -122,4 +122,8 @@
#define MSM_SDC4_PHYS 0xA0600000
#define MSM_SDC4_SIZE SZ_4K
+#ifndef __ASSEMBLY__
+extern void msm_map_qsd8x50_io(void);
+#endif
+
#endif
diff --git a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
index 54e12ca..5aed57d 100644
--- a/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
+++ b/arch/arm/mach-msm/include/mach/msm_iomap-8x60.h
@@ -67,4 +67,8 @@
#define MSM_DEBUG_UART_PHYS 0x19C40000
#endif
+#ifndef __ASSEMBLY__
+extern void msm_map_msm8x60_io(void);
+#endif
+
#endif
--
1.7.5.4
next prev parent reply other threads:[~2012-02-13 21:43 UTC|newest]
Thread overview: 74+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-02-13 21:43 [PATCH 00/15] mach/io.h cleanup and removal Rob Herring
2012-02-13 21:43 ` [PATCH 01/15] usb: ohci-pxa27x: add explicit include of hardware.h Rob Herring
2012-02-13 21:43 ` [PATCH 02/15] ARM: add explicit include of system.h to processor.h Rob Herring
2012-02-13 22:14 ` H Hartley Sweeten
2012-02-13 21:43 ` [PATCH 03/15] ARM: provide runtime hook for ioremap Rob Herring
2012-02-13 22:13 ` H Hartley Sweeten
2012-02-13 22:30 ` Russell King - ARM Linux
2012-02-13 22:48 ` Rob Herring
2012-02-13 21:43 ` [PATCH 04/15] ARM: imx: convert to common runtime ioremap hook Rob Herring
2012-02-16 0:17 ` Shawn Guo
2012-02-13 21:43 ` [PATCH 05/15] ARM: msm: use " Rob Herring
2012-02-13 23:05 ` David Brown
2012-02-13 21:43 ` Rob Herring [this message]
2012-02-13 21:43 ` [PATCH 07/15] ARM: at91: clean-up mach/io.h Rob Herring
2012-02-14 9:21 ` Nicolas Ferre
2012-02-14 13:24 ` Rob Herring
2012-02-16 7:43 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-16 14:08 ` Rob Herring
2012-02-16 14:23 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-23 17:26 ` Nicolas Ferre
2012-02-27 16:55 ` Rob Herring
2012-02-27 17:27 ` Jean-Christophe PLAGNIOL-VILLARD
2012-02-13 21:43 ` [PATCH 08/15] ARM: davinci: remove unneeded mach/io.h include Rob Herring
2012-02-13 21:43 ` [PATCH 09/15] ARM: orion5x: clean-up mach/io.h Rob Herring
2012-02-13 21:43 ` [PATCH 10/15] ARM: tegra: " Rob Herring
2012-02-13 21:43 ` [PATCH 11/15] ARM: ep93xx: " Rob Herring
2012-02-13 21:52 ` Ryan Mallon
2012-02-13 22:15 ` Rob Herring
2012-02-13 22:16 ` H Hartley Sweeten
2012-02-27 15:17 ` [PATCH] " Rob Herring
2012-02-13 21:43 ` [PATCH 12/15] ARM: clps711x: remove unneeded include of mach/io.h Rob Herring
2012-02-13 21:43 ` [PATCH 13/15] ARM: make mach/io.h include optional Rob Herring
2012-02-13 22:14 ` H Hartley Sweeten
2012-02-13 22:36 ` Russell King - ARM Linux
2012-02-13 22:55 ` Rob Herring
2012-02-14 2:03 ` Arnd Bergmann
2012-02-14 2:54 ` Rob Herring
2012-02-14 8:04 ` Arnd Bergmann
2012-02-14 14:36 ` Rob Herring
2012-02-14 17:16 ` Arnd Bergmann
2012-02-14 17:40 ` Russell King - ARM Linux
2012-02-14 18:12 ` Arnd Bergmann
2012-02-14 23:09 ` Rob Herring
2012-02-14 23:43 ` Russell King - ARM Linux
2012-02-15 0:25 ` Nicolas Pitre
2012-02-15 14:14 ` Rob Herring
2012-02-15 0:57 ` Arnd Bergmann
2012-02-27 19:31 ` Rob Herring
2012-02-28 16:10 ` Arnd Bergmann
2012-02-27 22:31 ` Rob Herring
2012-02-28 16:32 ` Arnd Bergmann
2012-02-13 23:15 ` H Hartley Sweeten
2012-02-14 1:06 ` Arnd Bergmann
2012-02-14 17:38 ` H Hartley Sweeten
2012-02-14 18:20 ` Arnd Bergmann
2012-02-13 21:43 ` [PATCH 14/15] ARM: remove bunch of now unused mach/io.h files Rob Herring
2012-02-13 22:16 ` H Hartley Sweeten
2012-02-16 0:19 ` Shawn Guo
2012-02-16 18:57 ` Linus Walleij
2012-02-13 21:43 ` [PATCH 15/15] ARM: kill off __mem_pci Rob Herring
2012-02-13 22:22 ` [PATCH 00/15] mach/io.h cleanup and removal Tony Lindgren
2012-02-13 23:56 ` Tony Lindgren
2012-02-14 3:09 ` Rob Herring
2012-02-13 23:41 ` Tony Lindgren
2012-02-14 3:20 ` Rob Herring
2012-02-14 17:24 ` Tony Lindgren
2012-02-14 17:57 ` Arnd Bergmann
2012-02-14 18:28 ` Nicolas Pitre
2012-02-14 19:41 ` Rob Herring
2012-02-14 20:43 ` Tony Lindgren
2012-02-14 21:26 ` Arnd Bergmann
2012-02-14 21:54 ` Rob Herring
2012-02-14 22:38 ` Arnd Bergmann
2012-02-21 22:47 ` Stephen Warren
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=1329169408-17253-7-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--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 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.