[PATCH] include/asm-arm/arch-omap/omap24xx.h

[PATCH] include/asm-arm/arch-omap/omap24xx.h

[Luís Cargnini]

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

I are resubmitting this patch again, because even now this patch was
not applied on main tree, I upgraded yesterday for the
linux-2.6.23-omap1 (latest tag)
and it still not pushed into main tree, please someone add this patch.

Signed-off-by: Luís Vitório Cargnini <lvcargnini at gmail.com>

Signed-off-by: Dirk Behme <dirk.behme at gmail.com
<http://linux.omap.com/mailman/listinfo/linux-omap-open-source>>
-------------- next part --------------
Index: linux-osk/include/asm-arm/arch-omap/omap24xx.h
===================================================================
--- linux-osk.orig/include/asm-arm/arch-omap/omap24xx.h
+++ linux-osk/include/asm-arm/arch-omap/omap24xx.h
@@ -103,6 +103,11 @@

 #endif

+#if !defined(OMAP2_CTRL_BASE)
+/* If no one of the above configs is selected, use default */
+#define OMAP2_CTRL_BASE		L4_24XX_BASE
+#endif
+
 /* Control module */
 #define OMAP2_CONTROL_DEVCONF0	(OMAP2_CTRL_BASE + 0x274)
 #define OMAP2_CONTROL_DEVCONF1	(OMAP2_CTRL_BASE + 0x2e8)


-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------

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

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Dirk Behme]

Luís Cargnini wrote:
> I are resubmitting this patch again, because even now this patch was
> not applied on main tree, I upgraded yesterday for the
> linux-2.6.23-omap1 (latest tag)
> and it still not pushed into main tree, please someone add this patch.
> 
> Signed-off-by: Luís Vitório Cargnini <lvcargnini at gmail.com>
> 
> Signed-off-by: Dirk Behme <dirk.behme at gmail.com
> <http://linux.omap.com/mailman/listinfo/linux-omap-open-source>>
> -------------- next part --------------
> Index: linux-osk/include/asm-arm/arch-omap/omap24xx.h
> ===================================================================
> --- linux-osk.orig/include/asm-arm/arch-omap/omap24xx.h
> +++ linux-osk/include/asm-arm/arch-omap/omap24xx.h
> @@ -103,6 +103,11 @@
> 
>  #endif
> 
> +#if !defined(OMAP2_CTRL_BASE)
> +/* If no one of the above configs is selected, use default */
> +#define OMAP2_CTRL_BASE		L4_24XX_BASE
> +#endif
> +
>  /* Control module */
>  #define OMAP2_CONTROL_DEVCONF0	(OMAP2_CTRL_BASE + 0x274)
>  #define OMAP2_CONTROL_DEVCONF1	(OMAP2_CTRL_BASE + 0x2e8)

Seems that this wasn't applied because Tony mentioned that this should 
not be needed any longer:

http://linux.omap.com/pipermail/linux-omap-open-source/2007-October/011525.html

I didn't check this that time. But checking today, it is still broken. 
Reproducable by using omap_osk_5912_defconfig with additional MMC 
enabled. So right, anything like this should be applied.

Cheers

Dirk

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Paul Walmsley]

Hello Dirk, Luis, 

how about the patch (following in the next message) instead?  That way
we don't define OMAP2_CTRL_BASE for non-OMAP2 builds.   Build-tested
with OSK5912 default config with MMC driver enabled.


- Paul
>From paul@pwsan.com Wed Oct 24 23:36:10 2007
Message-Id: <20071025053610.715631084@pwsan.com>
User-Agent: quilt/0.46-1
Date: Wed, 24 Oct 2007 23:31:44 -0600
From: Paul Walmsley <paul@pwsan.com>
To: lvcargnini@gmail.com,
 dirk.behme@googlemail.com,
 tony@atomide.com
