From patchwork Tue Apr 9 22:31:48 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2418111 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from casper.infradead.org (casper.infradead.org [85.118.1.10]) by patchwork1.kernel.org (Postfix) with ESMTP id 93A4D3FC71 for ; Tue, 9 Apr 2013 22:33:00 +0000 (UTC) Received: from merlin.infradead.org ([2001:4978:20e::2]) by casper.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPh62-0001Hk-St; Tue, 09 Apr 2013 22:32:59 +0000 Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPh5z-0006bW-SU; Tue, 09 Apr 2013 22:32:55 +0000 Received: from mail-la0-x22e.google.com ([2a00:1450:4010:c03::22e]) by merlin.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1UPh5x-0006ar-8r for linux-arm-kernel@lists.infradead.org; Tue, 09 Apr 2013 22:32:53 +0000 Received: by mail-la0-f46.google.com with SMTP id ea20so615987lab.5 for ; Tue, 09 Apr 2013 15:32:49 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:to:subject:cc:from:organization:date:mime-version :content-type:content-transfer-encoding:message-id :x-gm-message-state; bh=l1Wo9OX1jnfu978YhO3rXGM+OPHB4FJJkoNa+JAOzDQ=; b=N+kHBlugoPuegjTRLSpwu6ovjeCX8m4/NietKDIwktsGiG4O+zzAW3H9EMHmL38TLr 1vsOcZBQFg0SqVWdBfhegor408p8jQuaMvXXc4lj3rc4qXCTyxjgd/g3YAzvO7aKk6Ux g1Y0woOQHhpOnGpFQVND9mkEVmBmjwxJhNoKqt0739/LMN6M1fbIppANuUPEAdCZsoVn SvdzMkE764BGlySpi7M59D1EYm3uQ6n2QqksjATwxjP7kMcnDEcUlk4NBv9QiO7E86Vc 093OhcTwUd8E1agYfV18kFv0A7gVm34zSDPCUk4wWkiH5FrGE7AeARRrqo0xYCaFsozm 6k3A== X-Received: by 10.112.180.193 with SMTP id dq1mr14404496lbc.60.1365546769317; Tue, 09 Apr 2013 15:32:49 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-87-206.pppoe.mtu-net.ru. [91.79.87.206]) by mx.google.com with ESMTPS id t20sm13094252lbi.5.2013.04.09.15.32.47 (version=TLSv1 cipher=RC4-SHA bits=128/128); Tue, 09 Apr 2013 15:32:48 -0700 (PDT) To: horms@verge.net.au, magnus.damm@gmail.com, linux@arm.linux.org.uk, linux-sh@vger.kernel.org, linux-arm-kernel@lists.infradead.org Subject: [PATCH v3 3/9] ARM: shmobile: R8A7779: setup EHCI internal buffer From: Sergei Shtylyov Organization: Cogent Embedded Date: Wed, 10 Apr 2013 02:31:48 +0400 MIME-Version: 1.0 Message-Id: <201304100231.48628.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQn7PhLx0ai0Whtcvg9fpVcUHN6PLMHcGF5gtYkvaDhFNsYBhKVgL19VileNArxJe7sSP1XW X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20130409_183253_467558_8A5CB086 X-CRM114-Status: GOOD ( 13.25 ) X-Spam-Score: -1.9 (-) X-Spam-Report: SpamAssassin version 3.3.2 on merlin.infradead.org summary: Content analysis details: (-1.9 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 SPF_PASS SPF: sender matches SPF record -1.9 BAYES_00 BODY: Bayes spam probability is 0 to 1% [score: 0.0000] Cc: linux-usb@vger.kernel.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org Setup the EHCI internal buffer (before EHCI driver has a chance to touch the registers) using the pre_setup() method in 'struct usb_ehci_pdata'. The patch has been tested on the Marzen board. Signed-off-by: Sergei Shtylyov Acked-by: Kuninori Morimoto Acked-by: Simon Horman --- Changes since version 2: - added #include ; - added a note about testing to the changelog; - added ACKs from Simon Horman and Kuninori Morimoto. Changes since the original posting: - changed from init() platform device method to pre_setup() as per the previous patch. arch/arm/mach-shmobile/setup-r8a7779.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) Index: renesas/arch/arm/mach-shmobile/setup-r8a7779.c =================================================================== --- renesas.orig/arch/arm/mach-shmobile/setup-r8a7779.c +++ renesas/arch/arm/mach-shmobile/setup-r8a7779.c @@ -33,6 +33,7 @@ #include #include #include +#include #include #include #include @@ -446,10 +447,25 @@ static void usb_power_off(struct platfor pm_runtime_disable(&pdev->dev); } +static int ehci_init_internal_buffer(struct usb_hcd *hcd) +{ + /* + * Below are recommended values from the datasheet; + * see [USB :: Setting of EHCI Internal Buffer]. + */ + /* EHCI IP internal buffer setting */ + iowrite32(0x00ff0040, hcd->regs + 0x0094); + /* EHCI IP internal buffer enable */ + iowrite32(0x00000001, hcd->regs + 0x009C); + + return 0; +} + static struct usb_ehci_pdata ehcix_pdata = { .power_on = usb_power_on, .power_off = usb_power_off, .power_suspend = usb_power_off, + .pre_setup = ehci_init_internal_buffer, }; static struct resource ehci0_resources[] = {