From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752706AbcBOVk3 (ORCPT ); Mon, 15 Feb 2016 16:40:29 -0500 Received: from gloria.sntech.de ([95.129.55.99]:50846 "EHLO gloria.sntech.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbcBOVk2 (ORCPT ); Mon, 15 Feb 2016 16:40:28 -0500 From: Heiko Stuebner To: Shawn Lin Cc: Michael Turquette , Stephen Boyd , linux-clk@vger.kernel.org, linux-rockchip@lists.infradead.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH 2/6] clk: rockchip: check grf when waiting pll lock Date: Mon, 15 Feb 2016 22:40:18 +0100 Message-ID: <1835816.QSOU3ZhEch@phil> User-Agent: KMail/4.14.10 (Linux/4.3.0-1-amd64; KDE/4.14.14; x86_64; ; ) In-Reply-To: <1455507205-12996-1-git-send-email-shawn.lin@rock-chips.com> References: <1455507153-12914-1-git-send-email-shawn.lin@rock-chips.com> <1455507205-12996-1-git-send-email-shawn.lin@rock-chips.com> MIME-Version: 1.0 Content-Transfer-Encoding: 7Bit Content-Type: text/plain; charset="us-ascii" Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Am Montag, 15. Februar 2016, 11:33:25 schrieb Shawn Lin: > rockchip_clk_get_grf pass on return value from > syscon_regmap_lookup_by_phandle, so we check grf to > make sure whether to do the following things or not. > > Signed-off-by: Shawn Lin applied to my clk-branch for 4.6 with one change below > --- > > drivers/clk/rockchip/clk-pll.c | 8 +++++++- > 1 file changed, 7 insertions(+), 1 deletion(-) > > diff --git a/drivers/clk/rockchip/clk-pll.c > b/drivers/clk/rockchip/clk-pll.c index b7e66c9..dddbc29 100644 > --- a/drivers/clk/rockchip/clk-pll.c > +++ b/drivers/clk/rockchip/clk-pll.c > @@ -90,10 +90,16 @@ static long rockchip_pll_round_rate(struct clk_hw *hw, > */ > static int rockchip_pll_wait_lock(struct rockchip_clk_pll *pll) > { > - struct regmap *grf = rockchip_clk_get_grf(); > + struct regmap *grf; > unsigned int val; > int delay = 24000000, ret; > > + grf = rockchip_clk_get_grf(); > + if (IS_ERR(grf)) { > + pr_err("%s: grf regmap not available\n", __func__); > + return -ENODEV; I've changed that to PTR_ERR(grf), similar to the preexisting checks Heiko