From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.1 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 0B656C04EB8 for ; Fri, 30 Nov 2018 06:55:23 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id C32552145D for ; Fri, 30 Nov 2018 06:55:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (1024-bit key) header.d=linaro.org header.i=@linaro.org header.b="F2Cxd1+/" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C32552145D Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=linaro.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-clk-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726976AbeK3SD3 (ORCPT ); Fri, 30 Nov 2018 13:03:29 -0500 Received: from mail-pf1-f194.google.com ([209.85.210.194]:37727 "EHLO mail-pf1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726952AbeK3SD2 (ORCPT ); Fri, 30 Nov 2018 13:03:28 -0500 Received: by mail-pf1-f194.google.com with SMTP id y126so2324889pfb.4 for ; Thu, 29 Nov 2018 22:55:11 -0800 (PST) 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=QZvfeZHAnMUYvaTlclKUDRPDClRnA84dF7+NxVt5aH0=; b=F2Cxd1+/NgU9DvQMYjySSP3ukJj+V6MQPz7ppeA7g8INTA1Z8RczvMqTY7xGahlzhL 0Ve8Xvd3kf0j4jBFkkq+YkA3X2c31GJhDo3a86+qBqgTYul9O0oO+HvjHuOTuhliXDuk C8T2Akw3Sb6yOuIQZekJZem8kVcyEe6A0wT1E= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=QZvfeZHAnMUYvaTlclKUDRPDClRnA84dF7+NxVt5aH0=; b=HvSxGFj1lYR18frcW/JT+M2muF9Q0vjTrMWS0y93ghdRGcD82zTeMKSahwXCjopZTt zrRvQ/JrsTsK3I7kMmqVrwqRERkGwduMf5IMMBfd32V3obkU+insHPPf0rZCIBFuwZJD RtVQyal3LsohfDh2JAU67cQdMK5NfbjnnD51YyU8NO/5mv9o5ExiXXYSPOUTaq2x+3Rs JLePu/6wpUbqS8ZsTC8Dv6gQ94iLGupVD+b8P50/lWiDfpxscu0QCXutcqw1tSy8D8Hf cOizXFjYlKwtEe6QfZqR9QDn4cdoy1iDlCUxnNO+dxghz9/1nHN25lwWlW4b03805Bb1 Dj2w== X-Gm-Message-State: AA+aEWZtaEdiYIFpVeyvlBmev3axLnYKPdXWm9JPODDDr1RQQwT5sre1 Fx8MpFV+yXrf0J24aspMgqlPGg== X-Google-Smtp-Source: AFSGD/Xgx74Aw0UFM8t+YqW061gK6uzM2pSDbDmzZYKAHqX13ixJ4GcP6hR6HNqr50YqJ+wNdvD5Zg== X-Received: by 2002:a63:d34a:: with SMTP id u10mr3937210pgi.301.1543560911037; Thu, 29 Nov 2018 22:55:11 -0800 (PST) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id w128sm5859175pfw.79.2018.11.29.22.55.09 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 29 Nov 2018 22:55:10 -0800 (PST) From: Bjorn Andersson To: Michael Turquette , Stephen Boyd Cc: Andy Gross , David Brown , linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, Marc Gonzalez , Amit Kucheria Subject: [PATCH 2/3] clk: qcom: gcc-msm8998: Disable halt check of UFS clocks Date: Thu, 29 Nov 2018 22:52:58 -0800 Message-Id: <20181130065259.26497-3-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20181130065259.26497-1-bjorn.andersson@linaro.org> References: <20181130065259.26497-1-bjorn.andersson@linaro.org> Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org 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 --- drivers/clk/qcom/gcc-msm8998.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/clk/qcom/gcc-msm8998.c b/drivers/clk/qcom/gcc-msm8998.c index d89f8e7c2a59..3d232d266d72 100644 --- a/drivers/clk/qcom/gcc-msm8998.c +++ b/drivers/clk/qcom/gcc-msm8998.c @@ -2403,7 +2403,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), @@ -2416,7 +2416,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), @@ -2429,7 +2429,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), -- 2.18.0