mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Michael Grzeschik <m.grzeschik@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] beagle: fix usb dependencies
Date: Tue, 17 Aug 2010 10:40:51 +0200	[thread overview]
Message-ID: <1282034451-18154-1-git-send-email-m.grzeschik@pengutronix.de> (raw)
In-Reply-To: <1280915957-2910-13-git-send-email-m.grzeschik@pengutronix.de>

Signed-off-by: Michael Grzeschik <m.grzeschik@pengutronix.de>
---
 arch/arm/boards/omap/Kconfig        |    2 --
 arch/arm/boards/omap/board-beagle.c |    4 ++++
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/arch/arm/boards/omap/Kconfig b/arch/arm/boards/omap/Kconfig
index 6012227..d612064 100644
--- a/arch/arm/boards/omap/Kconfig
+++ b/arch/arm/boards/omap/Kconfig
@@ -48,8 +48,6 @@ config MACH_BEAGLE
 	select MACH_HAS_LOWLEVEL_INIT
 	select OMAP_CLOCK_ALL
 	select HAS_OMAP_NAND
-	select USB_EHCI_OMAP
-	select USB_TWL4030
 	  help
 	  Say Y here if you are using Beagle Board
 
diff --git a/arch/arm/boards/omap/board-beagle.c b/arch/arm/boards/omap/board-beagle.c
index c0b6b43..e9d3072 100644
--- a/arch/arm/boards/omap/board-beagle.c
+++ b/arch/arm/boards/omap/board-beagle.c
@@ -273,6 +273,7 @@ static struct device_d sdram_dev = {
 	.platform_data = &sram_pdata,
 };
 
+#ifdef CONFIG_USB_EHCI_OMAP
 static struct omap_hcd omap_ehci_pdata = {
 	.port_mode[0] = EHCI_HCD_OMAP_MODE_PHY,
 	.port_mode[1] = EHCI_HCD_OMAP_MODE_PHY,
@@ -295,6 +296,7 @@ static struct device_d usbh_dev = {
 	.size     = 4 * 1024,
 	.platform_data = &ehci_pdata,
 };
+#endif /* CONFIG_USB_EHCI_OMAP */
 
 static struct device_d i2c_dev = {
 	.name		= "i2c-omap",
@@ -318,8 +320,10 @@ static int beagle_devices_init(void)
 	i2c_register_board_info(0, i2c_devices, ARRAY_SIZE(i2c_devices));
 	register_device(&i2c_dev);
 
+#ifdef CONFIG_USB_EHCI_OMAP
 	if (ehci_omap_init(&omap_ehci_pdata) >= 0)
 		register_device(&usbh_dev);
+#endif /* CONFIG_USB_EHCI_OMAP */
 #ifdef CONFIG_GPMC
 	/* WP is made high and WAIT1 active Low */
 	gpmc_generic_init(0x10);
-- 
1.7.1


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  reply	other threads:[~2010-08-17  8:41 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-08-04  9:59 [PATCH 00/13] OMAP/Beagleboard ehci support Michael Grzeschik
2010-08-04  9:59 ` [PATCH 01/13] i2c: Add missing defines for omap Michael Grzeschik
2010-08-04  9:59 ` [PATCH 02/13] arm omap: Add I2C driver Michael Grzeschik
2010-08-04  9:59 ` [PATCH 03/13] add twl4030 support Michael Grzeschik
2010-08-04  9:59 ` [PATCH 04/13] arm omap: Add gpio support Michael Grzeschik
2010-08-04  9:59 ` [PATCH 05/13] arm omap: Add cpu_is_ macros Michael Grzeschik
2010-08-04  9:59 ` [PATCH 06/13] beagle: Add missing pinmux for usb Michael Grzeschik
2010-08-04  9:59 ` [PATCH 07/13] ehci: Make has_tt configurable via platform data Michael Grzeschik
2010-08-04  9:59 ` [PATCH 08/13] ehci: set CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS to 16 Michael Grzeschik
2010-08-04  9:59 ` [PATCH 09/13] ehci: add remove function Michael Grzeschik
2010-08-04  9:59 ` [PATCH 10/13] usb: add twl4030 phy support Michael Grzeschik
2010-08-04  9:59 ` [PATCH 11/13] ehci: add omap support Michael Grzeschik
2010-08-04  9:59 ` [PATCH 12/13] beagle: add usb support Michael Grzeschik
2010-08-17  8:40   ` Michael Grzeschik [this message]
2010-08-17 10:09     ` [PATCH] beagle: fix usb dependencies Nishanth Menon
2010-08-04  9:59 ` [PATCH 13/13] add beagle board defconfig Michael Grzeschik
2010-08-17  8:42   ` [PATCH] beagle: defconfig cleanup for v2010.08.0 Michael Grzeschik
2010-10-10  8:37 ` [PATCH 00/13] OMAP/Beagleboard ehci support Anand Gadiyar

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=1282034451-18154-1-git-send-email-m.grzeschik@pengutronix.de \
    --to=m.grzeschik@pengutronix.de \
    --cc=barebox@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