From patchwork Wed Dec 11 15:05:43 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181244 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp917780och; Wed, 11 Dec 2019 07:23:41 -0800 (PST) X-Google-Smtp-Source: APXvYqzausHdl3RkaWYq4nDJFJXpXZ1xsNxCfy4qqicPh28CGko8YND01qi7X+PYuHcrcpGJ/f4n X-Received: by 2002:a05:6830:4da:: with SMTP id s26mr2520688otd.141.1576077820533; Wed, 11 Dec 2019 07:23:40 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077820; cv=none; d=google.com; s=arc-20160816; b=QKDN3p3JpaZZo8zlSOWg6tsvYobw6ePZ8dbvOQSH6mwje6OtTVVnLS3484KJI8alTF 7OXeZE07vBM/QSGqqethF69ODuAdBxysf73Z/Va1NnPdt89NTmFmMSwCk7YEsqbnDISS TIHpNAPvtYbf+hDcq/+IWLHlA2l84mtJ9uPZaHB4bCZU5QGrAHsZJYoX/QLJHFm19cnK yM88gM/x+XSG1y/wisuwdgsWDfOwDzhnLmNRWeW0e+3zEUbY+LQXK5iaxpC1y2XZKSIj CmWSEoyXTq15MehJIQjLRsjMsZKELtGcvo8UxdvEfeKSNlTtPfzqt2PY3cZg6vQZYHIe LE5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=WsSKAtcXj05vPP8pWTbtQ79L5GMJ8nSD+h04L7wyqhk=; b=GD5EXRtsfitNolg0AFt8m8QRSqL7z3SBZzgjSpjIgprCMRXblhpx++dMNfiGNwBpaE Qt3p+jD5Yo7P5ilmDunEBuQY05ctklFdJQ4ioYFANReCqn3Ozz+NylCL8GqGVKHTL/gS wovPPyr3i88G3EXtLZXS6cod8wuIxLAoT9pRlMg6NEXxeVm62cjngKsyHcim0zEBLuJ3 zgQI98JytgY3L6w77+ExTgBgnJaj0NAwV6HptmZveaoIvGSjOpW/enE74cJMmpWRR+re ueIEgUJNV/jJay0zuAe8KFvyigGVY6dfo/0mSICCsMQYM1zwo6hw1tEDO+a+iJYtAp5q QSWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="eDzyr/Gy"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f11si1439278otc.164.2019.12.11.07.23.40; Wed, 11 Dec 2019 07:23:40 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of stable-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=@kernel.org header.s=default header.b="eDzyr/Gy"; spf=pass (google.com: best guess record for domain of stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732508AbfLKPXj (ORCPT + 14 others); Wed, 11 Dec 2019 10:23:39 -0500 Received: from mail.kernel.org ([198.145.29.99]:54714 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730107AbfLKPXi (ORCPT ); Wed, 11 Dec 2019 10:23:38 -0500 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id BAF752073D; Wed, 11 Dec 2019 15:23:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077818; bh=KHVjQquwnf4qMCOdHbfWO0pkNtbfAIXbCMPdkUNfzCM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eDzyr/GyQ+d3xwgU/ebR3gmLDqXVTFtSCi6pM/4w40cXC11yKLIt17svvasy3dK07 gL2BcY3gMNW4VrvSo9K5DeQSvXX2zunq//XKmT4H1g1KBzBBenmQ3hzSomURDVh+lU f7WPsf16y6mCVI4AWtIMggFdXe/5W71Di0efthSE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Bjorn Andersson , Stephen Boyd , Sasha Levin Subject: [PATCH 4.19 181/243] clk: qcom: gcc-msm8998: Disable halt check of UFS clocks Date: Wed, 11 Dec 2019 16:05:43 +0100 Message-Id: <20191211150351.388861450@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150339.185439726@linuxfoundation.org> References: <20191211150339.185439726@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Bjorn Andersson [ Upstream commit 2abf856202fd3e4883e4c518acaa9a023b0dbe54 ] Drop the halt check of the UFS symbol clocks, in accordance with other platforms. This makes clk_disable_unused() happy and makes it possible to turn the clocks on again without an error. Signed-off-by: Bjorn Andersson Signed-off-by: Stephen Boyd Signed-off-by: Sasha Levin --- drivers/clk/qcom/gcc-msm8998.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) -- 2.20.1 diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c index 5fd6662a1beac..4e23973b6cd16 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2402,7 +2402,7 @@ static struct clk_branch gcc_ufs_phy_aux_clk = { static struct clk_branch gcc_ufs_rx_symbol_0_clk = { .halt_reg = 0x75014, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x75014, .enable_mask = BIT(0), @@ -2415,7 +2415,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = { static struct clk_branch gcc_ufs_rx_symbol_1_clk = { .halt_reg = 0x7605c, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x7605c, .enable_mask = BIT(0), @@ -2428,7 +2428,7 @@ static struct clk_branch gcc_ufs_rx_symbol_1_clk = { static struct clk_branch gcc_ufs_tx_symbol_0_clk = { .halt_reg = 0x75010, - .halt_check = BRANCH_HALT, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x75010, .enable_mask = BIT(0),