Cc: linux-omap-open-source@linux.omap.com
Bcc:  <471F868A.3060106@googlemail.com>
Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles
References: <ae36f8040710240958l579ad5el16f17cb073e25387@mail.gmail.com>
    <471F868A.3060106@googlemail.com>
 <20071025053143.222542615@pwsan.com>
Content-Disposition: inline; filename=fix_omap2_ctrl_base_mmc_compile_bug.patch
Replace-Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles

Remove reference to OMAP2_CTRL_BASE in arch/arm/plat-omap/devices.c
if we aren't building for an OMAP2 platform.

Signed-off-by: Paul Walmsley <paul@pwsan.com>

---
 arch/arm/plat-omap/devices.c |    2 ++
 1 file changed, 2 insertions(+)

Index: linux-omap/arch/arm/plat-omap/devices.c
===================================================================
--- linux-omap.orig/arch/arm/plat-omap/devices.c	2007-08-29 13:53:47.000000000 -0600
+++ linux-omap/arch/arm/plat-omap/devices.c	2007-10-24 23:29:51.000000000 -0600
@@ -339,6 +339,7 @@
 				omap_cfg_reg(MMC_DAT3);
 			}
 		}
+#if defined(CONFIG_ARCH_OMAP24XX)
 		if (mmc->internal_clock) {
 			/*
 			 * Use internal loop-back in MMC/SDIO
@@ -350,6 +351,7 @@
 				omap_writel(v, OMAP2_CONTROL_DEVCONF);
 			}
 		}
+#endif
 		mmc1_conf = *mmc;
 		(void) platform_device_register(&mmc_omap_device1);
 	}

-- 

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Luís Cargnini]

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

Did you tested it ?

On 10/25/07, Paul Walmsley <paul@pwsan.com> wrote:
> Hello Dirk, Luis,
>
> how about the patch (following in the next message) instead?  That way
> we don't define OMAP2_CTRL_BASE for non-OMAP2 builds.   Build-tested
> with OSK5912 default config with MMC driver enabled.
>
>
> - Paul
> >From paul@pwsan.com Wed Oct 24 23:36:10 2007
> Message-Id: <20071025053610.715631084@pwsan.com>
> User-Agent: quilt/0.46-1
> Date: Wed, 24 Oct 2007 23:31:44 -0600
> From: Paul Walmsley <paul@pwsan.com>
> To: lvcargnini@gmail.com,
>  dirk.behme@googlemail.com,
>  tony@atomide.com
> Cc: linux-omap-open-source@linux.omap.com
> Bcc:  <471F868A.3060106@googlemail.com>
> Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles
> References: <ae36f8040710240958l579ad5el16f17cb073e25387@mail.gmail.com>
>     <471F868A.3060106@googlemail.com>
>  <20071025053143.222542615@pwsan.com>
> Content-Disposition: inline; filename=fix_omap2_ctrl_base_mmc_compile_bug.patch
> Replace-Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles
>
> Remove reference to OMAP2_CTRL_BASE in arch/arm/plat-omap/devices.c
> if we aren't building for an OMAP2 platform.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
>
> ---
>  arch/arm/plat-omap/devices.c |    2 ++
>  1 file changed, 2 insertions(+)
>
> Index: linux-omap/arch/arm/plat-omap/devices.c
> ===================================================================
> --- linux-omap.orig/arch/arm/plat-omap/devices.c        2007-08-29 13:53:47.000000000 -0600
> +++ linux-omap/arch/arm/plat-omap/devices.c     2007-10-24 23:29:51.000000000 -0600
> @@ -339,6 +339,7 @@
>                                 omap_cfg_reg(MMC_DAT3);
>                         }
>                 }
> +#if defined(CONFIG_ARCH_OMAP24XX)
>                 if (mmc->internal_clock) {
>                         /*
>                          * Use internal loop-back in MMC/SDIO
> @@ -350,6 +351,7 @@
>                                 omap_writel(v, OMAP2_CONTROL_DEVCONF);
>                         }
>                 }
> +#endif
>                 mmc1_conf = *mmc;
>                 (void) platform_device_register(&mmc_omap_device1);
>         }
>
> --
>
>


-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------

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

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Dirk Behme]

Paul Walmsley wrote:
> Hello Dirk, Luis, 
> 
> how about the patch (following in the next message) instead?  That way
> we don't define OMAP2_CTRL_BASE for non-OMAP2 builds. 

Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I 
prefer [1].

The issue was introduced by

http://linux.omap.com/pipermail/linux-omap-open-source/2007-August/011159.html

With [1] we

- fix it where it was introduced
- have an additional #ifdef only in a header file instead of 
plat-omap/devices.c, which is IMHO better
- fix it for everybody now and in the future who directly or 
indirectly includes omap24xx.h.

Regards

Dirk

[1] 
http://linux.omap.com/pipermail/linux-omap-open-source/2007-October/011720.html

> - Paul
>>From paul@pwsan.com Wed Oct 24 23:36:10 2007
> Message-Id: <20071025053610.715631084@pwsan.com>
> User-Agent: quilt/0.46-1
> Date: Wed, 24 Oct 2007 23:31:44 -0600
> From: Paul Walmsley <paul@pwsan.com>
> To: lvcargnini@gmail.com,
>  dirk.behme@googlemail.com,
>  tony@atomide.com
> Cc: linux-omap-open-source@linux.omap.com
> Bcc:  <471F868A.3060106@googlemail.com>
> Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles
> References: <ae36f8040710240958l579ad5el16f17cb073e25387@mail.gmail.com>
>     <471F868A.3060106@googlemail.com>
>  <20071025053143.222542615@pwsan.com>
> Content-Disposition: inline; filename=fix_omap2_ctrl_base_mmc_compile_bug.patch
> Replace-Subject: fix undeclared OMAP2_CTRL_BASE for OMAP MMC driver in OMAP1 compiles
> 
> Remove reference to OMAP2_CTRL_BASE in arch/arm/plat-omap/devices.c
> if we aren't building for an OMAP2 platform.
> 
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> 
> ---
>  arch/arm/plat-omap/devices.c |    2 ++
>  1 file changed, 2 insertions(+)
> 
> Index: linux-omap/arch/arm/plat-omap/devices.c
> ===================================================================
> --- linux-omap.orig/arch/arm/plat-omap/devices.c	2007-08-29 13:53:47.000000000 -0600
> +++ linux-omap/arch/arm/plat-omap/devices.c	2007-10-24 23:29:51.000000000 -0600
> @@ -339,6 +339,7 @@
>  				omap_cfg_reg(MMC_DAT3);
>  			}
>  		}
> +#if defined(CONFIG_ARCH_OMAP24XX)
>  		if (mmc->internal_clock) {
>  			/*
>  			 * Use internal loop-back in MMC/SDIO
> @@ -350,6 +351,7 @@
>  				omap_writel(v, OMAP2_CONTROL_DEVCONF);
>  			}
>  		}
> +#endif
>  		mmc1_conf = *mmc;
>  		(void) platform_device_register(&mmc_omap_device1);
>  	}
> 

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Paul Walmsley]

Hello Dirk,

On Thu, 25 Oct 2007, Dirk Behme wrote:

> Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
> [1].
>
> With [1] we
>
> - fix it where it was introduced
> - have an additional #ifdef only in a header file instead of 
> plat-omap/devices.c, which is IMHO better
> - fix it for everybody now and in the future who directly or indirectly 
> includes omap24xx.h.

Hopefully this is just a workaround until we can get rid of these 
conditional defines for multiboot kernels.  Generally speaking, would you 
propose doing the same thing for the other conditional defines in 
include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
OMAP2_SDRC_BASE, etc.?


- Paul

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [071025 09:01]:

> Hello Dirk,
>
> On Thu, 25 Oct 2007, Dirk Behme wrote:
>
>> Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
>> [1].
>>
>> With [1] we
>>
>> - fix it where it was introduced
>> - have an additional #ifdef only in a header file instead of 
>> plat-omap/devices.c, which is IMHO better
>> - fix it for everybody now and in the future who directly or indirectly 
>> includes omap24xx.h.
>
> Hopefully this is just a workaround until we can get rid of these 
> conditional defines for multiboot kernels.  Generally speaking, would you 
> propose doing the same thing for the other conditional defines in 
> include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
> OMAP2_SDRC_BASE, etc.?

Sounds like the real fix is to set these addresses in the init code
somewhere based on the omap type.

Tony

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Tony Lindgren]

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

* Tony Lindgren <tony@atomide.com> [071031 08:22]:
> * Paul Walmsley <paul@pwsan.com> [071025 09:01]:
> 
> > Hello Dirk,
> >
> > On Thu, 25 Oct 2007, Dirk Behme wrote:
> >
> >> Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
> >> [1].
> >>
> >> With [1] we
> >>
> >> - fix it where it was introduced
> >> - have an additional #ifdef only in a header file instead of 
> >> plat-omap/devices.c, which is IMHO better
> >> - fix it for everybody now and in the future who directly or indirectly 
> >> includes omap24xx.h.
> >
> > Hopefully this is just a workaround until we can get rid of these 
> > conditional defines for multiboot kernels.  Generally speaking, would you 
> > propose doing the same thing for the other conditional defines in 
> > include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
> > OMAP2_SDRC_BASE, etc.?
> 
> Sounds like the real fix is to set these addresses in the init code
> somewhere based on the omap type.

I'll push a temporary fix based on Luis' patch, see below.

Tony

[-- Attachment #2: omap2-ctrl-base-fix.patch --]
[-- Type: text/x-diff, Size: 324 bytes --]

--- a/include/asm-arm/arch-omap/omap24xx.h
+++ b/include/asm-arm/arch-omap/omap24xx.h
@@ -101,6 +101,9 @@
 #define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE		OMAP243X_CTRL_BASE
 
+#else
+/* FIXME: These will go away soon */
+#define OMAP2_CTRL_BASE		L4_24XX_BASE
 #endif
 
 /* Control module */

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

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Paul Walmsley]

