From: tony@atomide.com (Tony Lindgren)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 14/16] omap: mux: Mux 2430 USB0HS_STP in board-2430.c
Date: Wed, 30 Jun 2010 15:07:23 +0300 [thread overview]
Message-ID: <20100630120723.2637.54397.stgit@baageli.muru.com> (raw)
In-Reply-To: <20100630120226.2637.31198.stgit@baageli.muru.com>
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>
---
arch/arm/mach-omap2/board-2430sdp.c | 4 +++-
drivers/usb/musb/omap2430.c | 4 ----
2 files changed, 3 insertions(+), 5 deletions(-)
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 */
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
-
/* We require some kind of external transceiver, hooked
* up through ULPI. TWL4030-family PMICs include one,
* which needs a driver, drivers aren't always needed.
next prev parent reply other threads:[~2010-06-30 12:07 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-06-30 12:06 [PATCH 00/16] omap mux updates for 2.6.36 merge window Tony Lindgren
2010-06-30 12:06 ` [PATCH 01/16] omap: mux: Fix omap_mux_init_gpio for omap24xx Tony Lindgren
2010-06-30 12:06 ` [PATCH 02/16] omap: mux: Renumber package defines to make room for older 24xx packages Tony Lindgren
2010-06-30 12:06 ` [PATCH 03/16] omap: mux: Allow compiling in new mux code on all mach-omap2 systems Tony Lindgren
2010-06-30 12:06 ` [PATCH 04/16] omap: mux: Remove unncessary parens from mux34xx.c Tony Lindgren
2010-06-30 12:06 ` [PATCH 05/16] omap: mux: Add data for 2420 Tony Lindgren
2010-06-30 12:06 ` [PATCH 06/16] omap: mux: Add data for 2430 Tony Lindgren
2010-06-30 12:06 ` [PATCH 07/16] omap: mux: Select SIP package for H4 Tony Lindgren
2010-06-30 12:06 ` [PATCH 08/16] omap: mux: Select POP package for Apollon Tony Lindgren
2010-06-30 12:07 ` [PATCH 09/16] omap: mux: Select POP package for N8X0 Tony Lindgren
2010-06-30 12:07 ` [PATCH 10/16] omap: mux: Select POP package for 2430SDP Tony Lindgren
2010-06-30 12:07 ` [PATCH 11/16] omap: mux: Make omap2 FS USB code use new mux functions Tony Lindgren
2010-06-30 12:07 ` [PATCH 12/16] omap: mux: Do keypad muxing in board-*.c files Tony Lindgren
2010-06-30 12:07 ` [PATCH 13/16] omap: mux: Mux Apollon LCD power in board-apollon.c Tony Lindgren
2010-07-01 7:05 ` Tomi Valkeinen
2010-07-01 8:18 ` Kyungmin Park
2010-07-01 10:33 ` Tony Lindgren
2010-07-01 10:41 ` Kyungmin Park
2010-06-30 12:07 ` Tony Lindgren [this message]
2010-06-30 12:28 ` [PATCH 14/16] omap: mux: Mux 2430 USB0HS_STP in board-2430.c Felipe Balbi
2010-06-30 12:40 ` Tony Lindgren
2010-06-30 12:07 ` [PATCH 15/16] omap: mux: Convert 2420 platform init code to use new mux code Tony Lindgren
2010-06-30 12:07 ` [PATCH 16/16] omap: mux: Remove old " Tony Lindgren
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20100630120723.2637.54397.stgit@baageli.muru.com \
--to=tony@atomide.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).