From patchwork Fri Apr 19 21:58:18 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2467081 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id D2684DF25A for ; Fri, 19 Apr 2013 21:59:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934659Ab3DSV7L (ORCPT ); Fri, 19 Apr 2013 17:59:11 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:51292 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934634Ab3DSV7K (ORCPT ); Fri, 19 Apr 2013 17:59:10 -0400 Received: by mail-la0-f42.google.com with SMTP id fn20so3992142lab.29 for ; Fri, 19 Apr 2013 14:59:08 -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=O2mhuvbctGlN9XnkOasEFRJitshBdvkum2fb7zkfUZg=; b=LlrPXI4ps1h8OJdLImVaD4x7aFCS8rJ5ssaaqVde0ByP7FMbAN8+KfiV5kyIpxJsdv 4P03eIq1+QXX4fk8APsm2gYVXDkzZXKcxyOZg7+joimm4vZOQTnWNnph2nzxaAgh01lN 8MJu03o3BG0qQsY0U7iBVJeEZkZMe9cUp0SMoeSyliqcClrCn1RubaAwVKp30xFJqL28 DQThFou3zXsmHf0JafgsIrAdqLMCdGrX3aGUYcVFdnd6NvC53ADoiQMRABRAPCSpTfA1 uqz+4q6Kiu7LbC68InXrOVgsBEPzuPKKM9x5KeEhsPQlZz0OjW43Bc1Ig2r3EUDTuKtn JsFQ== X-Received: by 10.112.74.193 with SMTP id w1mr8784728lbv.125.1366408748539; Fri, 19 Apr 2013 14:59:08 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-86-130.pppoe.mtu-net.ru. [91.79.86.130]) by mx.google.com with ESMTPS id f4sm3268260lbw.6.2013.04.19.14.59.06 (version=TLSv1 cipher=RC4-SHA bits=128/128); Fri, 19 Apr 2013 14:59:07 -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 v5 3/9] ARM: shmobile: r8a7779: setup EHCI internal buffer Cc: linux-usb@vger.kernel.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Sat, 20 Apr 2013 01:58:18 +0400 MIME-Version: 1.0 Message-Id: <201304200158.19374.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmll/DGlH4zFFxgpgNIkIz/2phWYl1YcR/Zl7/xeNfkKejZPZjGAHd8sUl2be68oQeEu/Jd Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.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 4: - refreshed the patch. Changes since version 3: - lowercased the SoC name in the subject. 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(+) -- To unsubscribe from this list: send the line "unsubscribe linux-sh" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html 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 @@ -435,10 +436,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[] = {