Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Tony Lindgren]

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

Hi,

* Eric Witcher <ewitcher@mindspring.com> [090816 04:50]:
> Tony Lindgren <tony <at> atomide.com> writes:
> 
> <snip>
> 
> > I don't have a Beagle, so somebody please check this defconfig and enable
> > PM and OTG if possible.
> > 
> > Tony
> > --
> > To unsubscribe from this list: send the line "unsubscribe linux-omap" in
> > the body of a message to majordomo <at> vger.kernel.org
> > More majordomo info at  http://vger.kernel.org/majordomo-info.html
> > 
> > 
> Hi,
> 
> I checked this defconfig at it's commit
> 5dc8c8ffb27d93533d71493ca4a419f0290a3b2f
> with the following:
> 
> 1.  Brought omap3_beagle_defconfig forward to  2.6.31-rc5 level.
> (via make gconfig)  
> 
> 2.  Enabled CONFIG_PM, CONFIG_USB_MUSB_OTG, and
>  CONFIG_USB_GADGET_MUSB_HDRC with associated
> default subchoices. (via make gconfig)

Great!
 
> 3.  Removed 1 line work in progress? from arch/arm/mach-omap2/serial.c

Yes, the related change is still in for-next, seem that it's going in
when the merge window opens.
 
> 4.  Added previously posted (but not committed) patch
> for drivers/usb/otg/twl4030-usb.c
> 
> I was able to boot through INIT.
> 

Felipe, can you please check if you have the twl4030-usb.c fix queued up?

> The diffs are against the 2.6.31-rc5 generated
> version of omap3_beagle_defconfig.
> 
> Hope this helps.

Yes, thanks! Updated patch below.

Tony

