From patchwork Fri Oct 25 17:07:12 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Valentine Barshak X-Patchwork-Id: 3097061 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 7B6BA9F372 for ; Fri, 25 Oct 2013 17:07:20 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 70FAD2020E for ; Fri, 25 Oct 2013 17:07:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DF962020A for ; Fri, 25 Oct 2013 17:07:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752703Ab3JYRHR (ORCPT ); Fri, 25 Oct 2013 13:07:17 -0400 Received: from mail-la0-f42.google.com ([209.85.215.42]:52157 "EHLO mail-la0-f42.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752139Ab3JYRHR (ORCPT ); Fri, 25 Oct 2013 13:07:17 -0400 Received: by mail-la0-f42.google.com with SMTP id ea20so3366169lab.1 for ; Fri, 25 Oct 2013 10:07:15 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=dX2pwnf2jDs2YB7LRgOO9ihuGE6kxqiBlyMcGOK8Lw0=; b=jGCjtxGRfZt0O4117Zcd7kISWyisv3xNzmfQlm0TRBUoUBbrti+Aa7fn3gboIqqgvH 1oTax9D4Ii07aTMm70bMeQd8L5+r7cmD7K/Payr1f/8LuJN6drAiIedLrbIv4UCuHzzI /u8Yo8SrH6HKSkJ0k1W/eUDXFI+tq9Pmx9BdUoWikwgDvC4kogyScaXVg35hZbORJU1u rsYaFJMHTVZc9V371yaz/L60LcIMA2Ltr0cCh/ev0+s7Pvk5xc5IHywcopPuxMCbW2QS NrWyScSfqk2st6zUMuaqGdZRF58AKHPPBr6LTo+T3CdaI7upUTUZO4iI4ntzWZaBrg+x BC3Q== X-Gm-Message-State: ALoCoQlHy505Uwn7IgTBqzxUe886buCFkTYsrr+BPaahbgNSzrH5CpCvmtw70RrOgSXifVTguFDL X-Received: by 10.112.143.166 with SMTP id sf6mr2849957lbb.29.1382720835355; Fri, 25 Oct 2013 10:07:15 -0700 (PDT) Received: from black.localnet ([93.100.122.208]) by mx.google.com with ESMTPSA id vk8sm3141666lbb.0.2013.10.25.10.07.13 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 25 Oct 2013 10:07:14 -0700 (PDT) From: Valentine Barshak To: linux-sh@vger.kernel.org, linux-usb@vger.kernel.org Cc: Simon Horman , Felipe Balbi Subject: [PATCH] usb: phy: phy-rcar-gen2-usb: Fix phy initialization Date: Fri, 25 Oct 2013 21:07:12 +0400 Message-Id: <1382720832-10267-1-git-send-email-valentine.barshak@cogentembedded.com> X-Mailer: git-send-email 1.8.3.1 Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add missing USB UGCTRL2 register offset. Signed-off-by: Valentine Barshak Acked-by: Simon Horman --- drivers/usb/phy/phy-rcar-gen2-usb.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/usb/phy/phy-rcar-gen2-usb.c b/drivers/usb/phy/phy-rcar-gen2-usb.c index a99a695..db3ab34 100644 --- a/drivers/usb/phy/phy-rcar-gen2-usb.c +++ b/drivers/usb/phy/phy-rcar-gen2-usb.c @@ -107,10 +107,10 @@ static void __rcar_gen2_usb_phy_init(struct rcar_gen2_usb_phy_priv *priv) clk_prepare_enable(priv->clk); /* Set USB channels in the USBHS UGCTRL2 register */ - val = ioread32(priv->base); + val = ioread32(priv->base + USBHS_UGCTRL2_REG); val &= ~(USBHS_UGCTRL2_USB0_HS | USBHS_UGCTRL2_USB2_SS); val |= priv->ugctrl2; - iowrite32(val, priv->base); + iowrite32(val, priv->base + USBHS_UGCTRL2_REG); } /* Shutdown USB channels */