Skip to content

Commit

Permalink
arm: msm: smd: msm7x30 a2m clean up
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Daniel Walker committed May 12, 2010
1 parent 1a86fbc commit 74df1d0
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 12 deletions.
12 changes: 0 additions & 12 deletions arch/arm/mach-msm/smd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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);
Expand Down
16 changes: 16 additions & 0 deletions arch/arm/mach-msm/smd_private.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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

0 comments on commit 74df1d0

Please sign in to comment.