[-- Attachment #2: beagle-defconfig-v3.patch --]
[-- Type: text/x-diff, Size: 4101 bytes --]

>From f9356c9b5ca663feb3a985b42d0409da5625d537 Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Sun, 16 Aug 2009 18:29:49 +0300
Subject: [PATCH] OMAP3: update OMAP3 Beagle defconfig

Update the OMAP3 Beagle defconfig to add EHCI, MMC, TWL4030 GPIO support.
Beagle can again use MMC rootfs after this patch.  Tested on BeagleBoard
rev C2.

Patch updated to enable PM and OTG options as suggested by
Eric Witcher <ewitcher@mindspring.com>.

Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
index 4c6fb7e..b213e3b 100644
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -128,6 +128,7 @@ CONFIG_DEFAULT_AS=y
 # CONFIG_DEFAULT_NOOP is not set
 CONFIG_DEFAULT_IOSCHED="anticipatory"
 CONFIG_CLASSIC_RCU=y
+CONFIG_FREEZER=y
 
 #
 # System Type
@@ -236,6 +237,7 @@ CONFIG_ARM_THUMB=y
 # CONFIG_CPU_BPREDICT_DISABLE is not set
 CONFIG_HAS_TLS_REG=y
 # CONFIG_OUTER_CACHE is not set
+CONFIG_COMMON_CLKDEV=y
 
 #
 # Bus support
@@ -317,7 +319,12 @@ CONFIG_BINFMT_MISC=y
 #
 # Power management options
 #
-# CONFIG_PM is not set
+CONFIG_PM=y
+# CONFIG_PM_DEBUG is not set
+CONFIG_PM_SLEEP=y
+CONFIG_SUSPEND=y
+CONFIG_SUSPEND_FREEZER=y
+# CONFIG_APM_EMULATION is not set
 CONFIG_ARCH_SUSPEND_POSSIBLE=y
 CONFIG_NET=y
 
@@ -713,6 +720,7 @@ CONFIG_GPIOLIB=y
 # CONFIG_GPIO_MAX732X is not set
 # CONFIG_GPIO_PCA953X is not set
 # CONFIG_GPIO_PCF857X is not set
+CONFIG_GPIO_TWL4030=y
 
 #
 # PCI GPIO expanders:
@@ -741,6 +749,7 @@ CONFIG_SSB_POSSIBLE=y
 # CONFIG_MFD_SM501 is not set
 # CONFIG_HTC_EGPIO is not set
 # CONFIG_HTC_PASIC3 is not set
+CONFIG_TWL4030_CORE=y
 # CONFIG_UCB1400_CORE is not set
 # CONFIG_MFD_TMIO is not set
 # CONFIG_MFD_T7L66XB is not set
@@ -787,7 +796,7 @@ CONFIG_DUMMY_CONSOLE=y
 CONFIG_USB_SUPPORT=y
 CONFIG_USB_ARCH_HAS_HCD=y
 CONFIG_USB_ARCH_HAS_OHCI=y
-# CONFIG_USB_ARCH_HAS_EHCI is not set
+CONFIG_USB_ARCH_HAS_EHCI=y
 CONFIG_USB=y
 # CONFIG_USB_DEBUG is not set
 # CONFIG_USB_ANNOUNCE_NEW_DEVICES is not set
@@ -798,7 +807,8 @@ CONFIG_USB=y
 CONFIG_USB_DEVICEFS=y
 CONFIG_USB_DEVICE_CLASS=y
 # CONFIG_USB_DYNAMIC_MINORS is not set
-# CONFIG_USB_OTG is not set
+CONFIG_USB_SUSPEND=y
+CONFIG_USB_OTG=y
 # CONFIG_USB_OTG_WHITELIST is not set
 # CONFIG_USB_OTG_BLACKLIST_HUB is not set
 CONFIG_USB_MON=y
@@ -806,6 +816,8 @@ CONFIG_USB_MON=y
 #
 # USB Host Controller Drivers
 #
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_EHCI_ROOT_HUB_TT=y
 # CONFIG_USB_C67X00_HCD is not set
 # CONFIG_USB_ISP116X_HCD is not set
 # CONFIG_USB_ISP1760_HCD is not set
@@ -818,10 +830,10 @@ CONFIG_USB_MUSB_SOC=y
 #
 # OMAP 343x high speed USB support
 #
-CONFIG_USB_MUSB_HOST=y
+# CONFIG_USB_MUSB_HOST is not set
 # CONFIG_USB_MUSB_PERIPHERAL is not set
-# CONFIG_USB_MUSB_OTG is not set
-# CONFIG_USB_GADGET_MUSB_HDRC is not set
+CONFIG_USB_MUSB_OTG=y
+CONFIG_USB_GADGET_MUSB_HDRC=y
 CONFIG_USB_MUSB_HDRC_HCD=y
 # CONFIG_MUSB_PIO_ONLY is not set
 CONFIG_USB_INVENTRA_DMA=y
@@ -906,6 +918,15 @@ CONFIG_USB_ETH_RNDIS=y
 # CONFIG_USB_MIDI_GADGET is not set
 # CONFIG_USB_G_PRINTER is not set
 # CONFIG_USB_CDC_COMPOSITE is not set
+
+#
+# OTG and related infrastructure
+#
+CONFIG_USB_OTG_UTILS=y
+# CONFIG_USB_GPIO_VBUS is not set
+# CONFIG_ISP1301_OMAP is not set
+CONFIG_TWL4030_USB=y
+# CONFIG_NOP_USB_XCEIV is not set
 CONFIG_MMC=y
 # CONFIG_MMC_DEBUG is not set
 # CONFIG_MMC_UNSAFE_RESUME is not set
@@ -923,6 +944,7 @@ CONFIG_MMC_BLOCK_BOUNCE=y
 #
 # CONFIG_MMC_SDHCI is not set
 # CONFIG_MMC_OMAP is not set
+CONFIG_MMC_OMAP_HS=y
 # CONFIG_MEMSTICK is not set
 # CONFIG_ACCESSIBILITY is not set
 # CONFIG_NEW_LEDS is not set
@@ -981,10 +1003,11 @@ CONFIG_RTC_INTF_DEV=y
 #
 # Voltage and Current regulators
 #
-# CONFIG_REGULATOR is not set
+CONFIG_REGULATOR=y
 # CONFIG_REGULATOR_FIXED_VOLTAGE is not set
 # CONFIG_REGULATOR_VIRTUAL_CONSUMER is not set
 # CONFIG_REGULATOR_BQ24022 is not set
+CONFIG_REGULATOR_TWL4030=y
 # CONFIG_UIO is not set
 
 #

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Felipe Balbi]

Hi,

On Sun, Aug 16, 2009 at 06:42:00PM +0300, Tony Lindgren wrote:
> Felipe, can you please check if you have the twl4030-usb.c fix queued up?

Should I take it via linux-usb ? The fix is in board-omap3beagle.c

-- 
balbi

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Tony Lindgren]

* Felipe Balbi <me@felipebalbi.com> [090816 20:07]:
> Hi,
> 
> On Sun, Aug 16, 2009 at 06:42:00PM +0300, Tony Lindgren wrote:
> > Felipe, can you please check if you have the twl4030-usb.c fix queued up?
> 
> Should I take it via linux-usb ? The fix is in board-omap3beagle.c

Yeh, please do, here's my ack:

Acked-by: Tony Lindgren <tony@atomide.com>

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Felipe Balbi]

Hi,

On Sun, Aug 16, 2009 at 05:42:00PM +0200, ext Tony Lindgren wrote:
> From f9356c9b5ca663feb3a985b42d0409da5625d537 Mon Sep 17 00:00:00 2001
> From: Paul Walmsley <paul@pwsan.com>
> Date: Sun, 16 Aug 2009 18:29:49 +0300
> Subject: [PATCH] OMAP3: update OMAP3 Beagle defconfig
> 
> Update the OMAP3 Beagle defconfig to add EHCI, MMC, TWL4030 GPIO support.
> Beagle can again use MMC rootfs after this patch.  Tested on BeagleBoard
> rev C2.
> 
> Patch updated to enable PM and OTG options as suggested by
> Eric Witcher <ewitcher@mindspring.com>.
> 
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Jason Kridner <jkridner@beagleboard.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

now that we have REGULATOR and TWL4030_USB it will work.

-- 
balbi

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Eric Witcher]

-----Original Message-----
>From: Felipe Balbi <felipe.balbi@nokia.com>
>Sent: Aug 19, 2009 9:40 AM
>To: ext Tony Lindgren <tony@atomide.com>
>Cc: Eric Witcher <ewitcher@mindspring.com>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
>Subject: Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
>
>Hi,
>
>On Sun, Aug 16, 2009 at 05:42:00PM +0200, ext Tony Lindgren wrote:
>> From f9356c9b5ca663feb3a985b42d0409da5625d537 Mon Sep 17 00:00:00 2001
>> From: Paul Walmsley <paul@pwsan.com>
>> Date: Sun, 16 Aug 2009 18:29:49 +0300
>> Subject: [PATCH] OMAP3: update OMAP3 Beagle defconfig
>> 
>> Update the OMAP3 Beagle defconfig to add EHCI, MMC, TWL4030 GPIO support.
>> Beagle can again use MMC rootfs after this patch.  Tested on BeagleBoard
>> rev C2.
>> 
>> Patch updated to enable PM and OTG options as suggested by
>> Eric Witcher <ewitcher@mindspring.com>.
>> 
>> Signed-off-by: Paul Walmsley <paul@pwsan.com>
>> Cc: Jason Kridner <jkridner@beagleboard.org>
>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>
>Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
>
>now that we have REGULATOR and TWL4030_USB it will work.
>
Hi everyone,

I just tested this again at the top of for-next at
 6e083649e19ba4aa3b8a65d75f394ab8a06feb78
and we are still short 2 changes in order to get a working
boot using omap3_beagle_defconfig.

The changes are shown below.

The code deltas were discussed before
but I didn't follow how the twl4030-usb.c change was going to make
it into the tree.

With respect to the .config change, it was shown in my earlier post
but it didn't get put into the commit at
OMAP3: update OMAP3 Beagle defconfig
af9d536a65251a547864e3be87f53a22a6966b7a

In that check-in configuration CONFIG_USB_M66592 overrides
CONFIG_USB_GADGET_MUSB_HDRC and we fail during compile.

Eric

---
 arch/arm/configs/omap3_beagle_defconfig |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
index b213e3b..51c0fa8 100644
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -899,8 +899,8 @@ CONFIG_USB_GADGET_SELECTED=y
 # CONFIG_USB_GADGET_FSL_USB2 is not set
 # CONFIG_USB_GADGET_NET2280 is not set
 # CONFIG_USB_GADGET_PXA25X is not set
-CONFIG_USB_GADGET_M66592=y
-CONFIG_USB_M66592=y
+# CONFIG_USB_GADGET_M66592 is not set
+# CONFIG_USB_M66592 is not set
 # CONFIG_USB_GADGET_PXA27X is not set
 # CONFIG_USB_GADGET_GOKU is not set
 # CONFIG_USB_GADGET_LH7A40X is not set
-- 
1.6.2.2

---
 arch/arm/mach-omap2/serial.c  |    1 -
 drivers/usb/otg/twl4030-usb.c |    2 +-
 2 files changed, 1 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 021130d..1cf8078 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -475,7 +475,6 @@ static void omap_uart_idle_init(struct omap_uart_state *uart)
 		uart->padconf = 0;
 	}
 
-	p->irqflags |= IRQF_SHARED;
 	ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED,
 			  "serial idle", (void *)uart);
 	WARN_ON(ret);
diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
index 9e3e7a5..d1852d4 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -774,7 +774,7 @@ static int __init twl4030_usb_init(void)
 {
 	return platform_driver_register(&twl4030_usb_driver);
 }
-subsys_initcall(twl4030_usb_init);
+subsys_initcall_sync(twl4030_usb_init);
 
 static void __exit twl4030_usb_exit(void)
 {
-- 
1.6.2.2



>-- 
>balbi
>--
>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

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Tony Lindgren]

Hi Eric & Felipe,

* Eric Witcher <ewitcher@mindspring.com> [090825 20:20]:
> 
> -----Original Message-----
> >From: Felipe Balbi <felipe.balbi@nokia.com>
> >Sent: Aug 19, 2009 9:40 AM
> >To: ext Tony Lindgren <tony@atomide.com>
> >Cc: Eric Witcher <ewitcher@mindspring.com>, "linux-omap@vger.kernel.org" <linux-omap@vger.kernel.org>
> >Subject: Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
> >
> >Hi,
> >
> >On Sun, Aug 16, 2009 at 05:42:00PM +0200, ext Tony Lindgren wrote:
> >> From f9356c9b5ca663feb3a985b42d0409da5625d537 Mon Sep 17 00:00:00 2001
> >> From: Paul Walmsley <paul@pwsan.com>
> >> Date: Sun, 16 Aug 2009 18:29:49 +0300
> >> Subject: [PATCH] OMAP3: update OMAP3 Beagle defconfig
> >> 
> >> Update the OMAP3 Beagle defconfig to add EHCI, MMC, TWL4030 GPIO support.
> >> Beagle can again use MMC rootfs after this patch.  Tested on BeagleBoard
> >> rev C2.
> >> 
> >> Patch updated to enable PM and OTG options as suggested by
> >> Eric Witcher <ewitcher@mindspring.com>.
> >> 
> >> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> >> Cc: Jason Kridner <jkridner@beagleboard.org>
> >> Signed-off-by: Tony Lindgren <tony@atomide.com>
> >
> >Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
> >
> >now that we have REGULATOR and TWL4030_USB it will work.

