Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

2009-12-10 Thread Sergei Shtylyov

Hello.

Santosh Shilimkar wrote:


On OMAP4430 the UART3 base address is different than that on OMAP3.
Because of this existing code needs additional #ifdef'ry to accommodate
that code. Hence this patch separates it. Also UART3 base address is
fixed for OMAP4430 in this patch.

Signed-off-by: Santosh Shilimkar santosh.shilim...@ti.com
  

[...]

diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S 
b/arch/arm/mach-omap2/include/mach/debug-macro.S
index e9f255d..b2b4b29 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -25,7 +25,7 @@
add \rx, \rx, #0x4000   @ UART 3
 #endif
 
-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)

+#elif CONFIG_ARCH_OMAP3
  


  Why you've dropped defined()? This doesn't seem right as it should 
cause error when CONFIG_ARCH_OMAP3=n...



moveq   \rx, #0x4800@ physical base address
movne   \rx, #0xfa00@ virtual base
orr \rx, \rx, #0x0006a000
@@ -36,6 +36,17 @@
add \rx, \rx, #0x00fb   @ UART 3
add \rx, \rx, #0x6000
 #endif
+#elif CONFIG_ARCH_OMAP4
  


  Same comment here...

WBR, Sergei


--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


RE: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

2009-12-10 Thread Shilimkar, Santosh


 -Original Message-
 From: Sergei Shtylyov [mailto:sshtyl...@ru.mvista.com]
 Sent: Thursday, December 10, 2009 4:06 PM
 To: Shilimkar, Santosh
 Cc: t...@atomide.com; linux-omap@vger.kernel.org; li...@arm.linux.org.uk; 
 linux-arm-
 ker...@lists.infradead.org
 Subject: Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code
 
 Hello.
 
 Santosh Shilimkar wrote:
 
  On OMAP4430 the UART3 base address is different than that on OMAP3.
  Because of this existing code needs additional #ifdef'ry to accommodate
  that code. Hence this patch separates it. Also UART3 base address is
  fixed for OMAP4430 in this patch.
 
  Signed-off-by: Santosh Shilimkar santosh.shilim...@ti.com
 
 [...]
  diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-
 omap2/include/mach/debug-macro.S
  index e9f255d..b2b4b29 100644
  --- a/arch/arm/mach-omap2/include/mach/debug-macro.S
  +++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
  @@ -25,7 +25,7 @@
  add \rx, \rx, #0x4000   @ UART 3
   #endif
 
  -#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
  +#elif CONFIG_ARCH_OMAP3
 
 
Why you've dropped defined()? This doesn't seem right as it should
 cause error when CONFIG_ARCH_OMAP3=n...

Before omap4 support was added, it was as above. Now when I decided
to go back and spilt it I changed it. How the ARCH flag will be
n ? It will be either 0 or 1
--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html


Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

2009-12-10 Thread Sergei Shtylyov

Hello.

Shilimkar, Santosh wrote:


-Original Message-
From: Sergei Shtylyov [mailto:sshtyl...@ru.mvista.com]
Sent: Thursday, December 10, 2009 4:06 PM
To: Shilimkar, Santosh
Cc: t...@atomide.com; linux-omap@vger.kernel.org; li...@arm.linux.org.uk; 
linux-arm-
ker...@lists.infradead.org
Subject: Re: [PATCH 3/6] OMAP4: Re-arrange the low level debug code

Hello.

Santosh Shilimkar wrote:



On OMAP4430 the UART3 base address is different than that on OMAP3.
Because of this existing code needs additional #ifdef'ry to accommodate
that code. Hence this patch separates it. Also UART3 base address is
fixed for OMAP4430 in this patch.

Signed-off-by: Santosh Shilimkar santosh.shilim...@ti.com

  

[...]


diff --git a/arch/arm/mach-omap2/include/mach/debug-macro.S b/arch/arm/mach-
  

omap2/include/mach/debug-macro.S


index e9f255d..b2b4b29 100644
--- a/arch/arm/mach-omap2/include/mach/debug-macro.S
+++ b/arch/arm/mach-omap2/include/mach/debug-macro.S
@@ -25,7 +25,7 @@
add \rx, \rx, #0x4000   @ UART 3
 #endif

-#elif defined(CONFIG_ARCH_OMAP3) || defined(CONFIG_ARCH_OMAP4)
+#elif CONFIG_ARCH_OMAP3

  

   Why you've dropped defined()? This doesn't seem right as it should
cause error when CONFIG_ARCH_OMAP3=n...



Before omap4 support was added, it was as above. Now when I decided
to go back and spilt it I changed it. How the ARCH flag will be
n ? It will be either 0 or 1
  


   This is .config variable -- it's either 1 or *not defined*.

WBR, Sergei

--
To unsubscribe from this list: send the line unsubscribe linux-omap in
the body of a message to majord...@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html