[RFC] Misc cleanups

[RFC] Misc cleanups

[Felipe Balbi]

Hi all,

The following series implements some cleanups to musb, twl4030_core and
omap34xx.h.

Comments are welcome.

Best Regards,
Felipe Balbi

[RFC patch] I2C: TWL4030: Remove unneded pr_err define

[Felipe Balbi]

pr_err definition was moved to include/linux/kernel.h
it's unecessary keeping that in twl4030_core.c

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
 drivers/i2c/chips/twl4030_core.c |    2 --
 1 files changed, 0 insertions(+), 2 deletions(-)

diff --git a/drivers/i2c/chips/twl4030_core.c b/drivers/i2c/chips/twl4030_core.c
index 991ebf4..5b77d99 100644
--- a/drivers/i2c/chips/twl4030_core.c
+++ b/drivers/i2c/chips/twl4030_core.c
@@ -51,8 +51,6 @@
 
 #define DRIVER_NAME			"twl4030"
 
-#define pr_err(fmt, arg...)	printk(KERN_ERR DRIVER_NAME ": " fmt, ##arg);
-
 /**** Macro Definitions */
 #define TWL_CLIENT_STRING		"TWL4030-ID"
 #define TWL_CLIENT_USED			1
-- 
1.5.3.5.666.gfb5f

[RFC patch] ARM: OMAP: Fix typo in drivers/usb/musb/Kconfig

[Felipe Balbi]

We don't have ARCH_OMAP343X. Change to ARCH_OMAP34XX

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
 drivers/usb/musb/Kconfig |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/drivers/usb/musb/Kconfig b/drivers/usb/musb/Kconfig
index 2e030b9..c795b01 100644
--- a/drivers/usb/musb/Kconfig
+++ b/drivers/usb/musb/Kconfig
@@ -30,7 +30,7 @@ config USB_MUSB_SOC
 	depends on USB_MUSB_HDRC
 	default y if ARCH_DAVINCI
 	default y if ARCH_OMAP2430
-	default y if ARCH_OMAP343X
+	default y if ARCH_OMAP34XX
 	help
 	  Use a static <asm/arch/hdrc_cnf.h> file to describe how the
 	  controller is configured (endpoints, mechanisms, etc) on the
@@ -43,7 +43,7 @@ comment "OMAP 243x high speed USB support"
 	depends on USB_MUSB_HDRC && ARCH_OMAP2430
 
 comment "OMAP 343x high speed USB support"
-	depends on USB_MUSB_HDRC && ARCH_OMAP343X
+	depends on USB_MUSB_HDRC && ARCH_OMAP34XX
 
 config USB_TUSB6010
 	boolean "TUSB 6010 support"
@@ -145,7 +145,7 @@ config MUSB_PIO_ONLY
 config USB_INVENTRA_DMA
 	bool
 	depends on USB_MUSB_HDRC && !MUSB_PIO_ONLY
-	default ARCH_OMAP2430 || ARCH_OMAP343X
+	default ARCH_OMAP2430 || ARCH_OMAP34XX
 	help
 	  Enable DMA transfers using Mentor's engine.
 
-- 
1.5.3.5.666.gfb5f

[RFC patch] ARM: OMAP: Define OMAP34XX_HS_BASE

[Felipe Balbi]

Following other omap archs, define OMAP34XX_HS_BASE macro
to be used later, for example in musb driver.

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
 include/asm-arm/arch-omap/omap34xx.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index 0265e3b..1650937 100644
--- a/include/asm-arm/arch-omap/omap34xx.h
+++ b/include/asm-arm/arch-omap/omap34xx.h
@@ -71,6 +71,7 @@
 #define OMAP2_CTRL_BASE			OMAP3430_CTRL_BASE
 #define OMAP34XX_CONTROL_DEVCONF0	(L4_34XX_BASE + 0x2274)
 #define OMAP34XX_CONTROL_DEVCONF1	(L4_34XX_BASE + 0x22D8)
+#define OMAP34XX_HS_BASE		(L4_34XX_BASE + 0x65000)
 #define OMAP2_CONTROL_STATUS		(OMAP2_CTRL_BASE + 0x2f0)
 
 #endif
-- 
1.5.3.5.666.gfb5f

Re: [RFC patch] ARM: OMAP: Define OMAP34XX_HS_BASE

[Paul Walmsley]

Hi Felipe,

On Mon, 19 Nov 2007, Felipe Balbi wrote:

> Following other omap archs, define OMAP34XX_HS_BASE macro
> to be used later, for example in musb driver.