Updated the patch with Felipe's Ack. Then see below on how
we should deal with the remaining parts.

> >
> Hi everyone,
> 
> I just tested this again at the top of for-next at
>  6e083649e19ba4aa3b8a65d75f394ab8a06feb78
> and we are still short 2 changes in order to get a working
> boot using omap3_beagle_defconfig.
> 
> The changes are shown below.
> 
> The code deltas were discussed before
> but I didn't follow how the twl4030-usb.c change was going to make
> it into the tree.
> 
> With respect to the .config change, it was shown in my earlier post
> but it didn't get put into the commit at
> OMAP3: update OMAP3 Beagle defconfig
> af9d536a65251a547864e3be87f53a22a6966b7a
> 
> In that check-in configuration CONFIG_USB_M66592 overrides
> CONFIG_USB_GADGET_MUSB_HDRC and we fail during compile.
> 
> Eric
> 
> ---
>  arch/arm/configs/omap3_beagle_defconfig |    4 ++--
>  1 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
> index b213e3b..51c0fa8 100644
> --- a/arch/arm/configs/omap3_beagle_defconfig
> +++ b/arch/arm/configs/omap3_beagle_defconfig
> @@ -899,8 +899,8 @@ CONFIG_USB_GADGET_SELECTED=y
>  # CONFIG_USB_GADGET_FSL_USB2 is not set
>  # CONFIG_USB_GADGET_NET2280 is not set
>  # CONFIG_USB_GADGET_PXA25X is not set
> -CONFIG_USB_GADGET_M66592=y
> -CONFIG_USB_M66592=y
> +# CONFIG_USB_GADGET_M66592 is not set
> +# CONFIG_USB_M66592 is not set
>  # CONFIG_USB_GADGET_PXA27X is not set
>  # CONFIG_USB_GADGET_GOKU is not set
>  # CONFIG_USB_GADGET_LH7A40X is not set

Thanks, merged this part into the patch.


> -- 
> 1.6.2.2
> 
> ---
>  arch/arm/mach-omap2/serial.c  |    1 -
>  drivers/usb/otg/twl4030-usb.c |    2 +-
>  2 files changed, 1 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
> index 021130d..1cf8078 100644
> --- a/arch/arm/mach-omap2/serial.c
> +++ b/arch/arm/mach-omap2/serial.c
> @@ -475,7 +475,6 @@ static void omap_uart_idle_init(struct omap_uart_state *uart)
>  		uart->padconf = 0;
>  	}
>  
> -	p->irqflags |= IRQF_SHARED;
>  	ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED,
>  			  "serial idle", (void *)uart);
>  	WARN_ON(ret);

The related serial irqflags changes are already queued up in for-next,
so this we can ignore until the omap for-next is merged.


> diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030-usb.c
> index 9e3e7a5..d1852d4 100644
> --- a/drivers/usb/otg/twl4030-usb.c
> +++ b/drivers/usb/otg/twl4030-usb.c
> @@ -774,7 +774,7 @@ static int __init twl4030_usb_init(void)
>  {
>  	return platform_driver_register(&twl4030_usb_driver);
>  }
> -subsys_initcall(twl4030_usb_init);
> +subsys_initcall_sync(twl4030_usb_init);
>  
>  static void __exit twl4030_usb_exit(void)
>  {

But this should be a separate patch and Felipe should take a look at it.

Regards,

Tony

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Eric Witcher]

On Aug 28, 2009, at 2:13 PM, Tony Lindgren wrote:

> Hi Eric & Felipe,
>
> * Eric Witcher <ewitcher@mindspring.com> [090825 20:20]:
>>
>> -----Original Message-----
>>> From: Felipe Balbi <felipe.balbi@nokia.com>
>>> Sent: Aug 19, 2009 9:40 AM
>>> To: ext Tony Lindgren <tony@atomide.com>
>>> Cc: Eric Witcher <ewitcher@mindspring.com>, "linux-omap@vger.kernel.org 
>>> " <linux-omap@vger.kernel.org>
>>> Subject: Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
>>>
>>> Hi,
>>>
>>> On Sun, Aug 16, 2009 at 05:42:00PM +0200, ext Tony Lindgren wrote:
>>>> From f9356c9b5ca663feb3a985b42d0409da5625d537 Mon Sep 17 00:00:00  
>>>> 2001
>>>> From: Paul Walmsley <paul@pwsan.com>
>>>> Date: Sun, 16 Aug 2009 18:29:49 +0300
>>>> Subject: [PATCH] OMAP3: update OMAP3 Beagle defconfig
>>>>
>>>> Update the OMAP3 Beagle defconfig to add EHCI, MMC, TWL4030 GPIO  
>>>> support.
>>>> Beagle can again use MMC rootfs after this patch.  Tested on  
>>>> BeagleBoard
>>>> rev C2.
>>>>
>>>> Patch updated to enable PM and OTG options as suggested by
>>>> Eric Witcher <ewitcher@mindspring.com>.
>>>>
>>>> Signed-off-by: Paul Walmsley <paul@pwsan.com>
>>>> Cc: Jason Kridner <jkridner@beagleboard.org>
>>>> Signed-off-by: Tony Lindgren <tony@atomide.com>
>>>
>>> Acked-by: Felipe Balbi <felipe.balbi@nokia.com>
>>>
>>> now that we have REGULATOR and TWL4030_USB it will work.
>
> Updated the patch with Felipe's Ack. Then see below on how
> we should deal with the remaining parts.
>
>>>
>> Hi everyone,
>>
>> I just tested this again at the top of for-next at
>> 6e083649e19ba4aa3b8a65d75f394ab8a06feb78
>> and we are still short 2 changes in order to get a working
>> boot using omap3_beagle_defconfig.
>>
>> The changes are shown below.
>>
>> The code deltas were discussed before
>> but I didn't follow how the twl4030-usb.c change was going to make
>> it into the tree.
>>
>> With respect to the .config change, it was shown in my earlier post
>> but it didn't get put into the commit at
>> OMAP3: update OMAP3 Beagle defconfig
>> af9d536a65251a547864e3be87f53a22a6966b7a
>>
>> In that check-in configuration CONFIG_USB_M66592 overrides
>> CONFIG_USB_GADGET_MUSB_HDRC and we fail during compile.
>>
>> Eric
>>
>> ---
>> arch/arm/configs/omap3_beagle_defconfig |    4 ++--
>> 1 files changed, 2 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/ 
>> configs/omap3_beagle_defconfig
>> index b213e3b..51c0fa8 100644
>> --- a/arch/arm/configs/omap3_beagle_defconfig
>> +++ b/arch/arm/configs/omap3_beagle_defconfig
>> @@ -899,8 +899,8 @@ CONFIG_USB_GADGET_SELECTED=y
>> # CONFIG_USB_GADGET_FSL_USB2 is not set
>> # CONFIG_USB_GADGET_NET2280 is not set
>> # CONFIG_USB_GADGET_PXA25X is not set
>> -CONFIG_USB_GADGET_M66592=y
>> -CONFIG_USB_M66592=y
>> +# CONFIG_USB_GADGET_M66592 is not set
>> +# CONFIG_USB_M66592 is not set
>> # CONFIG_USB_GADGET_PXA27X is not set
>> # CONFIG_USB_GADGET_GOKU is not set
>> # CONFIG_USB_GADGET_LH7A40X is not set
>
> Thanks, merged this part into the patch.
>
>
>> -- 
>> 1.6.2.2
>>
>> ---
>> arch/arm/mach-omap2/serial.c  |    1 -
>> drivers/usb/otg/twl4030-usb.c |    2 +-
>> 2 files changed, 1 insertions(+), 2 deletions(-)
>>
>> diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/ 
>> serial.c
>> index 021130d..1cf8078 100644
>> --- a/arch/arm/mach-omap2/serial.c
>> +++ b/arch/arm/mach-omap2/serial.c
>> @@ -475,7 +475,6 @@ static void omap_uart_idle_init(struct  
>> omap_uart_state *uart)
>> 		uart->padconf = 0;
>> 	}
>>
>> -	p->irqflags |= IRQF_SHARED;
>> 	ret = request_irq(p->irq, omap_uart_interrupt, IRQF_SHARED,
>> 			  "serial idle", (void *)uart);
>> 	WARN_ON(ret);
>
> The related serial irqflags changes are already queued up in for-next,
> so this we can ignore until the omap for-next is merged.
>
>
>> diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/ 
>> twl4030-usb.c
>> index 9e3e7a5..d1852d4 100644
>> --- a/drivers/usb/otg/twl4030-usb.c
>> +++ b/drivers/usb/otg/twl4030-usb.c
>> @@ -774,7 +774,7 @@ static int __init twl4030_usb_init(void)
>> {
>> 	return platform_driver_register(&twl4030_usb_driver);
>> }
>> -subsys_initcall(twl4030_usb_init);
>> +subsys_initcall_sync(twl4030_usb_init);
>>
>> static void __exit twl4030_usb_exit(void)
>> {
>
> But this should be a separate patch and Felipe should take a look at  
> it.
Thanks Tony.

For Felipe to reference, here is the original patch (with a Tested-by  
added).

List:       linux-usb
Subject:    [PATCH] USB:otg:twl4030-usb.c: mark .init as  
subsys_initcall_sync
From:       tom.leiming () gmail ! com
Date:       2009-08-01 12:39:57
Message-ID: 1249130397-20971-1-git-send-email-tom.leiming () gmail ! com
[Download message RAW]

From: Ming Lei <tom.leiming@gmail.com>

This patch fixes the .probe failure of twl4030_usb driver if
it is compiled into kernel.

Since twl4030_usb USB transceiver .probe depends on
twl4030-regulator, marking twl4030_usb_init as subsys_initcall_sync
can make it called after twl4030-regulator initialization is finished,
then twl4030_usb USB transceiver driver can be probed successfully.

Signed-off-by: Ming Lei <tom.leiming@gmail.com>
Tested-by: Eric Witcher <ewitcher@mindspring.com>
---
  drivers/usb/otg/twl4030-usb.c |    2 +-
  1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/drivers/usb/otg/twl4030-usb.c b/drivers/usb/otg/twl4030- 
usb.c
index 9e3e7a5..d1852d4 100644
--- a/drivers/usb/otg/twl4030-usb.c
+++ b/drivers/usb/otg/twl4030-usb.c
@@ -774,7 +774,7 @@ static int __init twl4030_usb_init(void)
  {
  	return platform_driver_register(&twl4030_usb_driver);
  }
-subsys_initcall(twl4030_usb_init);
+subsys_initcall_sync(twl4030_usb_init);

  static void __exit twl4030_usb_exit(void)
  {
-- 
1.6.0.GIT

--




>
>
> Regards,
>
> Tony

Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3

[Felipe Balbi]

Hi,

On Sun, Aug 30, 2009 at 12:38:07AM +0200, ext Eric Witcher wrote:
> From: Ming Lei <tom.leiming@gmail.com>
> 
> This patch fixes the .probe failure of twl4030_usb driver if
> it is compiled into kernel.
> 
> Since twl4030_usb USB transceiver .probe depends on
> twl4030-regulator, marking twl4030_usb_init as subsys_initcall_sync
> can make it called after twl4030-regulator initialization is finished,
> then twl4030_usb USB transceiver driver can be probed successfully.
> 
> Signed-off-by: Ming Lei <tom.leiming@gmail.com>
> Tested-by: Eric Witcher <ewitcher@mindspring.com>

Acked-by: Felipe Balbi <felipe.balbi@nokia.com>

should go to Greg KH on linux-usb

-- 
balbi