From patchwork Mon Feb 19 11:21:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jerome Brunet X-Patchwork-Id: 128804 Delivered-To: patch@linaro.org Received: by 10.46.124.24 with SMTP id x24csp3388450ljc; Mon, 19 Feb 2018 03:24:39 -0800 (PST) X-Google-Smtp-Source: AH8x226nCN6fNNMe0VlL32WXQl/bJV6JHzTtgvmR1XB3z/FAIS7sIEnED8dxH3HvYwlnchG/xL7I X-Received: by 10.99.43.67 with SMTP id r64mr4327203pgr.403.1519039479124; Mon, 19 Feb 2018 03:24:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519039479; cv=none; d=google.com; s=arc-20160816; b=F1lGzjVxGREzL+Gd1qSBcyO0J2vAfXBUA/qnL+9V47j/31MMqyGB7fsvSGJbwcGpCL cWepkI1OS3D5S8I24lgQjA5NcxjDzuFMfcpYk1ua4g6Rg5hytaziQu+i+wMZAmfGqokt 66KOovSVSzXpus0dDfgCuK4OapzKUA/uajaMYZMKxEIMX1isOGUMJE97/0C/XckzVgBS 9DRUJxTuQvsdwnp/HKlbGNDbZdjNbrNHYovWkXKj6yweBLIzS9TakYyy9uVtZGI00I6X OWgy8LvZ/hy0UIiHE+heRX/o0tc2btH2F1z7OPWY6V6LNBa3LT+JKhOECz18mbjt2Dxc QQrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature:arc-authentication-results; bh=R/wzykPqXVI/eFMZiPfQUEUuIjjBUnXjB99i+ubgGy4=; b=S/FRLrgcbQboac0fXoV1QvavA0sNljweLXZdsOWmMqLaGm2VcgHKfBTuD/2u1ODK5F cfmhbxZb7cKpTtWSu7N2PrrVAQebtO2zpXeczSp3iMyCleyHJVA7b1gRVRxd+CdO0Fpx DiUj7WJlN4Nm7BYaRiMAbqa23ct26MlFuIw8vuTt5L+VRyEqyduIcXZjc33pp+HkKum2 ELDXZYQsXq5NpZb4ZjLDFADhGYHNygu+7xTOV9LXrBjqebXYt9oLO3Oezr+9+w8zDAyA N1pOzSWwxXfBwZSby9iJlMGj2AgvdsHvQequtQdPrka1rJNLXEDfyW8ybU7bHDMJCc7w MRWw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tNC5VCI7; 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 l6si6548940pgp.5.2018.02.19.03.24.38; Mon, 19 Feb 2018 03:24:39 -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=@baylibre-com.20150623.gappssmtp.com header.s=20150623 header.b=tNC5VCI7; 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 S1752677AbeBSLYd (ORCPT + 28 others); Mon, 19 Feb 2018 06:24:33 -0500 Received: from mail-wr0-f193.google.com ([209.85.128.193]:46981 "EHLO mail-wr0-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752518AbeBSLVz (ORCPT ); Mon, 19 Feb 2018 06:21:55 -0500 Received: by mail-wr0-f193.google.com with SMTP id 34so9201414wre.13 for ; Mon, 19 Feb 2018 03:21:55 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=baylibre-com.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=R/wzykPqXVI/eFMZiPfQUEUuIjjBUnXjB99i+ubgGy4=; b=tNC5VCI7K/ywHS2MKPMmwbxTEVcqONx54NA0Isgqbsnh5P/QBTgtg/Mv3I+zLMZsjF MYGNTpc6m+PbUyzgrhPnc2IOwzvp4rqzp6T4FaBTmQDGuriT4olY626mPPIeXTQoYPE5 roed7DonNhgKBkdorLcl31KOjpVyrma6WJj0kiE9PFek7MSu+dEh7zdd5q7em50nRC9V sxaSn6Jyh8Q4/RgxfhhfcG5KETjcwtW001WFbYttEjTam2k9nM8AdhnDnpkhyYdp7TFO qFYaPtzefThiJqxqSPC1geLKRG2cJmsIL+5v23bnhhwqEVIOLyq4M/dQgLkOIQ2hhwvZ DdaQ== 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=R/wzykPqXVI/eFMZiPfQUEUuIjjBUnXjB99i+ubgGy4=; b=BCg1UVkTvCL21tZm7+OezsqePzAOMR1oDO5xFEqskpTbNTB6YgFiW6idnoRBOtMYum PzzHrUvIt4WLC3sCoUiphBcY/0iiUScBsW0noieiR9rrw8GZRYiUID3BHUDxSP1pDoaV +uwOXdPxAy/m+9S3d3clMpSwN9xruM27TNIIde4mBvR7sJFd1Tleo/Vgz7dWlgrv5Wri RYsMWnZgKzzLDUrQ4QH0PDbn4JF5vs1PblbF955J57Uavl632px9tAZ19GIKw7AVWXhG Wc1MdKd6V+qnf+doLSYC0Re2NCAUh+IQaQtauwRohidS1OK798nikoPVVYQA7+mrhUjT rZaw== X-Gm-Message-State: APf1xPCfNH3XyK+Ne4H1irqPp5LnOP9K0/Zzc6CAhEw+m/8jPLT9L8QB IAaVQqdpxIof9chf+4tjaFYbAA== X-Received: by 10.223.176.77 with SMTP id g13mr13492649wra.21.1519039314250; Mon, 19 Feb 2018 03:21:54 -0800 (PST) Received: from boomer.baylibre.local ([90.63.244.31]) by smtp.googlemail.com with ESMTPSA id n20sm8933978wrg.84.2018.02.19.03.21.53 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 19 Feb 2018 03:21:53 -0800 (PST) From: Jerome Brunet To: Neil Armstrong , Kevin Hilman Cc: Jerome Brunet , Stephen Boyd , Michael Turquette , Carlo Caione , linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 03/11] clk: meson: remove special gp0 lock loop Date: Mon, 19 Feb 2018 12:21:38 +0100 Message-Id: <20180219112146.21746-4-jbrunet@baylibre.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180219112146.21746-1-jbrunet@baylibre.com> References: <20180219112146.21746-1-jbrunet@baylibre.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org After testing, it appears that the gxl (and axg) does not require the special locking/reset loop which was initially added for it. All the values present in the gxl table can locked with the simple lock checking loop. The change switches the gxl and axg gp0 back to the simple lock checking loop and removes the code no longer required. Signed-off-by: Jerome Brunet --- drivers/clk/meson/axg.c | 1 - drivers/clk/meson/clk-pll.c | 12 +----------- drivers/clk/meson/clkc.h | 2 -- drivers/clk/meson/gxbb.c | 1 - 4 files changed, 1 insertion(+), 15 deletions(-) -- 2.14.3 diff --git a/drivers/clk/meson/axg.c b/drivers/clk/meson/axg.c index 8226b82c67fd..4f13929cd594 100644 --- a/drivers/clk/meson/axg.c +++ b/drivers/clk/meson/axg.c @@ -231,7 +231,6 @@ static struct clk_regmap axg_gp0_pll = { .table = axg_gp0_pll_rate_table, .init_regs = axg_gp0_init_regs, .init_count = ARRAY_SIZE(axg_gp0_init_regs), - .flags = CLK_MESON_PLL_LOCK_LOOP_RST, }, .hw.init = &(struct clk_init_data){ .name = "gp0_pll", diff --git a/drivers/clk/meson/clk-pll.c b/drivers/clk/meson/clk-pll.c index f3d909719111..0b9b4422c968 100644 --- a/drivers/clk/meson/clk-pll.c +++ b/drivers/clk/meson/clk-pll.c @@ -121,19 +121,9 @@ static int meson_clk_pll_wait_lock(struct clk_hw *hw) { struct clk_regmap *clk = to_clk_regmap(hw); struct meson_clk_pll_data *pll = meson_clk_pll_data(clk); - int delay = pll->flags & CLK_MESON_PLL_LOCK_LOOP_RST ? - 100 : 24000000; + int delay = 24000000; do { - /* Specific wait loop for GXL/GXM GP0 PLL */ - if (pll->flags & CLK_MESON_PLL_LOCK_LOOP_RST) { - /* Procedure taken from the vendor kernel */ - meson_parm_write(clk->map, &pll->rst, 1); - udelay(10); - meson_parm_write(clk->map, &pll->rst, 0); - mdelay(1); - } - /* Is the clock locked now ? */ if (meson_parm_read(clk->map, &pll->l)) return 0; diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h index 8d8fe608cff4..ebd88afe1eb5 100644 --- a/drivers/clk/meson/clkc.h +++ b/drivers/clk/meson/clkc.h @@ -82,8 +82,6 @@ struct pll_rate_table { .frac = (_frac), \ } \ -#define CLK_MESON_PLL_LOCK_LOOP_RST BIT(0) - struct meson_clk_pll_data { struct parm m; struct parm n; diff --git a/drivers/clk/meson/gxbb.c b/drivers/clk/meson/gxbb.c index 3cd07f960489..ac48eef0f490 100644 --- a/drivers/clk/meson/gxbb.c +++ b/drivers/clk/meson/gxbb.c @@ -475,7 +475,6 @@ static struct clk_regmap gxl_gp0_pll = { .table = gxl_gp0_pll_rate_table, .init_regs = gxl_gp0_init_regs, .init_count = ARRAY_SIZE(gxl_gp0_init_regs), - .flags = CLK_MESON_PLL_LOCK_LOOP_RST, }, .hw.init = &(struct clk_init_data){ .name = "gp0_pll",