This #define should go up higher in the omap34xx.h file, so it isn't 
enclosed by CONFIG_ARCH_OMAP34XX.  See for example OMAP3430_CTRL_BASE. 
Trying to get rid of those defines in that conditional block :-)

- Paul

> diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
> index 0265e3b..1650937 100644
> --- a/include/asm-arm/arch-omap/omap34xx.h
> +++ b/include/asm-arm/arch-omap/omap34xx.h
> @@ -71,6 +71,7 @@
>  #define OMAP2_CTRL_BASE			OMAP3430_CTRL_BASE
>  #define OMAP34XX_CONTROL_DEVCONF0	(L4_34XX_BASE + 0x2274)
>  #define OMAP34XX_CONTROL_DEVCONF1	(L4_34XX_BASE + 0x22D8)
> +#define OMAP34XX_HS_BASE		(L4_34XX_BASE + 0x65000)
>  #define OMAP2_CONTROL_STATUS		(OMAP2_CTRL_BASE + 0x2f0)
>  
>  #endif
> -- 
> 1.5.3.5.666.gfb5f

- Paul

Re: [RFC patch] ARM: OMAP: Define OMAP34XX_HS_BASE

[Felipe Balbi]

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

Hi,

On 11/19/07, Paul Walmsley <paul@booyaka.com> wrote:
> Hi Felipe,
>
> On Mon, 19 Nov 2007, Felipe Balbi wrote:
>
> > Following other omap archs, define OMAP34XX_HS_BASE macro
> > to be used later, for example in musb driver.
>
> This #define should go up higher in the omap34xx.h file, so it isn't
> enclosed by CONFIG_ARCH_OMAP34XX.  See for example OMAP3430_CTRL_BASE.
> Trying to get rid of those defines in that conditional block :-)

Thanks for noticing that.
updated patch attached.

>
> - Paul
>
> > diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
> > index 0265e3b..1650937 100644
> > --- a/include/asm-arm/arch-omap/omap34xx.h
> > +++ b/include/asm-arm/arch-omap/omap34xx.h
> > @@ -71,6 +71,7 @@
> >  #define OMAP2_CTRL_BASE                      OMAP3430_CTRL_BASE
> >  #define OMAP34XX_CONTROL_DEVCONF0    (L4_34XX_BASE + 0x2274)
> >  #define OMAP34XX_CONTROL_DEVCONF1    (L4_34XX_BASE + 0x22D8)
> > +#define OMAP34XX_HS_BASE             (L4_34XX_BASE + 0x65000)
> >  #define OMAP2_CONTROL_STATUS         (OMAP2_CTRL_BASE + 0x2f0)
> >
> >  #endif
> > --
> > 1.5.3.5.666.gfb5f
>
> - Paul
> _______________________________________________
> Linux-omap-open-source mailing list
> Linux-omap-open-source@linux.omap.com
> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>


-- 
Best Regards,

Felipe Balbi
felipebalbi@users.sourceforge.net

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-ARM-OMAP-Define-OMAP34XX_HS_BASE.diff --]
[-- Type: text/x-patch; name=0001-ARM-OMAP-Define-OMAP34XX_HS_BASE.diff, Size: 880 bytes --]

From e5880e05e8100cd7f21b116425ecfe3104ccd686 Mon Sep 17 00:00:00 2001
From: Felipe Balbi <felipe.lima@indt.org.br>
Date: Mon, 19 Nov 2007 03:35:05 +0200
Subject: [PATCH] ARM: OMAP: Define OMAP34XX_HS_BASE

Following other omap archs, define OMAP34XX_HS_BASE macro
to be used later, for example in musb driver.

Signed-off-by: Felipe Balbi <felipe.lima@indt.org.br>
---
 include/asm-arm/arch-omap/omap34xx.h |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
index 0265e3b..f10c310 100644
--- a/include/asm-arm/arch-omap/omap34xx.h
+++ b/include/asm-arm/arch-omap/omap34xx.h
@@ -50,6 +50,7 @@
 
 #define OMAP34XX_IC_BASE	0x48200000
 #define OMAP34XX_IVA_INTC_BASE	0x40000000
+#define OMAP34XX_HS_BASE	(L4_34XX_BASE + 0x65000)
 #define IRQ_SIR_IRQ		0x0040
 
 
-- 
1.5.3.5.666.gfb5f


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

[PATCH] ARM: OMAP: USB: Define OMAP34XX_HSUSB_OTG_BASE

[Pandita, Vikram]

