diff options
| author | Daniel Walker <dwalker@codeaurora.org> | 2010-03-17 10:51:10 -0700 |
|---|---|---|
| committer | Daniel Walker <dwalker@codeaurora.org> | 2010-05-12 09:19:04 -0700 |
| commit | 74df1d07ee01b7276cba64160ea6dfe195de008f (patch) | |
| tree | f0697344edc0f0d7fa90bd6c7b7b6315c90a5f20 /arch/arm | |
| parent | 1a86fbc167fdf8ac387a52d49782d7a5bc1d9ac9 (diff) | |
| download | op-kernel-dev-74df1d07ee01b7276cba64160ea6dfe195de008f.zip op-kernel-dev-74df1d07ee01b7276cba64160ea6dfe195de008f.tar.gz | |
arm: msm: smd: msm7x30 a2m clean up
This moves the msm_a2m_int() function into the header, and
does a small macro clean up to be more inline with Linux
norms. No functional changes.
Signed-off-by: Daniel Walker <dwalker@codeaurora.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-msm/smd.c | 12 | ||||
| -rw-r--r-- | arch/arm/mach-msm/smd_private.h | 16 |
2 files changed, 16 insertions, 12 deletions
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c index 2e32d9a..2a9b85c 100644 --- a/arch/arm/mach-msm/smd.c +++ b/arch/arm/mach-msm/smd.c @@ -26,10 +26,8 @@ #include <linux/slab.h> #include <linux/debugfs.h> #include <linux/delay.h> -#include <linux/io.h> #include <mach/msm_smd.h> -#include <mach/msm_iomap.h> #include <mach/system.h> #include "smd_private.h" @@ -69,16 +67,6 @@ static void smd_diag(void); static unsigned last_heap_free = 0xffffffff; -static inline void msm_a2m_int(uint32_t irq) -{ -#if defined(CONFIG_ARCH_MSM7X30) - writel(1 << irq, MSM_GCC_BASE + 0x8); -#else - writel(1, MSM_CSR_BASE + 0x400 + (irq * 4)); -#endif -} - - static inline void notify_other_smsm(void) { msm_a2m_int(5); diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h index 3d337ce..727bfe6 100644 --- a/arch/arm/mach-msm/smd_private.h +++ b/arch/arm/mach-msm/smd_private.h @@ -19,6 +19,9 @@ #include <linux/platform_device.h> #include <linux/spinlock.h> #include <linux/list.h> +#include <linux/io.h> + +#include <mach/msm_iomap.h> struct smem_heap_info { unsigned initialized; @@ -384,4 +387,17 @@ static inline int _smd_alloc_channel(struct smd_channel *ch) } #endif /* CONFIG_MSM_SMD_PKG3 */ +#if defined(CONFIG_ARCH_MSM7X30) +static inline void msm_a2m_int(uint32_t irq) +{ + writel(1 << irq, MSM_GCC_BASE + 0x8); +} +#else +static inline void msm_a2m_int(uint32_t irq) +{ + writel(1, MSM_CSR_BASE + 0x400 + (irq * 4)); +} +#endif /* CONFIG_ARCH_MSM7X30 */ + + #endif |
