From patchwork Mon Jun 6 17:08:54 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lee Jones X-Patchwork-Id: 69431 Delivered-To: patch@linaro.org Received: by 10.140.106.246 with SMTP id e109csp1582687qgf; Mon, 6 Jun 2016 10:10:54 -0700 (PDT) X-Received: by 10.66.222.202 with SMTP id qo10mr24907700pac.141.1465233050739; 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-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@linaro.org; spf=pass (google.com: best guess record for domain of linux-usb-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-usb-owner@vger.kernel.org; dmarc=fail (p=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752876AbcFFRKe (ORCPT + 5 others); Mon, 6 Jun 2016 13:10:34 -0400 Received: from mail-wm0-f52.google.com ([74.125.82.52]:34652 "EHLO mail-wm0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752684AbcFFRKb (ORCPT ); Mon, 6 Jun 2016 13:10:31 -0400 Received: by mail-wm0-f52.google.com with SMTP id k184so5394205wme.1 for ; Mon, 06 Jun 2016 10:10:30 -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=mZrc7l8nQfOlD4yRczDhS8nEYNKGKscUezu0EoT90l8=; b=Oi/uRnvjGqfIHOtTmgd7jLWu5MBUF80OeNGjrCimm6LCotfv28tSPYf5nixIb6u9OF xCUma4OJu5TikRbthAsQHvrvZV6HNYTEp9dO8PeSUR7g8ciVkjKQl6jAkj6GpRluD/JM stLbsttcHh2G5zsQpKnO+Ivx1cSvCPeJCtE+w= 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=mZrc7l8nQfOlD4yRczDhS8nEYNKGKscUezu0EoT90l8=; b=j5ok4uPmfd2VglRRwzcwST/JbQGyV6d619ieV73O0LwIcrW+bn8nIpvzuY6W/sEUy+ vg93N5tvibLt5wwHCEDIv0wW/Y05tRsrMOObabj8Qpxo8HRtS7U2NoOWS1csdEvOZZFM lBigsJ3ke3PcwZ6Ue06MYYuWSFjIjslvG7k6sCcJG/ydJVXwO5M6lIjn4hkquDnybkIr 1NNnC25jBhn2PCfEXE1qXCQouVJNV+5YyfFJplskE3CHQCSvH0xXo8s+wumuoutYkpad U+RrG0SmXo//q1pYt5qKfJnh/EyAclI1P0fYJGgBnY/qKWzvrwJkh2grNRzv7w9US5+g VV3A== X-Gm-Message-State: ALyK8tLYE8SZBRuii2swBSHHh+liY0G1trPXy9dFAwOuGrW32umrgfnyBcJAIvjMhDO/VPIw X-Received: by 10.194.186.200 with SMTP id fm8mr16621133wjc.174.1465233024965; 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.24 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jun 2016 10:10:24 -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 10/10] usb: host: ohci-st: Inform the reset framework that our reset line may be shared Date: Mon, 6 Jun 2016 18:08:54 +0100 Message-Id: <20160606170854.12407-3-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-usb-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-usb@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/ohci-st.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.8.3 -- To unsubscribe from this list: send the line "unsubscribe linux-usb" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/usb/host/ohci-st.c b/drivers/usb/host/ohci-st.c index acf2eb2..1f1f23c 100644 --- a/drivers/usb/host/ohci-st.c +++ b/drivers/usb/host/ohci-st.c @@ -188,13 +188,13 @@ static int st_ohci_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); goto err_put_clks; } - 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); goto err_put_clks;