From patchwork Thu Dec 7 15:58:52 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Maxime Ripard X-Patchwork-Id: 121007 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp8534361qgn; Thu, 7 Dec 2017 08:00:19 -0800 (PST) X-Google-Smtp-Source: AGs4zMZJpv2jnOe67W2I56Q9NYm9f95JfWluIBlZfeZloHxYGNx01oPOViLSrYr+LVonlVqPEKrg X-Received: by 10.159.247.14 with SMTP id d14mr2741971pls.274.1512662419344; Thu, 07 Dec 2017 08:00:19 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1512662419; cv=none; d=google.com; s=arc-20160816; b=EQTRAACtKoKemgBe7qkRg6hohSxSCe7xRll2USsdMqN0yxvPm+Td0qrGUJbahUDsej 3myOxA/W2xueCkE+es0lqb73j4XbsGtpgFySUBCi/xGlZpyuB25HHqsC3suSTnrRLlQo XpWmK+A5oQX9xDXRcm7o3hRnzQFyNwbZ8BoH6I9R+lqUZXFmjM4wHMHIQ4MXMkBGW/sV 6ZgPc+ZEd/Ve7H4JsMHBdFg5npq0CKm8UX7FglRUxWisI6gTHX+2RXp5wfkDB/Lwbway UGyux1/3B8DSvdzBoo7P23vr0U8utqc96DfaxUGRgT5WexwG3dqMLAc+/XNEzPUykOuI 6VgQ== 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:references :in-reply-to:message-id:date:subject:cc:to:from :arc-authentication-results; bh=qdl+u582KHs7bz62tHXpGmi/05+3Uq28/FqTZAdskII=; b=eQN1aRaBfcslOuX4X70QBdd7ye67U/SGDbWwocNKF9N+GWDOTUA4e7pJI4G+S6Z9gP 356XgD6QZGZZ5YlbJyAJzPBxP+5roRwWDs0SNEpeRVKeSrUtkHyqFeRGN0bxqPHsKIxl 1TJcd+4mxEtlYvi7MGwBE7zqoavZcHBLAm2M+6FKr5xcS4sxGRObuMtR009P62ZOT45m ZrlzSNjVcHPHRDC4jNxJw5mKGSkncUaHBaxgB5bXPkLjSFqknqg0ThgUMlH0our7Qv0u 8Gv1nEa1E80fQMPR6g2uX1NX4SNApkLv0+pvlM62cD6UwZQei6TbkzhT6o+dKJub+GT1 lOTA== ARC-Authentication-Results: i=1; mx.google.com; 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 e73si4329449pfj.239.2017.12.07.08.00.19; Thu, 07 Dec 2017 08:00:19 -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; 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 S933448AbdLGQAQ (ORCPT + 21 others); Thu, 7 Dec 2017 11:00:16 -0500 Received: from mail.free-electrons.com ([62.4.15.54]:38834 "EHLO mail.free-electrons.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933075AbdLGP7a (ORCPT ); Thu, 7 Dec 2017 10:59:30 -0500 Received: by mail.free-electrons.com (Postfix, from userid 110) id A310320D96; Thu, 7 Dec 2017 16:59:28 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on mail.free-electrons.com X-Spam-Level: X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED,SHORTCIRCUIT, URIBL_BLOCKED shortcircuit=ham autolearn=disabled version=3.4.0 Received: from localhost (unknown [185.94.189.187]) by mail.free-electrons.com (Postfix) with ESMTPSA id 6284F20D9F; Thu, 7 Dec 2017 16:59:18 +0100 (CET) From: Maxime Ripard To: Daniel Vetter , David Airlie , Chen-Yu Tsai , Maxime Ripard Cc: dri-devel@lists.freedesktop.org, linux-kernel@vger.kernel.org, Mark Rutland , Rob Herring , linux-arm-kernel@lists.infradead.org, plaes@plaes.org, icenowy@aosc.io, Thomas Petazzoni , jernej.skrabec@siol.net, devicetree@vger.kernel.org, thierry.reding@gmail.com Subject: [PATCH v4 07/15] drm/sun4i: Create minimal multipliers and dividers Date: Thu, 7 Dec 2017 16:58:52 +0100 Message-Id: <4f8708474fdd6e6e6c8452042e1ce70fc4cb5fa8.1512662253.git-series.maxime.ripard@free-electrons.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: References: In-Reply-To: References: Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The various outputs the TCON can provide have different constraints on the dotclock divider. Let's make them configurable by the various mode_set functions. Reviewed-by: Chen-Yu Tsai Signed-off-by: Maxime Ripard --- drivers/gpu/drm/sun4i/sun4i_dotclock.c | 10 +++++++--- drivers/gpu/drm/sun4i/sun4i_tcon.c | 2 ++ drivers/gpu/drm/sun4i/sun4i_tcon.h | 2 ++ 3 files changed, 11 insertions(+), 3 deletions(-) -- git-series 0.9.1 diff --git a/drivers/gpu/drm/sun4i/sun4i_dotclock.c b/drivers/gpu/drm/sun4i/sun4i_dotclock.c index d401156490f3..023f39bda633 100644 --- a/drivers/gpu/drm/sun4i/sun4i_dotclock.c +++ b/drivers/gpu/drm/sun4i/sun4i_dotclock.c @@ -17,8 +17,9 @@ #include "sun4i_dotclock.h" struct sun4i_dclk { - struct clk_hw hw; - struct regmap *regmap; + struct clk_hw hw; + struct regmap *regmap; + struct sun4i_tcon *tcon; }; static inline struct sun4i_dclk *hw_to_dclk(struct clk_hw *hw) @@ -73,11 +74,13 @@ static unsigned long sun4i_dclk_recalc_rate(struct clk_hw *hw, static long sun4i_dclk_round_rate(struct clk_hw *hw, unsigned long rate, unsigned long *parent_rate) { + struct sun4i_dclk *dclk = hw_to_dclk(hw); + struct sun4i_tcon *tcon = dclk->tcon; unsigned long best_parent = 0; u8 best_div = 1; int i; - for (i = 6; i <= 127; i++) { + for (i = tcon->dclk_min_div; i <= tcon->dclk_max_div; i++) { unsigned long ideal = rate * i; unsigned long rounded; @@ -167,6 +170,7 @@ int sun4i_dclk_create(struct device *dev, struct sun4i_tcon *tcon) dclk = devm_kzalloc(dev, sizeof(*dclk), GFP_KERNEL); if (!dclk) return -ENOMEM; + dclk->tcon = tcon; init.name = clk_name; init.ops = &sun4i_dclk_ops; diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.c b/drivers/gpu/drm/sun4i/sun4i_tcon.c index ea056a3d2131..46e28ca1f676 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.c +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.c @@ -177,6 +177,8 @@ static void sun4i_tcon0_mode_set_rgb(struct sun4i_tcon *tcon, u8 clk_delay; u32 val = 0; + tcon->dclk_min_div = 6; + tcon->dclk_max_div = 127; sun4i_tcon0_mode_set_common(tcon, mode); /* Adjust clock delay */ diff --git a/drivers/gpu/drm/sun4i/sun4i_tcon.h b/drivers/gpu/drm/sun4i/sun4i_tcon.h index 839266a38505..bd3ad7684870 100644 --- a/drivers/gpu/drm/sun4i/sun4i_tcon.h +++ b/drivers/gpu/drm/sun4i/sun4i_tcon.h @@ -169,6 +169,8 @@ struct sun4i_tcon { /* Pixel clock */ struct clk *dclk; + u8 dclk_max_div; + u8 dclk_min_div; /* Reset control */ struct reset_control *lcd_rst;