On Thu, 1 Nov 2007, Tony Lindgren wrote:

> * Tony Lindgren <tony@atomide.com> [071031 08:22]:
> > * Paul Walmsley <paul@pwsan.com> [071025 09:01]:
> > 
> > > Hello Dirk,
> > >
> > > On Thu, 25 Oct 2007, Dirk Behme wrote:
> > >
> > >> Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
> > >> [1].
> > >>
> > >> With [1] we
> > >>
> > >> - fix it where it was introduced
> > >> - have an additional #ifdef only in a header file instead of 
> > >> plat-omap/devices.c, which is IMHO better
> > >> - fix it for everybody now and in the future who directly or indirectly 
> > >> includes omap24xx.h.
> > >
> > > Hopefully this is just a workaround until we can get rid of these 
> > > conditional defines for multiboot kernels.  Generally speaking, would you 
> > > propose doing the same thing for the other conditional defines in 
> > > include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
> > > OMAP2_SDRC_BASE, etc.?
> > 
> > Sounds like the real fix is to set these addresses in the init code
> > somewhere based on the omap type.

Yeah, agreed.

> I'll push a temporary fix based on Luis' patch, see below.

OMAP3430 builds now generate redefinition warnings for OMAP2_CTRL_BASE; 
patch to work around is below.