Tony 
 This patch: 
 1) Correctly defines the base address for HSUSB_OTG block (MUSB)
    Patch by Filipe had incorrect base address for 34xx

 2) Includes the base addresses of: USBTLL and USBHOST present in 3430ES2.0

Felipe
 I see that for 34XX the base address for HSUSB_OTG is not correctly defined
 by your patch so resending with modifications


Signed-off-by: Vikram Pandita <vikram.pandita@ti.com>

Index: linux-omap/include/asm-arm/arch-omap/omap34xx.h
===================================================================
--- linux-omap.orig/include/asm-arm/arch-omap/omap34xx.h	2007-11-19 09:55:59.000000000 +0530
+++ linux-omap/include/asm-arm/arch-omap/omap34xx.h	2007-11-23 17:51:08.000000000 +0530
@@ -50,6 +50,9 @@
 
 #define OMAP34XX_IC_BASE	0x48200000
 #define OMAP34XX_IVA_INTC_BASE	0x40000000
+#define OMAP34XX_HSUSB_OTG_BASE	(L4_34XX_BASE + 0xAB000)
+#define OMAP34XX_HSUSB_HOST_BASE	(L4_34XX_BASE + 0x64000)
+#define OMAP34XX_USBTLL_BASE	(L4_34XX_BASE + 0x62000)
 #define IRQ_SIR_IRQ		0x0040



>-----Original Message-----
>From: linux-omap-open-source-bounces+vikram.pandita=ti.com@linux.omap.com [mailto:linux-omap-open-
>source-bounces+vikram.pandita=ti.com@linux.omap.com] On Behalf Of Felipe Balbi
>Sent: Tuesday, November 20, 2007 12:58 AM
>To: Paul Walmsley
>Cc: linux-omap@vger.kernel.org; linux-omap-open-source@linux.omap.com
>Subject: Re: [RFC patch] ARM: OMAP: Define OMAP34XX_HS_BASE
>
>Hi,
>
>On 11/19/07, Paul Walmsley <paul@booyaka.com> wrote:
>> Hi Felipe,
>>
>> On Mon, 19 Nov 2007, Felipe Balbi wrote:
>>
>> > Following other omap archs, define OMAP34XX_HS_BASE macro
>> > to be used later, for example in musb driver.
>>
>> This #define should go up higher in the omap34xx.h file, so it isn't
>> enclosed by CONFIG_ARCH_OMAP34XX.  See for example OMAP3430_CTRL_BASE.
>> Trying to get rid of those defines in that conditional block :-)
>
>Thanks for noticing that.
>updated patch attached.
>
>>
>> - Paul
>>
>> > diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h
>> > index 0265e3b..1650937 100644
>> > --- a/include/asm-arm/arch-omap/omap34xx.h
>> > +++ b/include/asm-arm/arch-omap/omap34xx.h
>> > @@ -71,6 +71,7 @@
>> >  #define OMAP2_CTRL_BASE                      OMAP3430_CTRL_BASE
>> >  #define OMAP34XX_CONTROL_DEVCONF0    (L4_34XX_BASE + 0x2274)
>> >  #define OMAP34XX_CONTROL_DEVCONF1    (L4_34XX_BASE + 0x22D8)
>> > +#define OMAP34XX_HS_BASE             (L4_34XX_BASE + 0x65000)
>> >  #define OMAP2_CONTROL_STATUS         (OMAP2_CTRL_BASE + 0x2f0)
>> >
>> >  #endif
>> > --
>> > 1.5.3.5.666.gfb5f
>>
>> - Paul
>> _______________________________________________
>> Linux-omap-open-source mailing list
>> Linux-omap-open-source@linux.omap.com
>> http://linux.omap.com/mailman/listinfo/linux-omap-open-source
>>
>
>
>--
>Best Regards,
>
>Felipe Balbi
>felipebalbi@users.sourceforge.net

Re: [PATCH] ARM: OMAP: USB: Define OMAP34XX_HSUSB_OTG_BASE

[Tony Lindgren]

* Pandita, Vikram <vikram.pandita@ti.com> [071123 04:45]:
> Tony 
>  This patch: 
>  1) Correctly defines the base address for HSUSB_OTG block (MUSB)
>     Patch by Filipe had incorrect base address for 34xx
> 
>  2) Includes the base addresses of: USBTLL and USBHOST present in 3430ES2.0
> 
> Felipe
>  I see that for 34XX the base address for HSUSB_OTG is not correctly defined
>  by your patch so resending with modifications

Pushing this patch and the two others by Felipe.

Tony