* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
@ 2009-08-26 3:20 Eric Witcher
2009-08-28 18:13 ` Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Eric Witcher @ 2009-08-26 3:20 UTC (permalink / raw)
To: felipe.balbi, ext Tony Lindgren; +Cc: linux-omap@vger.kernel.org
-----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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-26 3:20 [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Eric Witcher
@ 2009-08-28 18:13 ` Tony Lindgren
2009-08-29 22:38 ` Eric Witcher
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2009-08-28 18:13 UTC (permalink / raw)
To: Eric Witcher; +Cc: felipe.balbi, linux-omap@vger.kernel.org
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
^ permalink raw reply [flat|nested] 8+ messages in thread* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-28 18:13 ` Tony Lindgren
@ 2009-08-29 22:38 ` Eric Witcher
2009-09-02 10:21 ` Felipe Balbi
0 siblings, 1 reply; 8+ messages in thread
From: Eric Witcher @ 2009-08-29 22:38 UTC (permalink / raw)
To: Tony Lindgren; +Cc: felipe.balbi, linux-omap@vger.kernel.org
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
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-29 22:38 ` Eric Witcher
@ 2009-09-02 10:21 ` Felipe Balbi
0 siblings, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2009-09-02 10:21 UTC (permalink / raw)
To: ext Eric Witcher
Cc: Tony Lindgren, Balbi Felipe (Nokia-D/Helsinki),
linux-omap@vger.kernel.org
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 00/10] Omap3 updates for upcoming 2.6.32 merge window
@ 2009-08-12 12:10 Tony Lindgren
2009-08-12 12:24 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2009-08-12 12:10 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: linux-omap
Hi all,
Here are mostly omap3 specific updates for the merge window.
Regards,
Tony
---
Felipe Balbi (1):
OMAP3: beagle: add missing twl4030 usb platform_data
Hiroshi DOYU (2):
OMAP: iommu: add initial debugfs support
OMAP: iommu: fix wrong argument in flush_cache_vmap()
Paul Walmsley (1):
OMAP3: update OMAP3 Beagle defconfig
Sergio Aguirre (1):
OMAP3: 3430SDP: Fix defconfig
Timo Kokkonen (1):
OMAP3: rx51_defconfig: add twl4030 to rx51 default configuration
Vikram Pandita (4):
OMAP3: Zoom2: Update board defconfig
OMAP3: Zoom2: Add TWL4030 support
OMAP3: MMC: Add mux for pins
OMAP2/3: Pass irqflags to 8250 driver
arch/arm/configs/omap3_beagle_defconfig | 11 +
arch/arm/configs/omap_3430sdp_defconfig | 20 +
arch/arm/configs/omap_zoom2_defconfig | 484 +++++++++++++++++++++++----
arch/arm/configs/rx51_defconfig | 1
arch/arm/mach-omap2/board-omap3beagle.c | 5
arch/arm/mach-omap2/board-zoom-debugboard.c | 2
arch/arm/mach-omap2/board-zoom2.c | 204 +++++++++++
arch/arm/mach-omap2/devices.c | 42 ++
arch/arm/mach-omap2/mux.c | 49 +++
arch/arm/mach-omap2/serial.c | 2
arch/arm/plat-omap/Kconfig | 4
arch/arm/plat-omap/Makefile | 1
arch/arm/plat-omap/include/mach/mux.h | 28 ++
arch/arm/plat-omap/iommu-debug.c | 334 +++++++++++++++++++
arch/arm/plat-omap/iovmm.c | 2
15 files changed, 1088 insertions(+), 101 deletions(-)
create mode 100644 arch/arm/plat-omap/iommu-debug.c
--
Signature
^ permalink raw reply [flat|nested] 8+ messages in thread* [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig
2009-08-12 12:10 [PATCH 00/10] Omap3 updates for upcoming 2.6.32 merge window Tony Lindgren
@ 2009-08-12 12:24 ` Tony Lindgren
2009-08-12 12:27 ` Felipe Balbi
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2009-08-12 12:24 UTC (permalink / raw)
To: linux-arm-kernel; +Cc: Paul Walmsley, linux-omap, Jason Kridner
From: Paul Walmsley <paul@pwsan.com>
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.
Signed-off-by: Paul Walmsley <paul@pwsan.com>
Cc: Jason Kridner <jkridner@beagleboard.org>
Signed-off-by: Tony Lindgren <tony@atomide.com>
---
arch/arm/configs/omap3_beagle_defconfig | 11 +++++++++--
1 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
index 4c6fb7e..264ac2e 100644
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -236,6 +236,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
@@ -713,6 +714,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 +743,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 +790,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
@@ -806,6 +809,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
@@ -923,6 +928,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 +987,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
#
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig
2009-08-12 12:24 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig Tony Lindgren
@ 2009-08-12 12:27 ` Felipe Balbi
2009-08-12 16:52 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2 Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Felipe Balbi @ 2009-08-12 12:27 UTC (permalink / raw)
To: ext Tony Lindgren
Cc: linux-arm-kernel@lists.arm.linux.org.uk, Paul Walmsley,
linux-omap@vger.kernel.org, Jason Kridner
Hi,
On Wed, Aug 12, 2009 at 02:24:15PM +0200, ext Tony Lindgren wrote:
> From: Paul Walmsley <paul@pwsan.com>
>
> 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.
>
> Signed-off-by: Paul Walmsley <paul@pwsan.com>
> Cc: Jason Kridner <jkridner@beagleboard.org>
> Signed-off-by: Tony Lindgren <tony@atomide.com>
> ---
> arch/arm/configs/omap3_beagle_defconfig | 11 +++++++++--
> 1 files changed, 9 insertions(+), 2 deletions(-)
>
> diff --git a/arch/arm/configs/omap3_beagle_defconfig b/arch/arm/configs/omap3_beagle_defconfig
> index 4c6fb7e..264ac2e 100644
> --- a/arch/arm/configs/omap3_beagle_defconfig
> +++ b/arch/arm/configs/omap3_beagle_defconfig
> @@ -236,6 +236,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
> @@ -713,6 +714,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 +743,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 +790,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
> @@ -806,6 +809,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
> @@ -923,6 +928,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 +987,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
musb will still fail here if we don't have twl4030-usb enabled.
could you updated the patch to add that as well ??
--
balbi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2
2009-08-12 12:27 ` Felipe Balbi
@ 2009-08-12 16:52 ` Tony Lindgren
2009-08-12 17:20 ` Kevin Hilman
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2009-08-12 16:52 UTC (permalink / raw)
To: Felipe Balbi
Cc: linux-arm-kernel@lists.arm.linux.org.uk, Paul Walmsley,
linux-omap@vger.kernel.org, Jason Kridner
[-- Attachment #1: Type: text/plain, Size: 981 bytes --]
* Felipe Balbi <felipe.balbi@nokia.com> [090812 15:29]:
> Hi,
>
> On Wed, Aug 12, 2009 at 02:24:15PM +0200, ext Tony Lindgren wrote:
> > From: Paul Walmsley <paul@pwsan.com>
> >
> > 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.
> >
<snip>
> > @@ -981,10 +987,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
>
> musb will still fail here if we don't have twl4030-usb enabled.
>
> could you updated the patch to add that as well ??
Updated. Maybe take a look and see if the USB options make sense
to you? I could not enable OTG for some reason..
Regards,
Tony
[-- Attachment #2: beagle-defconfig-v2.patch --]
[-- Type: text/x-diff, Size: 2840 bytes --]
>From 5dc8c8ffb27d93533d71493ca4a419f0290a3b2f Mon Sep 17 00:00:00 2001
From: Paul Walmsley <paul@pwsan.com>
Date: Wed, 12 Aug 2009 15:06:36 +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.
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..882f374 100644
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -236,6 +236,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
@@ -713,6 +714,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 +743,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 +790,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
@@ -806,6 +809,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
@@ -906,6 +911,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 +937,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 +996,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
#
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2
2009-08-12 16:52 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2 Tony Lindgren
@ 2009-08-12 17:20 ` Kevin Hilman
2009-08-12 19:11 ` Felipe Balbi
0 siblings, 1 reply; 8+ messages in thread
From: Kevin Hilman @ 2009-08-12 17:20 UTC (permalink / raw)
To: Tony Lindgren
Cc: Felipe Balbi, linux-arm-kernel@lists.arm.linux.org.uk,
Paul Walmsley, linux-omap@vger.kernel.org, Jason Kridner
Tony Lindgren <tony@atomide.com> writes:
> * Felipe Balbi <felipe.balbi@nokia.com> [090812 15:29]:
>> Hi,
>>
>> On Wed, Aug 12, 2009 at 02:24:15PM +0200, ext Tony Lindgren wrote:
>> > From: Paul Walmsley <paul@pwsan.com>
>> >
>> > 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.
>> >
>
> <snip>
>
>> > @@ -981,10 +987,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
>>
>> musb will still fail here if we don't have twl4030-usb enabled.
>>
>> could you updated the patch to add that as well ??
>
> Updated. Maybe take a look and see if the USB options make sense
> to you? I could not enable OTG for some reason..
>
Probably because OTG depends on CONFIG_PM I think.
Kevin
>
> From 5dc8c8ffb27d93533d71493ca4a419f0290a3b2f Mon Sep 17 00:00:00 2001
> From: Paul Walmsley <paul@pwsan.com>
> Date: Wed, 12 Aug 2009 15:06:36 +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.
>
> 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..882f374 100644
> --- a/arch/arm/configs/omap3_beagle_defconfig
> +++ b/arch/arm/configs/omap3_beagle_defconfig
> @@ -236,6 +236,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
> @@ -713,6 +714,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 +743,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 +790,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
> @@ -806,6 +809,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
> @@ -906,6 +911,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 +937,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 +996,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
>
> #
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2
2009-08-12 17:20 ` Kevin Hilman
@ 2009-08-12 19:11 ` Felipe Balbi
2009-08-13 7:02 ` Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Felipe Balbi @ 2009-08-12 19:11 UTC (permalink / raw)
To: Kevin Hilman
Cc: Tony Lindgren, Felipe Balbi,
linux-arm-kernel@lists.arm.linux.org.uk, Paul Walmsley,
linux-omap@vger.kernel.org, Jason Kridner
On Wed, Aug 12, 2009 at 10:20:34AM -0700, Kevin Hilman wrote:
> Tony Lindgren <tony@atomide.com> writes:
>
> > * Felipe Balbi <felipe.balbi@nokia.com> [090812 15:29]:
> >> Hi,
> >>
> >> On Wed, Aug 12, 2009 at 02:24:15PM +0200, ext Tony Lindgren wrote:
> >> > From: Paul Walmsley <paul@pwsan.com>
> >> >
> >> > 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.
> >> >
> >
> > <snip>
> >
> >> > @@ -981,10 +987,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
> >>
> >> musb will still fail here if we don't have twl4030-usb enabled.
> >>
> >> could you updated the patch to add that as well ??
> >
> > Updated. Maybe take a look and see if the USB options make sense
> > to you? I could not enable OTG for some reason..
> >
>
> Probably because OTG depends on CONFIG_PM I think.
correct
--
balbi
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2
2009-08-12 19:11 ` Felipe Balbi
@ 2009-08-13 7:02 ` Tony Lindgren
2009-08-16 1:48 ` Eric Witcher
0 siblings, 1 reply; 8+ messages in thread
From: Tony Lindgren @ 2009-08-13 7:02 UTC (permalink / raw)
To: Felipe Balbi
Cc: Kevin Hilman, Felipe Balbi,
linux-arm-kernel@lists.arm.linux.org.uk, Paul Walmsley,
linux-omap@vger.kernel.org, Jason Kridner
* Felipe Balbi <me@felipebalbi.com> [090812 22:11]:
> On Wed, Aug 12, 2009 at 10:20:34AM -0700, Kevin Hilman wrote:
> > Tony Lindgren <tony@atomide.com> writes:
> >
> > > * Felipe Balbi <felipe.balbi@nokia.com> [090812 15:29]:
> > >> Hi,
> > >>
> > >> On Wed, Aug 12, 2009 at 02:24:15PM +0200, ext Tony Lindgren wrote:
> > >> > From: Paul Walmsley <paul@pwsan.com>
> > >> >
> > >> > 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.
> > >> >
> > >
> > > <snip>
> > >
> > >> > @@ -981,10 +987,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
> > >>
> > >> musb will still fail here if we don't have twl4030-usb enabled.
> > >>
> > >> could you updated the patch to add that as well ??
> > >
> > > Updated. Maybe take a look and see if the USB options make sense
> > > to you? I could not enable OTG for some reason..
> > >
> >
> > Probably because OTG depends on CONFIG_PM I think.
>
> correct
I don't have a Beagle, so somebody please check this defconfig and enable
PM and OTG if possible.
Tony
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2
2009-08-13 7:02 ` Tony Lindgren
@ 2009-08-16 1:48 ` Eric Witcher
2009-08-16 15:42 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Tony Lindgren
0 siblings, 1 reply; 8+ messages in thread
From: Eric Witcher @ 2009-08-16 1:48 UTC (permalink / raw)
To: linux-omap
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)
3. Removed 1 line work in progress? from arch/arm/mach-omap2/serial.c
4. Added previously posted (but not committed) patch
for drivers/usb/otg/twl4030-usb.c
I was able to boot through INIT.
The diffs are against the 2.6.31-rc5 generated
version of omap3_beagle_defconfig.
Hope this helps.
diff --git a/arch/arm/configs/omap3_beagle_defconfig
b/arch/arm/configs/omap3_beagle_defconfig
index 59eaf8c..3c001e5 100644
--- a/arch/arm/configs/omap3_beagle_defconfig
+++ b/arch/arm/configs/omap3_beagle_defconfig
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.31-rc5
-# Sat Aug 15 19:12:37 2009
+# Sat Aug 15 20:05:10 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -136,7 +136,7 @@ CONFIG_DEFAULT_AS=y
# CONFIG_DEFAULT_CFQ is not set
# CONFIG_DEFAULT_NOOP is not set
CONFIG_DEFAULT_IOSCHED="anticipatory"
-# CONFIG_FREEZER is not set
+CONFIG_FREEZER=y
#
# System Type
@@ -338,7 +338,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
@@ -829,7 +834,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
@@ -853,10 +859,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
@@ -931,8 +937,7 @@ CONFIG_USB_GADGET_SELECTED=y
# CONFIG_USB_GADGET_S3C_HSOTG is not set
# CONFIG_USB_GADGET_IMX is not set
# CONFIG_USB_GADGET_S3C2410 is not set
-CONFIG_USB_GADGET_M66592=y
-CONFIG_USB_M66592=y
+# CONFIG_USB_GADGET_M66592 is not set
# CONFIG_USB_GADGET_AMD5536UDC is not set
# CONFIG_USB_GADGET_FSL_QE is not set
# CONFIG_USB_GADGET_CI13XXX is not set
diff --git a/arch/arm/mach-omap2/serial.c b/arch/arm/mach-omap2/serial.c
index 3f29376..bd9e2b2 100644
--- a/arch/arm/mach-omap2/serial.c
+++ b/arch/arm/mach-omap2/serial.c
@@ -429,7 +429,6 @@ static void omap_uart_idle_init(struct omap_uart_state *uart)
omap_ctrl_writew(v, uart->padconf);
}
- 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)
{
^ permalink raw reply related [flat|nested] 8+ messages in thread* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-16 1:48 ` Eric Witcher
@ 2009-08-16 15:42 ` Tony Lindgren
2009-08-16 17:07 ` Felipe Balbi
2009-08-19 13:40 ` Felipe Balbi
0 siblings, 2 replies; 8+ messages in thread
From: Tony Lindgren @ 2009-08-16 15:42 UTC (permalink / raw)
To: Eric Witcher; +Cc: linux-omap
[-- 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
#
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-16 15:42 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Tony Lindgren
@ 2009-08-16 17:07 ` Felipe Balbi
2009-08-16 17:22 ` Tony Lindgren
2009-08-19 13:40 ` Felipe Balbi
1 sibling, 1 reply; 8+ messages in thread
From: Felipe Balbi @ 2009-08-16 17:07 UTC (permalink / raw)
To: Tony Lindgren; +Cc: Eric Witcher, linux-omap
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
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-16 17:07 ` Felipe Balbi
@ 2009-08-16 17:22 ` Tony Lindgren
0 siblings, 0 replies; 8+ messages in thread
From: Tony Lindgren @ 2009-08-16 17:22 UTC (permalink / raw)
To: Felipe Balbi; +Cc: Eric Witcher, linux-omap
* 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>
^ permalink raw reply [flat|nested] 8+ messages in thread
* Re: [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3
2009-08-16 15:42 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Tony Lindgren
2009-08-16 17:07 ` Felipe Balbi
@ 2009-08-19 13:40 ` Felipe Balbi
1 sibling, 0 replies; 8+ messages in thread
From: Felipe Balbi @ 2009-08-19 13:40 UTC (permalink / raw)
To: ext Tony Lindgren; +Cc: Eric Witcher, linux-omap@vger.kernel.org
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
^ permalink raw reply [flat|nested] 8+ messages in thread
end of thread, other threads:[~2009-09-02 10:23 UTC | newest]
Thread overview: 8+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-08-26 3:20 [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Eric Witcher
2009-08-28 18:13 ` Tony Lindgren
2009-08-29 22:38 ` Eric Witcher
2009-09-02 10:21 ` Felipe Balbi
-- strict thread matches above, loose matches on Subject: below --
2009-08-12 12:10 [PATCH 00/10] Omap3 updates for upcoming 2.6.32 merge window Tony Lindgren
2009-08-12 12:24 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig Tony Lindgren
2009-08-12 12:27 ` Felipe Balbi
2009-08-12 16:52 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v2 Tony Lindgren
2009-08-12 17:20 ` Kevin Hilman
2009-08-12 19:11 ` Felipe Balbi
2009-08-13 7:02 ` Tony Lindgren
2009-08-16 1:48 ` Eric Witcher
2009-08-16 15:42 ` [PATCH 10/10] OMAP3: update OMAP3 Beagle defconfig, v3 Tony Lindgren
2009-08-16 17:07 ` Felipe Balbi
2009-08-16 17:22 ` Tony Lindgren
2009-08-19 13:40 ` Felipe Balbi
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox