Received: by 2002:ad5:474a:0:0:0:0:0 with SMTP id i10csp5629501imu; Mon, 26 Nov 2018 03:13:53 -0800 (PST) X-Google-Smtp-Source: AFSGD/WGvEDQvre0at0h3+xIwbuERtdN8UTT6gARFMaLEnx9r4Vp3LwDYKmMwD8s3cm6dS3cPHNX X-Received: by 2002:a17:902:b20e:: with SMTP id t14mr16702620plr.128.1543230833592; Mon, 26 Nov 2018 03:13:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1543230833; cv=none; d=google.com; s=arc-20160816; b=KoiEqFSDWHQr3slvEcQzt5qDV/mgzOOB+LWEuVETsUcNHHEuhOdJMLMkv02EIhGtNI Wn6JfPCz4KBwu+YiLpZ88pNe4aJWLr1pidremzRmNWNf2SewAOvKSgRQ+RcyzxU33ayY bQL56qlC34YVou5qHDb8EFA//Px+ZuQDVw/Ka8tiM4pBp4lUCo8eTprNCoar74YaOFv2 q4ASE5/nrA8ezVpoUEQMSs21yl7Wnl8ZiFy9OCSmJL1YdijswL/s4W+qofus12SJW6KO uimHgNtYCaQJ3hDW3Ycbx7rk/ImNQMdN6bmulri5SQbZ+7x4O8/6SiA07iqnLrjzxoQd B6QA== 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=Y9qoI1FXpqgWHGNiv485HU8jDhIcloAXcucOLH0DiMU=; b=X3o9bmQVrsYVq2liGiY7UhqpVsbVbrhFNxmx+VEmXoFnUPO4qLdsRT/ZxJhxtv9xMC /BALaA16zftZTtykSUnWKSGBR0ErIp+T/if2gbYZelMxFaQyAw9JwEG+KNcJDsG2zlw3 SIAKooYA0FD6iltPUalWnQI9zyJqEeT7SWfhgj+mrx1junF6qRz0O5mfsqWkI713OeDx oCWQWXOVgfODESEcGhHtacA6tEcOrdO4Dp2bndR7GfP7u3VOF5hLhZq4UPE336caOy8G hBWzUqo5inY1ngqu/vQO/Q0+zZH0D2+/RexcFUliU4ObeyqO+xDw77ZSi99+S6R5Pd37 AGmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=1Efyhg2O; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id r18si60423883pgb.491.2018.11.26.03.13.39; Mon, 26 Nov 2018 03:13:53 -0800 (PST) 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=@kernel.org header.s=default header.b=1Efyhg2O; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730517AbeKZV4Y (ORCPT + 99 others); Mon, 26 Nov 2018 16:56:24 -0500 Received: from mail.kernel.org ([198.145.29.99]:39558 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729692AbeKZV4X (ORCPT ); Mon, 26 Nov 2018 16:56:23 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 93E032089F; Mon, 26 Nov 2018 11:02:37 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1543230158; bh=pg2tf+DNKacqh458ouMN5PzpvYZ2NgwOVxv1bgGBKZU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1Efyhg2OD0A8RSbBLmIyR5dPNdSnOoLbsneNxX8BHXyZhgI5L0D5/yYPFltNKXJgF 9aCH/wnYnrJ25Nbcwe+k6JJ8/529Q+yVYp2c773QJsRs341/vNABWkUgaL0JwEv3w3 osS7bKWoWc5fud8ZWVpbe3SC73W1/d3n0vsgztvs= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Martin Blumenstingl , Jerome Brunet , Sasha Levin Subject: [PATCH 4.19 029/118] clk: meson: clk-pll: drop CLK_GET_RATE_NOCACHE where unnecessary Date: Mon, 26 Nov 2018 11:50:23 +0100 Message-Id: <20181126105100.989313708@linuxfoundation.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181126105059.832485122@linuxfoundation.org> References: <20181126105059.832485122@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.19-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 2303a9ca693e585a558497ad737728fec97e2b8a ] CLK_GET_RATE_NOCACHE should only be necessary when the registers controlling the rate of clock may change outside of CCF. On Amlogic, it should only be the case for the hdmi pll which is directly controlled by the display driver (WIP to fix this). The other plls should not require this flag. Reviewed-by: Martin Blumenstingl Tested-by: Martin Blumenstingl Signed-off-by: Jerome Brunet Signed-off-by: Sasha Levin --- drivers/clk/meson/axg.c | 1 - drivers/clk/meson/gxbb.c | 12 ++++++++---- drivers/clk/meson/meson8b.c | 3 --- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index baabcf7c0a24..02229d051d77 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -96,7 +96,6 @@ static struct clk_regmap axg_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 6435d86118f1..6628ffa31383 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -213,7 +213,6 @@ static struct clk_regmap gxbb_fixed_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -276,6 +275,10 @@ static struct clk_regmap gxbb_hdmi_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "hdmi_pll_pre_mult" }, .num_parents = 1, + /* + * Display directly handle hdmi pll registers ATM, we need + * NOCACHE to keep our view of the clock as accurate as possible + */ .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -334,6 +337,10 @@ static struct clk_regmap gxl_hdmi_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, + /* + * Display directly handle hdmi pll registers ATM, we need + * NOCACHE to keep our view of the clock as accurate as possible + */ .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -371,7 +378,6 @@ static struct clk_regmap gxbb_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -418,7 +424,6 @@ static struct clk_regmap gxbb_gp0_pll = { .ops = &meson_clk_pll_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -472,7 +477,6 @@ static struct clk_regmap gxl_gp0_pll = { .ops = &meson_clk_pll_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; diff --git a/drivers/clk/meson/meson8b.c b/drivers/clk/meson/meson8b.c index 7447d96a265f..74697e145dde 100644 --- a/drivers/clk/meson/meson8b.c +++ b/drivers/clk/meson/meson8b.c @@ -132,7 +132,6 @@ static struct clk_regmap meson8b_fixed_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -169,7 +168,6 @@ static struct clk_regmap meson8b_vid_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; @@ -207,7 +205,6 @@ static struct clk_regmap meson8b_sys_pll = { .ops = &meson_clk_pll_ro_ops, .parent_names = (const char *[]){ "xtal" }, .num_parents = 1, - .flags = CLK_GET_RATE_NOCACHE, }, }; -- 2.17.1