In file included from include/asm/arch/hardware.h:288,
                 from include/asm/hardware.h:16,
                 from include/asm/arch/irqs.h:341,
                 from include/asm/irq.h:4,
                 from include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:7,
                 from include/asm-generic/local.h:5,
                 from include/asm/local.h:1,
                 from include/linux/module.h:19,
                 from init/main.c:13:
include/asm/arch/omap34xx.h:71:1: warning: "OMAP2_CTRL_BASE" redefined
In file included from include/asm/arch/hardware.h:287,
                 from include/asm/hardware.h:16,
                 from include/asm/arch/irqs.h:341,
                 from include/asm/irq.h:4,
                 from include/asm/hardirq.h:6,
                 from include/linux/hardirq.h:7,
                 from include/asm-generic/local.h:5,
                 from include/asm/local.h:1,
                 from include/linux/module.h:19,
                 from init/main.c:13:
include/asm/arch/omap24xx.h:106:1: warning: this is the location of the 
previous definition


- Paul

From: Paul Walmsley <paul@pwsan.com>
Subject: Work around OMAP2_CTRL_BASE warnings in 3430 build

Work around OMAP2_CTRL_BASE redefinition warnings for OMAP3430 builds. 

Signed-off-by: Paul Walmsley <paul@pwsan.com>

---
 include/asm/arch/omap24xx.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Index: linux-omap/include/asm/arch/omap24xx.h
===================================================================
--- linux-omap.orig/include/asm/arch/omap24xx.h	2007-11-04 20:55:00.000000000 -0700
+++ linux-omap/include/asm/arch/omap24xx.h	2007-11-04 21:32:31.000000000 -0700
@@ -101,7 +101,7 @@
 #define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)
 #define OMAP2_CTRL_BASE		OMAP243X_CTRL_BASE
 
-#else
+#elif !defined(CONFIG_ARCH_OMAP34XX)
 /* FIXME: These will go away soon */
 #define OMAP2_CTRL_BASE		L4_24XX_BASE
 #endif

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Dirk Behme]

Paul Walmsley wrote:
> On Thu, 1 Nov 2007, Tony Lindgren wrote:
> 
> 
>>* Tony Lindgren <tony@atomide.com> [071031 08:22]:
>>
>>>* Paul Walmsley <paul@pwsan.com> [071025 09:01]:
>>>
>>>
>>>>Hello Dirk,
>>>>
>>>>On Thu, 25 Oct 2007, Dirk Behme wrote:
>>>>
>>>>
>>>>>Mmh, I like to fix it in include/asm-arm/arch-omap/omap24xx.h, so I prefer 
>>>>>[1].
>>>>>
>>>>>With [1] we
>>>>>
>>>>>- fix it where it was introduced
>>>>>- have an additional #ifdef only in a header file instead of 
>>>>>plat-omap/devices.c, which is IMHO better
>>>>>- fix it for everybody now and in the future who directly or indirectly 
>>>>>includes omap24xx.h.
>>>>
>>>>Hopefully this is just a workaround until we can get rid of these 
>>>>conditional defines for multiboot kernels.  Generally speaking, would you 
>>>>propose doing the same thing for the other conditional defines in 
>>>>include/asm-arm/arch-omap/omap24xx.h, such as OMAP2_32KSYNCT_BASE, 
>>>>OMAP2_SDRC_BASE, etc.?
>>>
>>>Sounds like the real fix is to set these addresses in the init code
>>>somewhere based on the omap type.
>  
> Yeah, agreed.

Me too.

>>I'll push a temporary fix based on Luis' patch, see below.
> 
> 
> OMAP3430 builds now generate redefinition warnings for OMAP2_CTRL_BASE; 
> patch to work around is below.
...
> From: Paul Walmsley <paul@pwsan.com>
> Subject: Work around OMAP2_CTRL_BASE warnings in 3430 build
> 
> Work around OMAP2_CTRL_BASE redefinition warnings for OMAP3430 builds. 
> 
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> 
> ---
>  include/asm/arch/omap24xx.h |    2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> Index: linux-omap/include/asm/arch/omap24xx.h
> ===================================================================
> --- linux-omap.orig/include/asm/arch/omap24xx.h	2007-11-04 20:55:00.000000000 -0700
> +++ linux-omap/include/asm/arch/omap24xx.h	2007-11-04 21:32:31.000000000 -0700
> @@ -101,7 +101,7 @@
>  #define OMAP2_VA_IC_BASE	IO_ADDRESS(OMAP24XX_IC_BASE)
>  #define OMAP2_CTRL_BASE		OMAP243X_CTRL_BASE
>  
> -#else
> +#elif !defined(CONFIG_ARCH_OMAP34XX)
>  /* FIXME: These will go away soon */
>  #define OMAP2_CTRL_BASE		L4_24XX_BASE
>  #endif

Until we have real fix like above: Instead of now trying to cover all 
situations where OMAP2_CTRL_BASE is undefined or redefinded (maybe 
there are some more?), I wonder why not simply make it self-dependent?

#if !defined(OMAP2_CTRL_BASE)
/* FIXME: These will go away soon */
#define OMAP2_CTRL_BASE		L4_24XX_BASE
#endif

Regards

Dirk

http://linux.omap.com/pipermail/linux-omap-open-source/2007-September/011393.html

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Paul Walmsley]

Hello Dirk,

On Mon, 5 Nov 2007, Dirk Behme wrote:

> Until we have real fix like above: Instead of now trying to cover all
> situations where OMAP2_CTRL_BASE is undefined or redefinded (maybe there are
> some more?), I wonder why not simply make it self-dependent?
> 
> #if !defined(OMAP2_CTRL_BASE)
> /* FIXME: These will go away soon */
> #define OMAP2_CTRL_BASE		L4_24XX_BASE
> #endif

I don't think that will work.  Consider the case of a file that 
includes both omap24xx.h and omap34xx.h during a 3430 build.  When 
omap24xx.h is processed, OMAP2_CTRL_BASE will be defined by the above 
code; then omap34xx.h will redefine it, causing the same warning.


- Paul

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Tony Lindgren]

* Paul Walmsley <paul@pwsan.com> [071106 02:23]:
> Hello Dirk,
> 
> On Mon, 5 Nov 2007, Dirk Behme wrote:
> 
> > Until we have real fix like above: Instead of now trying to cover all
> > situations where OMAP2_CTRL_BASE is undefined or redefinded (maybe there are
> > some more?), I wonder why not simply make it self-dependent?
> > 
> > #if !defined(OMAP2_CTRL_BASE)
> > /* FIXME: These will go away soon */
> > #define OMAP2_CTRL_BASE		L4_24XX_BASE
> > #endif
> 
> I don't think that will work.  Consider the case of a file that 
> includes both omap24xx.h and omap34xx.h during a 3430 build.  When 
> omap24xx.h is processed, OMAP2_CTRL_BASE will be defined by the above 
> code; then omap34xx.h will redefine it, causing the same warning.

Yup, pushed that fix.

Tony

Re: [PATCH] include/asm-arm/arch-omap/omap24xx.h

[Luís Cargnini]

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

In that time omap3 do not exist yet,
now we need to find a way, to fix this for all platforms.
I suggest to make code compilation base on define FLAGS (ifdef
ARCH_OMAP_16XX for example), and remove the lines like
 if (is_omap24xx())else i(is_omap3xxx) for example, one of the reasons is
performance, we take some machine cycle to test it (which CPU is), we will
code more (a little bit), but we can use includes based on architecture like
I suggested some time ago

#ifdedf  OMAP16xxx
#include <omap16xx.h>
else if .....

They get the idea.
So we can fix this kind of problems for each family of OMAP CPU, and we can
achieve (maybe) some performance.
my $0,02 of contribution in this discussion.

On Nov 6, 2007 10:58 AM, Tony Lindgren <tony@atomide.com> wrote:

