* [PATCH] OMAP: omap-mcbsp: Fix building after replacement
@ 2011-01-20 14:12 Thomas Weber
2011-01-20 15:08 ` Poddar, Sourav
0 siblings, 1 reply; 6+ messages in thread
From: Thomas Weber @ 2011-01-20 14:12 UTC (permalink / raw)
To: linux-omap; +Cc: Thomas Weber
Fix building omap-mcbsp after replacing ARCH_OMAP24x0 in
commit 8a9c1aa6a4caa7db1c2fca4b47168af9077e0f95.
> omap: Start using CONFIG_SOC_OMAP
>
> We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
> are nowadays just subcategories of these.
>
> Search and replace the following:
>
> ARCH_OMAP2420 SOC_OMAP2420
> ARCH_OMAP2430 SOC_OMAP2430
> ARCH_OMAP3430 SOC_OMAP3430
Signed-off-by: Thomas Weber <weber@corscience.de>
---
sound/soc/omap/omap-mcbsp.c | 1 +
sound/soc/omap/omap-mcbsp.h | 1 +
2 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
index 3cc293b..ede6afd 100644
--- a/sound/soc/omap/omap-mcbsp.c
+++ b/sound/soc/omap/omap-mcbsp.c
@@ -113,6 +113,7 @@ static const int omap44xx_dma_reqs[][2] = {
static const int omap44xx_dma_reqs[][2] = {};
#endif
+#if defined(CONFIG_SOC_OMAP2420)
static const unsigned long omap2420_mcbsp_port[][2] = {
{ OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
index b7b0ce1..37dc721 100644
--- a/sound/soc/omap/omap-mcbsp.h
+++ b/sound/soc/omap/omap-mcbsp.h
@@ -54,6 +54,7 @@ enum omap_mcbsp_div {
#undef NUM_LINKS
#define NUM_LINKS 4
#endif
+#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
#undef NUM_LINKS
#define NUM_LINKS 5
#endif
--
1.7.4.rc2
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP: omap-mcbsp: Fix building after replacement
2011-01-20 14:12 [PATCH] OMAP: omap-mcbsp: Fix building after replacement Thomas Weber
@ 2011-01-20 15:08 ` Poddar, Sourav
2011-01-20 18:19 ` Tony Lindgren
0 siblings, 1 reply; 6+ messages in thread
From: Poddar, Sourav @ 2011-01-20 15:08 UTC (permalink / raw)
To: Thomas Weber; +Cc: linux-omap
On Thu, Jan 20, 2011 at 7:42 PM, Thomas Weber <weber@corscience.de> wrote:
> Fix building omap-mcbsp after replacing ARCH_OMAP24x0 in
> commit 8a9c1aa6a4caa7db1c2fca4b47168af9077e0f95.
>
>> omap: Start using CONFIG_SOC_OMAP
>>
>> We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
>> are nowadays just subcategories of these.
>>
>> Search and replace the following:
>>
>> ARCH_OMAP2420 SOC_OMAP2420
>> ARCH_OMAP2430 SOC_OMAP2430
>> ARCH_OMAP3430 SOC_OMAP3430
>
I was just about to post a patch for this, but you beat me
to it!
> Signed-off-by: Thomas Weber <weber@corscience.de>
Acked-by: Sourav Poddar <sourav.poddar@ti.com>
> ---
> sound/soc/omap/omap-mcbsp.c | 1 +
> sound/soc/omap/omap-mcbsp.h | 1 +
> 2 files changed, 2 insertions(+), 0 deletions(-)
>
> diff --git a/sound/soc/omap/omap-mcbsp.c b/sound/soc/omap/omap-mcbsp.c
> index 3cc293b..ede6afd 100644
> --- a/sound/soc/omap/omap-mcbsp.c
> +++ b/sound/soc/omap/omap-mcbsp.c
> @@ -113,6 +113,7 @@ static const int omap44xx_dma_reqs[][2] = {
> static const int omap44xx_dma_reqs[][2] = {};
> #endif
>
> +#if defined(CONFIG_SOC_OMAP2420)
> static const unsigned long omap2420_mcbsp_port[][2] = {
> { OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DXR1,
> OMAP24XX_MCBSP1_BASE + OMAP_MCBSP_REG_DRR1 },
> diff --git a/sound/soc/omap/omap-mcbsp.h b/sound/soc/omap/omap-mcbsp.h
> index b7b0ce1..37dc721 100644
> --- a/sound/soc/omap/omap-mcbsp.h
> +++ b/sound/soc/omap/omap-mcbsp.h
> @@ -54,6 +54,7 @@ enum omap_mcbsp_div {
> #undef NUM_LINKS
> #define NUM_LINKS 4
> #endif
> +#if defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_SOC_OMAP2430)
> #undef NUM_LINKS
> #define NUM_LINKS 5
> #endif
> --
> 1.7.4.rc2
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at http://vger.kernel.org/majordomo-info.html
>
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP: omap-mcbsp: Fix building after replacement
2011-01-20 15:08 ` Poddar, Sourav
@ 2011-01-20 18:19 ` Tony Lindgren
2011-01-21 6:25 ` Varadarajan, Charulatha
0 siblings, 1 reply; 6+ messages in thread
From: Tony Lindgren @ 2011-01-20 18:19 UTC (permalink / raw)
To: Poddar, Sourav; +Cc: Thomas Weber, linux-omap
* Poddar, Sourav <sourav.poddar@ti.com> [110120 07:08]:
> On Thu, Jan 20, 2011 at 7:42 PM, Thomas Weber <weber@corscience.de> wrote:
> > Fix building omap-mcbsp after replacing ARCH_OMAP24x0 in
> > commit 8a9c1aa6a4caa7db1c2fca4b47168af9077e0f95.
> >
> >> omap: Start using CONFIG_SOC_OMAP
> >>
> >> We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
> >> are nowadays just subcategories of these.
> >>
> >> Search and replace the following:
> >>
> >> ARCH_OMAP2420 SOC_OMAP2420
> >> ARCH_OMAP2430 SOC_OMAP2430
> >> ARCH_OMAP3430 SOC_OMAP3430
> >
>
> I was just about to post a patch for this, but you beat me
> to it!
>
> > Signed-off-by: Thomas Weber <weber@corscience.de>
>
> Acked-by: Sourav Poddar <sourav.poddar@ti.com>
Thanks, merging this into the original. Also adding
applying into linux-omap master.
Tony
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP: omap-mcbsp: Fix building after replacement
2011-01-20 18:19 ` Tony Lindgren
@ 2011-01-21 6:25 ` Varadarajan, Charulatha
2011-01-21 7:28 ` Jarkko Nikula
0 siblings, 1 reply; 6+ messages in thread
From: Varadarajan, Charulatha @ 2011-01-21 6:25 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Poddar, Sourav, Thomas Weber, linux-omap
On Thu, Jan 20, 2011 at 23:49, Tony Lindgren <tony@atomide.com> wrote:
> * Poddar, Sourav <sourav.poddar@ti.com> [110120 07:08]:
>> On Thu, Jan 20, 2011 at 7:42 PM, Thomas Weber <weber@corscience.de> wrote:
>> > Fix building omap-mcbsp after replacing ARCH_OMAP24x0 in
>> > commit 8a9c1aa6a4caa7db1c2fca4b47168af9077e0f95.
>> >
>> >> omap: Start using CONFIG_SOC_OMAP
>> >>
>> >> We want to have just CONFIG_ARCH_OMAP2, 3 and 4. The rest
>> >> are nowadays just subcategories of these.
>> >>
>> >> Search and replace the following:
>> >>
>> >> ARCH_OMAP2420 SOC_OMAP2420
>> >> ARCH_OMAP2430 SOC_OMAP2430
>> >> ARCH_OMAP3430 SOC_OMAP3430
>> >
>>
>> I was just about to post a patch for this, but you beat me
>> to it!
>>
>> > Signed-off-by: Thomas Weber <weber@corscience.de>
>>
>> Acked-by: Sourav Poddar <sourav.poddar@ti.com>
>
> Thanks, merging this into the original. Also adding
> applying into linux-omap master.
>
Aren't we breaking multi-omap build with this?
-V Charulatha
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP: omap-mcbsp: Fix building after replacement
2011-01-21 6:25 ` Varadarajan, Charulatha
@ 2011-01-21 7:28 ` Jarkko Nikula
2011-01-21 7:30 ` Varadarajan, Charulatha
0 siblings, 1 reply; 6+ messages in thread
From: Jarkko Nikula @ 2011-01-21 7:28 UTC (permalink / raw)
To: Varadarajan, Charulatha
Cc: Tony Lindgren, Poddar, Sourav, Thomas Weber, linux-omap
On Fri, 21 Jan 2011 11:55:55 +0530
"Varadarajan, Charulatha" <charu@ti.com> wrote:
> >> I was just about to post a patch for this, but you beat me
> >> to it!
> >>
> >> > Signed-off-by: Thomas Weber <weber@corscience.de>
> >>
> >> Acked-by: Sourav Poddar <sourav.poddar@ti.com>
> >
> > Thanks, merging this into the original. Also adding
> > applying into linux-omap master.
> >
>
> Aren't we breaking multi-omap build with this?
>
Don't point it out immediately but these patches looks like yet another
reason why there's a need to get rid of these ifdefs and cpu_is_omapxxx
tests from the drivers.
--
Jarkko
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] OMAP: omap-mcbsp: Fix building after replacement
2011-01-21 7:28 ` Jarkko Nikula
@ 2011-01-21 7:30 ` Varadarajan, Charulatha
0 siblings, 0 replies; 6+ messages in thread
From: Varadarajan, Charulatha @ 2011-01-21 7:30 UTC (permalink / raw)
To: Jarkko Nikula; +Cc: Tony Lindgren, Poddar, Sourav, Thomas Weber, linux-omap
On Fri, Jan 21, 2011 at 12:58, Jarkko Nikula <jhnikula@gmail.com> wrote:
> On Fri, 21 Jan 2011 11:55:55 +0530
> "Varadarajan, Charulatha" <charu@ti.com> wrote:
>
>> >> I was just about to post a patch for this, but you beat me
>> >> to it!
>> >>
>> >> > Signed-off-by: Thomas Weber <weber@corscience.de>
>> >>
>> >> Acked-by: Sourav Poddar <sourav.poddar@ti.com>
>> >
>> > Thanks, merging this into the original. Also adding
>> > applying into linux-omap master.
>> >
>>
>> Aren't we breaking multi-omap build with this?
>>
> Don't point it out immediately but these patches looks like yet another
> reason why there's a need to get rid of these ifdefs and cpu_is_omapxxx
> tests from the drivers.
Yes. I agree.
>
> --
> Jarkko
>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2011-01-21 7:30 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-20 14:12 [PATCH] OMAP: omap-mcbsp: Fix building after replacement Thomas Weber
2011-01-20 15:08 ` Poddar, Sourav
2011-01-20 18:19 ` Tony Lindgren
2011-01-21 6:25 ` Varadarajan, Charulatha
2011-01-21 7:28 ` Jarkko Nikula
2011-01-21 7:30 ` Varadarajan, Charulatha
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox