From patchwork Mon Apr 8 21:35:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergei Shtylyov X-Patchwork-Id: 2411961 Return-Path: X-Original-To: patchwork-linux-sh@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id D3CA13FD1A for ; Mon, 8 Apr 2013 21:36:27 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S964857Ab3DHVg0 (ORCPT ); Mon, 8 Apr 2013 17:36:26 -0400 Received: from mail-la0-f41.google.com ([209.85.215.41]:33118 "EHLO mail-la0-f41.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S935173Ab3DHVg0 (ORCPT ); Mon, 8 Apr 2013 17:36:26 -0400 Received: by mail-la0-f41.google.com with SMTP id er20so720169lab.28 for ; Mon, 08 Apr 2013 14:36:24 -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=sVZWFalHyFvHdcrL6VvqRk/rjO54ScJAlP6yRVSOO2g=; b=XWlN8g7+V841sZWunasxHCjX2cgSEAGT/9KRDKt/MLZr/vIH53X1wIuG+xbqqMd0aJ DoWn52KQoclVC8hPZb8ER/LqDV+xfYQh8+xla2QuLhhlIC5Bic362eTgNPqplv8cMStl v2P5xRhqg+e/AKeC/elCahyz3tIsJ0cu5vwkC2YxIe9Cn0WrCIUHMue+zUcGlb5NcnEL ZnLRW1d1ZStJYZXrvzNi9ORYsugw+DlG4baoXTR+tQQsbNajYD7WTI6g7ok0ffZ6FVjS Ytgv2nTzRFlSb32nrTqB4OnhAwyOoPUSk1Qars05u1w8ygkh0kLm1V3Udr2Jc/xnBHD3 pOKw== X-Received: by 10.152.133.133 with SMTP id pc5mr12654023lab.32.1365456984313; Mon, 08 Apr 2013 14:36:24 -0700 (PDT) Received: from wasted.dev.rtsoft.ru (ppp91-79-99-249.pppoe.mtu-net.ru. [91.79.99.249]) by mx.google.com with ESMTPS id fz10sm11376547lbb.12.2013.04.08.14.36.22 (version=TLSv1 cipher=RC4-SHA bits=128/128); Mon, 08 Apr 2013 14:36:23 -0700 (PDT) To: linux-usb@vger.kernel.org, gregkh@linuxfoundation.org, balbi@ti.com Subject: [PATCH v2 9/9] rcar-phy: handle platform data Cc: linux-sh@vger.kernel.org From: Sergei Shtylyov Organization: Cogent Embedded Date: Tue, 9 Apr 2013 01:35:20 +0400 MIME-Version: 1.0 Message-Id: <201304090135.21041.sergei.shtylyov@cogentembedded.com> X-Gm-Message-State: ALoCoQmo9y6PBPuhRdjCLNElfZ80j82b3S9bFQJN5B7Vno3+HHsoflV6CyzG2A+jGovZPsxJvgRW Sender: linux-sh-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-sh@vger.kernel.org Set the USBPCTRL0 register from the passed platform data in rcar_usb_phy_init(); don't reset it to 0 in rcar_usb_phy_shutdown() anymore as that does not make sense. Also, don't allow the driver's probe to succeed when the platform data are not supplied with a device. Signed-off-by: Sergei Shtylyov --- drivers/usb/phy/rcar-phy.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) -- 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/drivers/usb/phy/rcar-phy.c =================================================================== --- renesas.orig/drivers/usb/phy/rcar-phy.c +++ renesas/drivers/usb/phy/rcar-phy.c @@ -1,8 +1,9 @@ /* * Renesas R-Car USB phy driver * - * Copyright (C) 2012 Renesas Solutions Corp. + * Copyright (C) 2012-2013 Renesas Solutions Corp. * Kuninori Morimoto + * Copyright (C) 2013 Cogent Embedded, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License version 2 as @@ -11,10 +12,11 @@ #include #include -#include #include #include #include +#include +#include /* REGS block */ #define USBPCTRL0 0x00 @@ -55,6 +57,7 @@ static int rcar_usb_phy_init(struct usb_ { struct rcar_usb_phy_priv *priv = usb_phy_to_priv(phy); struct device *dev = phy->dev; + struct rcar_phy_platform_data *pdata = dev->platform_data; void __iomem *reg0 = priv->reg0; int i; u32 val; @@ -90,7 +93,7 @@ static int rcar_usb_phy_init(struct usb_ iowrite32(PHY_ENB | PLL_ENB | PHY_RST, (reg0 + USBPCTRL1)); /* set platform specific port settings */ - iowrite32(0x00000000, (reg0 + USBPCTRL0)); + iowrite32(pdata->usbpctrl0, (reg0 + USBPCTRL0)); /* * Bus alignment settings @@ -117,10 +120,8 @@ static void rcar_usb_phy_shutdown(struct spin_lock_irqsave(&priv->lock, flags); - if (priv->counter-- == 1) { /* last user */ - iowrite32(0x00000000, (reg0 + USBPCTRL0)); + if (priv->counter-- == 1) /* last user */ iowrite32(0x00000000, (reg0 + USBPCTRL1)); - } spin_unlock_irqrestore(&priv->lock, flags); } @@ -133,6 +134,11 @@ static int rcar_usb_phy_probe(struct pla void __iomem *reg0; int ret; + if (!pdev->dev.platform_data) { + dev_err(dev, "No platform data\n"); + return -EINVAL; + } + res0 = platform_get_resource(pdev, IORESOURCE_MEM, 0); if (!res0) { dev_err(dev, "Not enough platform resources\n");