From: Jonathan McDowell <noodles@earth.li>
To: linux-omap-open-source@linux.omap.com
Subject: [PATCH] ARM: OMAP: Fix 1510 compilation with DSP != m
Date: Sun, 8 Oct 2006 20:08:31 +0100 [thread overview]
Message-ID: <20061008190831.GC21713@earth.li> (raw)
Looks like recent changes have broken OMAP1510 compilation; I hit this
because I'm not using the DSP at present but during testing my fix
discovered that setting CONFIG_OMAP_DSP to Y didn't compile either; only
M worked. Patch below makes all 3 compile.
Signed-Off-By: Jonathan McDowell <noodles@earth.li>
-----
diff --git a/arch/arm/mach-omap1/devices.c b/arch/arm/mach-omap1/devices.c
index 992a17d..adae4f8 100644
--- a/arch/arm/mach-omap1/devices.c
+++ b/arch/arm/mach-omap1/devices.c
@@ -63,7 +63,7 @@ #endif
#if defined(CONFIG_OMAP_DSP)
-#if defined(CONFIG_ARCH_OMAP1510)
+#if defined(CONFIG_ARCH_OMAP15XX)
# define OMAP1_MBOX_SIZE 0x23
# define INT_DSP_MAILBOX1 INT_1510_DSP_MAILBOX1
#elif defined(CONFIG_ARCH_OMAP16XX)
diff --git a/arch/arm/plat-omap/mcbsp.c b/arch/arm/plat-omap/mcbsp.c
index 9d9d456..12ece9d 100644
--- a/arch/arm/plat-omap/mcbsp.c
+++ b/arch/arm/plat-omap/mcbsp.c
@@ -193,7 +193,7 @@ static int omap_mcbsp_check(unsigned int
return -1;
}
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
static void omap_mcbsp_dsp_request(void)
{
if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
@@ -266,7 +266,7 @@ int omap_mcbsp_request(unsigned int id)
if (omap_mcbsp_check(id) < 0)
return -EINVAL;
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
/*
* On 1510, 1610 and 1710, McBSP1 and McBSP3
* are DSP public peripherals.
@@ -333,7 +333,7 @@ void omap_mcbsp_free(unsigned int id)
if (omap_mcbsp_check(id) < 0)
return;
-#ifdef CONFIG_ARCH_OMAP1
+#if defined(CONFIG_ARCH_OMAP1) && defined(CONFIG_OMAP_DSP)
if (cpu_class_is_omap1()) {
if (id == OMAP_MCBSP1 || id == OMAP_MCBSP3)
omap_mcbsp_dsp_free();
-----
J.
--
jid: noodles@jabber.earth.li
101 things you can't have too much of : 44
- Fame.
next reply other threads:[~2006-10-08 19:08 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2006-10-08 19:08 Jonathan McDowell [this message]
2006-10-18 19:32 ` [PATCH] ARM: OMAP: Fix 1510 compilation with DSP != m Tony Lindgren
2006-10-18 21:10 ` Jonathan McDowell
2006-10-19 13:32 ` Tony Lindgren
2006-10-19 15:15 ` Jonathan McDowell
2006-10-23 13:16 ` Tony Lindgren
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=20061008190831.GC21713@earth.li \
--to=noodles@earth.li \
--cc=linux-omap-open-source@linux.omap.com \
/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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox