Re: [PATCH 14/16] omap: mux: Mux 2430 USB0HS_STP in board-2430.c

[Tony Lindgren <tony@atomide.com>]

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

* Felipe Balbi <felipe.balbi@nokia.com> [100630 15:26]:
> hi,
> 
> On Wed, Jun 30, 2010 at 02:07:23PM +0200, ext Tony Lindgren wrote:
> >diff --git a/drivers/usb/musb/omap2430.c b/drivers/usb/musb/omap2430.c
> >index e06d65e..5f04d3f 100644
> >--- a/drivers/usb/musb/omap2430.c
> >+++ b/drivers/usb/musb/omap2430.c
> >@@ -194,10 +194,6 @@ int __init musb_platform_init(struct musb *musb, void *board_data)
> >	u32 l;
> >	struct omap_musb_board_data *data = board_data;
> >
> >-#if defined(CONFIG_ARCH_OMAP2430)
> >-	omap_cfg_reg(AE5_2430_USB0HS_STP);
> >-#endif
> 
> there's a patch from Anand taking care of this hunk, could you send
> only the hunk on board-2430sdp.c ?
> 
> this part on omap2430.c will go on next merge window.

OK, updated patch below.

Regards,

Tony

[-- Attachment #2: musb-2430-musb.patch --]
[-- Type: text/x-diff, Size: 1071 bytes --]

From: Tony Lindgren <tony@atomide.com>
Date: Wed, 30 Jun 2010 13:39:43 +0300
Subject: [PATCH] omap: mux: Mux 2430 USB0HS_STP in board-2430.c

Use new mux functions for that. There are no other known 2430 boards
that need this mux.

Cc: Felipe Balbi <felipe.balbi@nokia.com>
Cc: David Brownell <dbrownell@users.sourceforge.net>
Signed-off-by: Tony Lindgren <tony@atomide.com>

diff --git a/arch/arm/mach-omap2/board-2430sdp.c b/arch/arm/mach-omap2/board-2430sdp.c
index 281aa13..71bf509 100644
--- a/arch/arm/mach-omap2/board-2430sdp.c
+++ b/arch/arm/mach-omap2/board-2430sdp.c
@@ -31,7 +31,6 @@
 #include <asm/mach/map.h>
 
 #include <mach/gpio.h>
-#include <plat/mux.h>
 #include <plat/board.h>
 #include <plat/common.h>
 #include <plat/gpmc.h>
@@ -238,7 +237,10 @@ static void __init omap_2430sdp_init(void)
 	omap_serial_init();
 	omap2_hsmmc_init(mmc);
 	omap2_usbfs_init(&sdp2430_usb_config);
+
+	omap_mux_init_signal("usb0hs_stp", OMAP_PULL_ENA | OMAP_PULL_UP);
 	usb_musb_init(&musb_board_data);
+
 	board_smc91x_init();
 
 	/* Turn off secondary LCD backlight */