From patchwork Thu May 20 13:09:26 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maulik Mankad X-Patchwork-Id: 101187 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.3/8.14.3) with ESMTP id o4KD9f5B030476 for ; Thu, 20 May 2010 13:09:41 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753234Ab0ETNJh (ORCPT ); Thu, 20 May 2010 09:09:37 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:35175 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752239Ab0ETNJg (ORCPT ); Thu, 20 May 2010 09:09:36 -0400 Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o4KD9UGF018218 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 20 May 2010 08:09:33 -0500 Received: from linfarm488.india.ti.com (localhost [127.0.0.1]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id o4KD9Rj2012075; Thu, 20 May 2010 18:39:28 +0530 (IST) Received: from linfarm488.india.ti.com (localhost [127.0.0.1]) by linfarm488.india.ti.com (8.12.11/8.12.11) with ESMTP id o4KD9RkK010018; Thu, 20 May 2010 18:39:27 +0530 Received: (from x0082077@localhost) by linfarm488.india.ti.com (8.12.11/8.12.11/Submit) id o4KD9Qhp010015; Thu, 20 May 2010 18:39:26 +0530 From: Maulik Mankad To: linux-omap@vger.kernel.org Cc: linux-usb@vger.kernel.org, Maulik Mankad , Felipe Balbi , Tony Lindgren Subject: [PATCH] ARM: OMAP: Fix board data to support device only, host only and OTG roles. Date: Thu, 20 May 2010 18:39:26 +0530 Message-Id: <1274360966-9974-1-git-send-email-x0082077@ti.com> X-Mailer: git-send-email 1.5.6.6 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter.kernel.org [140.211.167.41]); Thu, 20 May 2010 13:09:41 +0000 (UTC) Index: mainline/arch/arm/mach-omap2/board-2430sdp.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-2430sdp.c +++ mainline/arch/arm/mach-omap2/board-2430sdp.c @@ -195,7 +195,13 @@ static struct omap2_hsmmc_info mmc[] __i static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-ldp.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-ldp.c +++ mainline/arch/arm/mach-omap2/board-ldp.c @@ -385,7 +385,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-omap3beagle.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-omap3beagle.c +++ mainline/arch/arm/mach-omap2/board-omap3beagle.c @@ -432,7 +432,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-overo.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-overo.c +++ mainline/arch/arm/mach-omap2/board-overo.c @@ -415,7 +415,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-3430sdp.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-3430sdp.c +++ mainline/arch/arm/mach-omap2/board-3430sdp.c @@ -778,7 +778,13 @@ static struct flash_partitions sdp_flash static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-omap3pandora.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-omap3pandora.c +++ mainline/arch/arm/mach-omap2/board-omap3pandora.c @@ -567,7 +567,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-4430sdp.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-4430sdp.c +++ mainline/arch/arm/mach-omap2/board-4430sdp.c @@ -107,7 +107,13 @@ static void __init omap_4430sdp_init_irq static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_UTMI, +#ifdef CONFIG_USB_MUSB_OTG + .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-cm-t35.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-cm-t35.c +++ mainline/arch/arm/mach-omap2/board-cm-t35.c @@ -813,7 +813,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-omap3evm.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-omap3evm.c +++ mainline/arch/arm/mach-omap2/board-omap3evm.c @@ -664,7 +664,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-rx51.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-rx51.c +++ mainline/arch/arm/mach-omap2/board-rx51.c @@ -122,7 +122,13 @@ static struct omap_board_mux board_mux[] static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG + .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) .mode = MUSB_PERIPHERAL, +#endif .power = 0, }; Index: mainline/arch/arm/mach-omap2/board-devkit8000.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-devkit8000.c +++ mainline/arch/arm/mach-omap2/board-devkit8000.c @@ -617,7 +617,13 @@ static void __init devkit8000_flash_init static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-igep0020.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-igep0020.c +++ mainline/arch/arm/mach-omap2/board-igep0020.c @@ -453,7 +453,13 @@ static int __init igep2_i2c_init(void) static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-omap3touchbook.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-omap3touchbook.c +++ mainline/arch/arm/mach-omap2/board-omap3touchbook.c @@ -529,7 +529,13 @@ early_param("tbr", early_touchbook_revis static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, }; Index: mainline/arch/arm/mach-omap2/board-zoom-peripherals.c =================================================================== --- mainline.orig/arch/arm/mach-omap2/board-zoom-peripherals.c +++ mainline/arch/arm/mach-omap2/board-zoom-peripherals.c @@ -266,7 +266,13 @@ static int __init omap_i2c_init(void) static struct omap_musb_board_data musb_board_data = { .interface_type = MUSB_INTERFACE_ULPI, +#ifdef CONFIG_USB_MUSB_OTG .mode = MUSB_OTG, +#elif defined(CONFIG_USB_MUSB_HDRC_HCD) + .mode = MUSB_HOST, +#elif defined(CONFIG_USB_GADGET_MUSB_HDRC) + .mode = MUSB_PERIPHERAL, +#endif .power = 100, };