From patchwork Mon Jun 6 17:08:53 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 69430 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1582674qgf; Mon, 6 Jun 2016 10:10:52 -0700 (PDT) X-Received: by 10.66.126.179 with SMTP id mz19mr13891965pab.27.1465233050442; Mon, 06 Jun 2016 10:10:50 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y63si1654203pfy.97.2016.06.06.10.10.50; Mon, 06 Jun 2016 10:10:50 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752869AbcFFRKa (ORCPT + 31 others); Mon, 6 Jun 2016 13:10:30 -0400 Received: from mail-wm0-f46.google.com ([74.125.82.46]:35275 "EHLO mail-wm0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752684AbcFFRKZ (ORCPT ); Mon, 6 Jun 2016 13:10:25 -0400 Received: by mail-wm0-f46.google.com with SMTP id c74so55902008wme.0 for ; Mon, 06 Jun 2016 10:10:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=auYZMtCr01PNfXIjWpgm5imynnVLVjyDeXCUNE3NIIg=; b=ARHnWmHGrEqbYxXwyl0HdivVBs7ShunTyro2m/cTQuobxZcTKY5KXMNFkqrxmqNjlo ERyWrNUw2bym7zEMR//xWiKetCkNxnIazTKlzVMbtZ5D1MMsnk63aW5uFlL2gk3NlImy yZUhTiC1PlbhhGXR6eoSLN7H//EBMgPo84DQY= 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:in-reply-to :references; bh=auYZMtCr01PNfXIjWpgm5imynnVLVjyDeXCUNE3NIIg=; b=Cgnhha3LUZOgN6+rNwDHs9hhaL9fWb01eTxkln/wVuRZaF6NTcKhzpiV5kqjFg4VeN UNieOjJ0xne9QLIfcjXcgdnAxUgPjGeOPxCbcWIqvPqtxqeQUjeL8Rt3F6VmiI6IgoYB VFXE1XV0XFObKYWmGWIk5Vl24hIa+O2EDg3Y/ZArPloh5O5R6W6zU3P+em04rAo1Xe3z bU1xMY3BWEIGkzbvqBl0KXVyzQ3EGfQwkuem1uTb4BODpN5zayNGiWde0mc8J5+BevVC 7YyySWAtgM6zMbh1p/qsxqiLEyQMPyWVQ20gQKXRhvdAmrGUVSjbuUInmMhgGirLSFN6 YE9A== X-Gm-Message-State: ALyK8tKgWtkJjquI6QgQI5kITFwc1QLk4BRObSxqMjQLuj0DtdIeLGhOTKQnnZmS3lQt8Kk+ X-Received: by 10.28.27.8 with SMTP id b8mr13051106wmb.78.1465233024039; Mon, 06 Jun 2016 10:10:24 -0700 (PDT) Received: from localhost.localdomain (host81-129-171-215.range81-129.btcentralplus.com. [81.129.171.215]) by smtp.gmail.com with ESMTPSA id m5sm17753030wji.16.2016.06.06.10.10.23 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 10:10:23 -0700 (PDT) From: Lee Jones To: linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: kernel@stlinux.com, maxime.coquelin@st.com, srinivas.kandagatla@gmail.com, kishon@ti.com, balbi@kernel.org, gregkh@linuxfoundation.org, p.zabel@pengutronix.de, linux-usb@vger.kernel.org, Lee Jones Subject: [PATCH 9/10] usb: host: ehci-st: Inform the reset framework that our reset line may be shared Date: Mon, 6 Jun 2016 18:08:53 +0100 Message-Id: <20160606170854.12407-2-lee.jones@linaro.org> X-Mailer: git-send-email 2.8.3 In-Reply-To: <20160606170854.12407-1-lee.jones@linaro.org> References: <20160606155655.10860-8-lee.jones@linaro.org> <20160606170854.12407-1-lee.jones@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On the STiH410 B2120 development board the ST EHCI IP shares its reset line with the OHCI IP. New functionality in the reset subsystems forces consumers to be explicit when requesting shared/exclusive reset lines. Signed-off-by: Lee Jones --- drivers/usb/host/ehci-st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.8.3 Acked-by: Peter Griffin diff --git a/drivers/usb/host/ehci-st.c b/drivers/usb/host/ehci-st.c index a94ed67..6cfce6f 100644 --- a/drivers/usb/host/ehci-st.c +++ b/drivers/usb/host/ehci-st.c @@ -206,7 +206,7 @@ static int st_ehci_platform_probe(struct platform_device *dev) priv->clk48 = NULL; } - priv->pwr = devm_reset_control_get_optional(&dev->dev, "power"); + priv->pwr = devm_reset_control_get_optional_shared(&dev->dev, "power"); if (IS_ERR(priv->pwr)) { err = PTR_ERR(priv->pwr); if (err == -EPROBE_DEFER) @@ -214,7 +214,7 @@ static int st_ehci_platform_probe(struct platform_device *dev) priv->pwr = NULL; } - priv->rst = devm_reset_control_get_optional(&dev->dev, "softreset"); + priv->rst = devm_reset_control_get_optional_shared(&dev->dev, "softreset"); if (IS_ERR(priv->rst)) { err = PTR_ERR(priv->rst); if (err == -EPROBE_DEFER)