From patchwork Thu Aug 19 19:18:09 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Munegowda, Keshava" X-Patchwork-Id: 120480 X-Patchwork-Delegate: me@felipebalbi.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter.kernel.org (8.14.4/8.14.3) with ESMTP id o7K7IApg024548 for ; Fri, 20 Aug 2010 07:18:11 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752063Ab0HTHRq (ORCPT ); Fri, 20 Aug 2010 03:17:46 -0400 Received: from bear.ext.ti.com ([192.94.94.41]:55277 "EHLO bear.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752002Ab0HTHRf (ORCPT ); Fri, 20 Aug 2010 03:17:35 -0400 Received: from dlep35.itg.ti.com ([157.170.170.118]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id o7K7HZWv015124 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 20 Aug 2010 02:17:35 -0500 Received: from legion.dal.design.ti.com (localhost [127.0.0.1]) by dlep35.itg.ti.com (8.13.7/8.13.7) with ESMTP id o7K7HWFo024897; Fri, 20 Aug 2010 02:17:32 -0500 (CDT) Received: from localhost (a0393220-desktop.apr.dhcp.ti.com [172.24.137.6]) by legion.dal.design.ti.com (8.11.7p1+Sun/8.11.7) with ESMTP id o7K7HUf00730; Fri, 20 Aug 2010 02:17:30 -0500 (CDT) From: Keshava Munegowda To: linux-usb@vger.kernel.org, linux-omap@vger.kernel.org Cc: Keshava Munegowda , Anand Gadiyar Subject: [RFC] [PATCH 4/5] usb: ohci: omap: Initialize resources for OMAP4 Date: Fri, 20 Aug 2010 00:48:09 +0530 Message-Id: <1282245490-24339-5-git-send-email-keshava_mgowda@ti.com> X-Mailer: git-send-email 1.6.0.4 In-Reply-To: <1282245490-24339-4-git-send-email-keshava_mgowda@ti.com> References: <1282245490-24339-1-git-send-email-keshava_mgowda@ti.com> <1282245490-24339-2-git-send-email-keshava_mgowda@ti.com> <1282245490-24339-3-git-send-email-keshava_mgowda@ti.com> <1282245490-24339-4-git-send-email-keshava_mgowda@ti.com> 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]); Fri, 20 Aug 2010 07:18:11 +0000 (UTC) Index: linux-2.6/arch/arm/mach-omap2/usb-ehci.c =================================================================== --- linux-2.6.orig/arch/arm/mach-omap2/usb-ehci.c +++ linux-2.6/arch/arm/mach-omap2/usb-ehci.c @@ -360,22 +360,15 @@ void __init usb_ehci_init(const struct e static struct resource ohci_resources[] = { { - .start = OMAP34XX_OHCI_BASE, - .end = OMAP34XX_OHCI_BASE + SZ_1K - 1, .flags = IORESOURCE_MEM, }, { - .start = OMAP34XX_UHH_CONFIG_BASE, - .end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1, .flags = IORESOURCE_MEM, }, { - .start = OMAP34XX_USBTLL_BASE, - .end = OMAP34XX_USBTLL_BASE + SZ_4K - 1, .flags = IORESOURCE_MEM, }, { /* general IRQ */ - .start = INT_34XX_OHCI_IRQ, .flags = IORESOURCE_IRQ, } }; @@ -580,8 +573,25 @@ void __init usb_ohci_init(const struct o platform_device_add_data(&ohci_device, pdata, sizeof(*pdata)); /* Setup Pin IO MUX for OHCI */ - if (cpu_is_omap34xx()) + if (cpu_is_omap34xx()) { + ohci_resources[0].start = OMAP34XX_OHCI_BASE; + ohci_resources[0].end = OMAP34XX_OHCI_BASE + SZ_1K - 1; + ohci_resources[1].start = OMAP34XX_UHH_CONFIG_BASE; + ohci_resources[1].end = OMAP34XX_UHH_CONFIG_BASE + SZ_1K - 1; + ohci_resources[2].start = OMAP34XX_USBTLL_BASE; + ohci_resources[2].end = OMAP34XX_USBTLL_BASE + SZ_4K - 1; + ohci_resources[3].start = INT_34XX_OHCI_IRQ; setup_ohci_io_mux(pdata->port_mode); + } else if (cpu_is_omap44xx()) { + ohci_resources[0].start = OMAP44XX_HSUSB_OHCI_BASE; + ohci_resources[0].end = OMAP44XX_HSUSB_OHCI_BASE + SZ_1K - 1; + ohci_resources[1].start = OMAP44XX_UHH_CONFIG_BASE; + ohci_resources[1].end = OMAP44XX_UHH_CONFIG_BASE + SZ_1K - 1; + ohci_resources[2].start = OMAP44XX_USBTLL_BASE; + ohci_resources[2].end = OMAP44XX_USBTLL_BASE + SZ_4K - 1; + ohci_resources[3].start = OMAP44XX_IRQ_OHCI; + setup_4430ohci_io_mux(pdata->port_mode); + } if (platform_device_register(&ohci_device) < 0) { pr_err("Unable to register FS-USB (OHCI) device\n");