[PATCH] McBSP dependence for DSP on ARCH_OMAP1 is missing

[PATCH] McBSP dependence for DSP on ARCH_OMAP1 is missing

[David Cohen]

[-- Attachment #1: Type: text/plain, Size: 596 bytes --]

Hi,

I've tried to compile an up-to-dated kernel tree configured for h3. I
got some errors due to the McBSP depends on OMAP_DSP if ARCH_OMAP1 is
set, as we can see at these lines from "arch/arm/plat-omap/mcbsp.c":

(...)
#ifdef CONFIG_ARCH_OMAP1
static void omap_mcbsp_dsp_request(void)
{
    if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
        omap_dsp_request_mem();

(...)
#endif
(...)

So, I've made this minimal patch to deal with this problem. It worked
well for me. But I put, also, CONFIG_OMAP_DSP=y as default on h3 config
file to keep the OMAP_MCBSP as default too.

BR,

David Cohen

[-- Attachment #2: diff_kconfig_mcbsp_h3.patch --]
[-- Type: text/plain, Size: 908 bytes --]

Signed-off-by: David Cohen <david.cohen@indt.org.br>
---
diff --git a/arch/arm/configs/omap_h3_1710_defconfig b/arch/arm/configs/omap_h3_1710_defconfig
index bc9cb6b..6cbdbe1 100644
--- a/arch/arm/configs/omap_h3_1710_defconfig
+++ b/arch/arm/configs/omap_h3_1710_defconfig
@@ -136,7 +136,7 @@ CONFIG_OMAP_ARM_168MHZ=y
 # CONFIG_OMAP_ARM_120MHZ is not set
 # CONFIG_OMAP_ARM_60MHZ is not set
 # CONFIG_OMAP_ARM_30MHZ is not set
-# CONFIG_OMAP_DSP is not set
+CONFIG_OMAP_DSP=y
 
 #
 # Processor Type
diff --git a/arch/arm/plat-omap/Kconfig b/arch/arm/plat-omap/Kconfig
index 2b56996..0ab87ff 100644
--- a/arch/arm/plat-omap/Kconfig
+++ b/arch/arm/plat-omap/Kconfig
@@ -103,7 +103,7 @@ config OMAP_STI_CONSOLE
 
 config OMAP_MCBSP
 	bool "McBSP support"
-	depends on ARCH_OMAP
+	depends on (ARCH_OMAP1 && OMAP_DSP) || ARCH_OMAP2
 	default y
 	help
 	  Say Y here if you want support for the OMAP Multichannel

[-- Attachment #3: Type: text/plain, Size: 0 bytes --]

Re: [PATCH] McBSP dependence for DSP on ARCH_OMAP1 is missing

[Tony Lindgren]

* David Cohen <david.cohen@indt.org.br> [061020 23:34]:
> Hi,
> 
> I've tried to compile an up-to-dated kernel tree configured for h3. I
> got some errors due to the McBSP depends on OMAP_DSP if ARCH_OMAP1 is
> set, as we can see at these lines from "arch/arm/plat-omap/mcbsp.c":
> 
> (...)
> #ifdef CONFIG_ARCH_OMAP1
> static void omap_mcbsp_dsp_request(void)
> {
>     if (cpu_is_omap15xx() || cpu_is_omap16xx()) {
>         omap_dsp_request_mem();
> 
> (...)
> #endif
> (...)
> 
> So, I've made this minimal patch to deal with this problem. It worked
> well for me. But I put, also, CONFIG_OMAP_DSP=y as default on h3 config
> file to keep the OMAP_MCBSP as default too.

This should be already fixed in a recent patch:

http://source.mvista.com/git/gitweb.cgi?p=linux-omap-2.6.git;a=commitdiff;h=40749d1d5792748372ae3becf638944b896ef8f1

Regards,

Tony