aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorDaniel Walker <dwalker@codeaurora.org>2010-03-17 13:51:10 -0400
committerDaniel Walker <dwalker@codeaurora.org>2010-05-12 12:19:04 -0400
commit74df1d07ee01b7276cba64160ea6dfe195de008f (patch)
treef0697344edc0f0d7fa90bd6c7b7b6315c90a5f20 /arch/arm
parent1a86fbc167fdf8ac387a52d49782d7a5bc1d9ac9 (diff)
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.c12
-rw-r--r--arch/arm/mach-msm/smd_private.h16
2 files changed, 16 insertions, 12 deletions
diff --git a/arch/arm/mach-msm/smd.c b/arch/arm/mach-msm/smd.c
index 2e32d9ab3609..2a9b85ca5c07 100644
--- a/arch/arm/mach-msm/smd.c
+++ b/arch/arm/mach-msm/smd.c
@@ -26,10 +26,8 @@
26#include <linux/slab.h> 26#include <linux/slab.h>
27#include <linux/debugfs.h> 27#include <linux/debugfs.h>
28#include <linux/delay.h> 28#include <linux/delay.h>
29#include <linux/io.h>
30 29
31#include <mach/msm_smd.h> 30#include <mach/msm_smd.h>
32#include <mach/msm_iomap.h>
33#include <mach/system.h> 31#include <mach/system.h>
34 32
35#include "smd_private.h" 33#include "smd_private.h"
@@ -69,16 +67,6 @@ static void smd_diag(void);
69 67
70static unsigned last_heap_free = 0xffffffff; 68static unsigned last_heap_free = 0xffffffff;
71 69
72static inline void msm_a2m_int(uint32_t irq)
73{
74#if defined(CONFIG_ARCH_MSM7X30)
75 writel(1 << irq, MSM_GCC_BASE + 0x8);
76#else
77 writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
78#endif
79}
80
81
82static inline void notify_other_smsm(void) 70static inline void notify_other_smsm(void)
83{ 71{
84 msm_a2m_int(5); 72 msm_a2m_int(5);
diff --git a/arch/arm/mach-msm/smd_private.h b/arch/arm/mach-msm/smd_private.h
index 3d337ce35a61..727bfe68aa9b 100644
--- a/arch/arm/mach-msm/smd_private.h
+++ b/arch/arm/mach-msm/smd_private.h
@@ -19,6 +19,9 @@
19#include <linux/platform_device.h> 19#include <linux/platform_device.h>
20#include <linux/spinlock.h> 20#include <linux/spinlock.h>
21#include <linux/list.h> 21#include <linux/list.h>
22#include <linux/io.h>
23
24#include <mach/msm_iomap.h>
22 25
23struct smem_heap_info { 26struct smem_heap_info {
24 unsigned initialized; 27 unsigned initialized;
@@ -384,4 +387,17 @@ static inline int _smd_alloc_channel(struct smd_channel *ch)
384} 387}
385#endif /* CONFIG_MSM_SMD_PKG3 */ 388#endif /* CONFIG_MSM_SMD_PKG3 */
386 389
390#if defined(CONFIG_ARCH_MSM7X30)
391static inline void msm_a2m_int(uint32_t irq)
392{
393 writel(1 << irq, MSM_GCC_BASE + 0x8);
394}
395#else
396static inline void msm_a2m_int(uint32_t irq)
397{
398 writel(1, MSM_CSR_BASE + 0x400 + (irq * 4));
399}
400#endif /* CONFIG_ARCH_MSM7X30 */
401
402
387#endif 403#endif