> * Paul Walmsley <paul@pwsan.com> [071106 02:23]:
> > Hello Dirk,
> >
> > On Mon, 5 Nov 2007, Dirk Behme wrote:
> >
> > > Until we have real fix like above: Instead of now trying to cover all
> > > situations where OMAP2_CTRL_BASE is undefined or redefinded (maybe
> there are
> > > some more?), I wonder why not simply make it self-dependent?
> > >
> > > #if !defined(OMAP2_CTRL_BASE)
> > > /* FIXME: These will go away soon */
> > > #define OMAP2_CTRL_BASE             L4_24XX_BASE
> > > #endif
> >
> > I don't think that will work.  Consider the case of a file that
> > includes both omap24xx.h and omap34xx.h during a 3430 build.  When
> > omap24xx.h is processed, OMAP2_CTRL_BASE will be defined by the above
> > code; then omap34xx.h will redefine it, causing the same warning.
>
> Yup, pushed that fix.
>
> Tony
> _______________________________________________
> Linux-omap-open-source mailing list
> Linux-omap-open-source@linux.omap.com
> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>



-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------

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

[PATCH]include/asm-arm/arch-omap/omap24xx.h

[Luís Cargnini]

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

this patch only export two more functions to been used externally, for read
and write in polled mode.without the need of irqs.

Signed-off-by: Luis Vitorio Cargnini <lvcargnini@gmail.com>

--- linux-omap-2.6/arch/arm/plat-omap/mcbsp.c   2007-03-12 16:44:
03.501890844 -0300
+++ linux-omap-2.6.23/arch/arm/plat-omap/mcbsp.c        2007-11-07 02:10:
44.093625034 -0200
@@ -1022,6 +1022,8 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type);
 EXPORT_SYMBOL(omap_mcbsp_free);
 EXPORT_SYMBOL(omap_mcbsp_start);
 EXPORT_SYMBOL(omap_mcbsp_stop);
+EXPORT_SYMBOL(omap_mcbsp_pollread);
+EXPORT_SYMBOL(omap_mcbsp_pollwrite);
 EXPORT_SYMBOL(omap_mcbsp_xmit_word);
 EXPORT_SYMBOL(omap_mcbsp_recv_word);
 EXPORT_SYMBOL(omap_mcbsp_xmit_buffer);


-- 
------------------------------------------------------------------------------
Thanks && Regards
Msc. Bsc. Luís Vitório Cargnini
IEEE Member
Electrical Engineer Faculty @ PUCRS
Ipiranga Avenue, 6681 – Building 30
P.O. Box: 90619-900 – Porto Alegre/RS
Phone: +55 51 3320 3500  extension: 7696
---------------------------------------------------------------------------------

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

Re: [PATCH]include/asm-arm/arch-omap/omap24xx.h

[Tony Lindgren]

* Luís Cargnini <lvcargnini@gmail.com> [071106 20:27]:
> this patch only export two more functions to been used externally, for read
> and write in polled mode.without the need of irqs.
> 
> Signed-off-by: Luis Vitorio Cargnini <lvcargnini@gmail.com>
> 
> --- linux-omap-2.6/arch/arm/plat-omap/mcbsp.c   2007-03-12 16:44:
> 03.501890844 -0300
> +++ linux-omap-2.6.23/arch/arm/plat-omap/mcbsp.c        2007-11-07 02:10:
> 44.093625034 -0200
> @@ -1022,6 +1022,8 @@ EXPORT_SYMBOL(omap_mcbsp_set_io_type);
>  EXPORT_SYMBOL(omap_mcbsp_free);
>  EXPORT_SYMBOL(omap_mcbsp_start);
>  EXPORT_SYMBOL(omap_mcbsp_stop);
> +EXPORT_SYMBOL(omap_mcbsp_pollread);
> +EXPORT_SYMBOL(omap_mcbsp_pollwrite);
>  EXPORT_SYMBOL(omap_mcbsp_xmit_word);
>  EXPORT_SYMBOL(omap_mcbsp_recv_word);
>  EXPORT_SYMBOL(omap_mcbsp_xmit_buffer);

Pushing today. Can you please check your mailer settings? The patch is
wrapped and base64 encoded...

Tony