From patchwork Thu May 24 21:37:35 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bjorn Andersson X-Patchwork-Id: 10425569 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5BD8A602D8 for ; Thu, 24 May 2018 21:37:42 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 4B13629571 for ; Thu, 24 May 2018 21:37:42 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3F6E42958A; Thu, 24 May 2018 21:37:42 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B229129571 for ; Thu, 24 May 2018 21:37:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S966146AbeEXVhl (ORCPT ); Thu, 24 May 2018 17:37:41 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:46428 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S966330AbeEXVhj (ORCPT ); Thu, 24 May 2018 17:37:39 -0400 Received: by mail-pl0-f65.google.com with SMTP id 30-v6so1814037pld.13 for ; Thu, 24 May 2018 14:37:39 -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; bh=Ehq4ZQbhlMAdExjlKhOA+JfyAKSSQujIaR4iypK4UAM=; b=Vx0wAqiFAgZEZw8xqkRy8gvAoEBiqOomALY39bx6mi5puFZRZG8djsUEaW5/DEOzZM eTJ+QiqIT8quGTRxj47f+Lu0DACIgom2I41g+sIEZXfZSjPbp61XoE/RHaOA+L4+UKsy 4M2yto0oO5ol5mJo4JriaXKJfYdYyqV/ae7CQ= 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; bh=Ehq4ZQbhlMAdExjlKhOA+JfyAKSSQujIaR4iypK4UAM=; b=CcQm9L3Zh9mBYWVjPOK5xb9QjQ1LJM/BUQQeaN9t50PrP4bBuOM2nZ5z8UrTfhYwfq 98pVtwUmFk9qjb+n1/Q4dKVefgbXvDLeM4Bt+l5IGrqHxEVkZQlyzNS9egKPM6ufeZWa rQf1qydBpXL97GpTK6AXIOM5/bDOweN5OvN9H+hIWZdXNi5nhcIA5+xwm4p/+NfAMuC7 SjzS6Q4GQzqwIk54Use9iVjSSOZj1r+0trs0KiyMimZ7V3Wb3W/ISJPXXf8Q6nYnpVGU ZhJD4JSav/IuHW2Phuyff0fYsXoIKn0zVyl+nP8wSH/ep+vhUGB+LX3JGiNWA6Eeg6dc 9efA== X-Gm-Message-State: ALKqPwe+8l/fY0dtZ1w10vnZXHDAD8svL6IPHiMFz/cN222g7sWN3GaI vxcq7mgvEDYJCGdPUB8+jYKiKw== X-Google-Smtp-Source: AB8JxZq51H681stc8cqSeoTm7Ieu6ff19QTU1RTzDNmh+KgMmkXFbDYE9Ba5zF6BfkYmhYN36UTaGA== X-Received: by 2002:a17:902:6a89:: with SMTP id n9-v6mr9083658plk.41.1527197858966; Thu, 24 May 2018 14:37:38 -0700 (PDT) Received: from localhost.localdomain (104-188-17-28.lightspeed.sndgca.sbcglobal.net. [104.188.17.28]) by smtp.gmail.com with ESMTPSA id t68-v6sm196104pfe.91.2018.05.24.14.37.37 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 24 May 2018 14:37:38 -0700 (PDT) From: Bjorn Andersson To: Andy Gross , David Brown , Michael Turquette , Stephen Boyd , Manu Gautam , Vivek Gautam Cc: linux-arm-msm@vger.kernel.org, linux-soc@vger.kernel.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH] clk: qcom: gcc-msm8996: Disable halt check on UFS clocks Date: Thu, 24 May 2018 14:37:35 -0700 Message-Id: <20180524213735.12121-1-bjorn.andersson@linaro.org> X-Mailer: git-send-email 2.17.0 Sender: linux-clk-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-clk@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP The halt check of the UFS symbol clocks always fails, as such probing UFS after clk_disable_unused always fails. This makes it impossible to boot a system with the UFS phy or UFS HCD drivers compiled as modules. Follow SDM845 and disable the halt check on these clocks. Signed-off-by: Bjorn Andersson --- drivers/clk/qcom/gcc-msm8996.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/clk/qcom/gcc-msm8996.c b/drivers/clk/qcom/gcc-msm8996.c index 3d6452932797..5f17080c5804 100644 --- a/drivers/clk/qcom/gcc-msm8996.c +++ b/drivers/clk/qcom/gcc-msm8996.c @@ -2792,6 +2792,7 @@ static struct clk_branch gcc_ufs_tx_symbol_0_clk = { static struct clk_branch gcc_ufs_rx_symbol_0_clk = { .halt_reg = 0x7501c, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x7501c, .enable_mask = BIT(0), @@ -2807,6 +2808,7 @@ static struct clk_branch gcc_ufs_rx_symbol_0_clk = { static struct clk_branch gcc_ufs_rx_symbol_1_clk = { .halt_reg = 0x75020, + .halt_check = BRANCH_HALT_SKIP, .clkr = { .enable_reg = 0x75020, .enable_mask = BIT(0),