From patchwork Fri Jul 17 22:17:33 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Hilman X-Patchwork-Id: 36125 Received: from devils.ext.ti.com (devils.ext.ti.com [198.47.26.153]) by demeter.kernel.org (8.14.2/8.14.2) with ESMTP id n6HMM7Dg007022 for ; Fri, 17 Jul 2009 22:22:08 GMT Received: from dlep36.itg.ti.com ([157.170.170.91]) by devils.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMKSpJ029110; Fri, 17 Jul 2009 17:20:33 -0500 Received: from linux.omap.com (localhost [127.0.0.1]) by dlep36.itg.ti.com (8.13.8/8.13.8) with ESMTP id n6HMKShi026284; Fri, 17 Jul 2009 17:20:28 -0500 (CDT) Received: from linux.omap.com (localhost [127.0.0.1]) by linux.omap.com (Postfix) with ESMTP id ADEBA80662; Fri, 17 Jul 2009 17:20:19 -0500 (CDT) X-Original-To: davinci-linux-open-source@linux.davincidsp.com Delivered-To: davinci-linux-open-source@linux.davincidsp.com Received: from dflp52.itg.ti.com (dflp52.itg.ti.com [128.247.22.96]) by linux.omap.com (Postfix) with ESMTP id AAE6D80628 for ; Fri, 17 Jul 2009 17:18:18 -0500 (CDT) Received: from red.ext.ti.com (localhost [127.0.0.1]) by dflp52.itg.ti.com (8.13.7/8.13.7) with ESMTP id n6HMIIlZ004981 for ; Fri, 17 Jul 2009 17:18:18 -0500 (CDT) Received: from mail107-sin-R.bigfish.com (mail-sin.bigfish.com [207.46.51.102]) by red.ext.ti.com (8.13.7/8.13.7) with ESMTP id n6HMICf5020150 for ; Fri, 17 Jul 2009 17:18:17 -0500 Received: from mail107-sin (localhost.localdomain [127.0.0.1]) by mail107-sin-R.bigfish.com (Postfix) with ESMTP id 51274B600BD for ; Fri, 17 Jul 2009 22:17:57 +0000 (UTC) X-SpamScore: 0 X-BigFish: vps0(zzzz1202hzzz2dh62h) X-Spam-TCS-SCL: 1:0 X-MS-Exchange-Organization-Antispam-Report: OrigIP: 74.125.92.145; Service: EHS Received: by mail107-sin (MessageSwitch) id 1247869075490428_21260; Fri, 17 Jul 2009 22:17:55 +0000 (UCT) Received: from qw-out-1920.google.com (qw-out-1920.google.com [74.125.92.145]) by mail107-sin.bigfish.com (Postfix) with ESMTP id 041A7638050 for ; Fri, 17 Jul 2009 22:17:54 +0000 (UTC) Received: by qw-out-1920.google.com with SMTP id 14so359731qwa.64 for ; Fri, 17 Jul 2009 15:18:09 -0700 (PDT) Received: by 10.224.54.4 with SMTP id o4mr1138285qag.78.1247869089245; Fri, 17 Jul 2009 15:18:09 -0700 (PDT) Received: from localhost (deeprooted.net [216.254.16.51]) by mx.google.com with ESMTPS id 8sm2395016qwj.16.2009.07.17.15.18.08 (version=TLSv1/SSLv3 cipher=RC4-MD5); Fri, 17 Jul 2009 15:18:08 -0700 (PDT) From: Kevin Hilman To: linux-arm-kernel@lists.arm.linux.org.uk Date: Fri, 17 Jul 2009 15:17:33 -0700 Message-Id: <1247869060-10719-11-git-send-email-khilman@deeprootsystems.com> X-Mailer: git-send-email 1.6.3.3 In-Reply-To: <1247869060-10719-10-git-send-email-khilman@deeprootsystems.com> References: <1247869060-10719-1-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-2-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-3-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-4-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-5-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-6-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-7-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-8-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-9-git-send-email-khilman@deeprootsystems.com> <1247869060-10719-10-git-send-email-khilman@deeprootsystems.com> Cc: davinci-linux-open-source@linux.davincidsp.com, Dmitry Krivoschekov Subject: [PATCH 10/17] davinci:DM646x: pass correct MUSB IRQs X-BeenThere: davinci-linux-open-source@linux.davincidsp.com X-Mailman-Version: 2.1.4 Precedence: list List-Id: davinci-linux-open-source.linux.davincidsp.com List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: davinci-linux-open-source-bounces@linux.davincidsp.com Errors-To: davinci-linux-open-source-bounces@linux.davincidsp.com From: Sergei Shtylyov DM646x has MUSB connected to IRQs 13 and 14 (unlike IRQ12 on other platforms), so pass the correct IRQ resources with the platform device. Signed-off-by: Dmitry Krivoschekov Signed-off-by: Sergei Shtylyov Signed-off-by: Kevin Hilman --- arch/arm/mach-davinci/usb.c | 13 +++++++++++++ 1 files changed, 13 insertions(+), 0 deletions(-) diff --git a/arch/arm/mach-davinci/usb.c b/arch/arm/mach-davinci/usb.c index abedb63..06f5593 100644 --- a/arch/arm/mach-davinci/usb.c +++ b/arch/arm/mach-davinci/usb.c @@ -13,6 +13,7 @@ #include #include #include +#include #define DAVINCI_USB_OTG_BASE 0x01C64000 @@ -64,6 +65,10 @@ static struct resource usb_resources[] = { .start = IRQ_USBINT, .flags = IORESOURCE_IRQ, }, + { + /* placeholder for the dedicated CPPI IRQ */ + .flags = IORESOURCE_IRQ, + }, }; static u64 usb_dmamask = DMA_BIT_MASK(32); @@ -84,6 +89,14 @@ void __init setup_usb(unsigned mA, unsigned potpgt_msec) { usb_data.power = mA / 2; usb_data.potpgt = potpgt_msec / 2; + + if (cpu_is_davinci_dm646x()) { + /* Override the defaults as DM6467 uses different IRQs. */ + usb_dev.resource[1].start = IRQ_DM646X_USBINT; + usb_dev.resource[2].start = IRQ_DM646X_USBDMAINT; + } else /* other devices don't have dedicated CPPI IRQ */ + usb_dev.num_resources = 2; + platform_device_register(&usb_dev); }