From patchwork Wed Jun 19 05:27:11 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Smirnov X-Patchwork-Id: 11003595 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0C2D514DB for ; Wed, 19 Jun 2019 07:11:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EE28F28A68 for ; Wed, 19 Jun 2019 07:11:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id E2E0A28B4C; Wed, 19 Jun 2019 07:11:56 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_ADSP_CUSTOM_MED, FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 86CAD28A68 for ; Wed, 19 Jun 2019 07:11:56 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 212466E2DF; Wed, 19 Jun 2019 07:11:39 +0000 (UTC) X-Original-To: dri-devel@lists.freedesktop.org Delivered-To: dri-devel@lists.freedesktop.org Received: from mail-pg1-x544.google.com (mail-pg1-x544.google.com [IPv6:2607:f8b0:4864:20::544]) by gabe.freedesktop.org (Postfix) with ESMTPS id A87AC6E29B for ; Wed, 19 Jun 2019 05:27:47 +0000 (UTC) Received: by mail-pg1-x544.google.com with SMTP id w10so4326036pgj.7 for ; Tue, 18 Jun 2019 22:27:47 -0700 (PDT) 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:mime-version:content-transfer-encoding; bh=f3azL3W8aECugncjqHtY+kqD7WaDuHbuCaFEu1OGnwg=; b=ThqGHofDaHM023XpDNi6HUBzCbrkh8zBHfbnf61b4yZ5/09BN5fiaQ+VqS4vpMhgIP 2YiHZxALmdqsG0oBDg2U+N82nnLWu3+ahUGdg+yj33LOoe7oAeSUHmfk+3HxgnlbV0md 2QeLj1KmS/i0SsvQrRNiU+pazWqRIaI+DfUrpkrG+lcNDzn/oMDTAp9A5vZUBxa0uwVT 2Yi73PHjMg45ne/Rx/4cQw+6kXVvEUJo1eDF5C4AyI/9XxZWyTmfhPBdnEUHRlqcIoUY JOc1s86Afe7AmengV7xTFgNljcLs+X1P4RokR88wijeQdkSqyQPjJVPii+KHknbvuLdn F0yQ== X-Gm-Message-State: APjAAAUdAQWzWxAylBf6U97NxuppZjC43dGIYARwjLELk6qQlQT1zDv+ oBSVHISPe6i78HitD7t4nZef1tFMT44= X-Google-Smtp-Source: APXvYqx+sbfkzIncexlHUWyP7+glgUeMN/W5Y4ZeR5hh8JjKLRcsO98Xx24AQBU5yL9J91D7Uo6q4A== X-Received: by 2002:a63:87c8:: with SMTP id i191mr6137310pge.131.1560922066899; Tue, 18 Jun 2019 22:27:46 -0700 (PDT) Received: from localhost.lan (c-24-22-235-96.hsd1.wa.comcast.net. [24.22.235.96]) by smtp.gmail.com with ESMTPSA id l44sm534742pje.29.2019.06.18.22.27.45 (version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256); Tue, 18 Jun 2019 22:27:46 -0700 (PDT) From: Andrey Smirnov To: dri-devel@lists.freedesktop.org Subject: [PATCH v6 10/15] drm/bridge: tc358767: Introduce tc_set_syspllparam() Date: Tue, 18 Jun 2019 22:27:11 -0700 Message-Id: <20190619052716.16831-11-andrew.smirnov@gmail.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190619052716.16831-1-andrew.smirnov@gmail.com> References: <20190619052716.16831-1-andrew.smirnov@gmail.com> MIME-Version: 1.0 X-Mailman-Approved-At: Wed, 19 Jun 2019 07:10:14 +0000 X-Mailman-Original-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=f3azL3W8aECugncjqHtY+kqD7WaDuHbuCaFEu1OGnwg=; b=qOV1Py2zpsvamHrouGGaPf4EIv82LZbwIl9ntHtz6B7ZpmdkfN2mhOyx2LOFvnzdS+ KrcUBGMLmQsV/gDqw4Day24vGjCx+1n8H1G/IuGZv1l9ViFAyhUjwjVPIf7Tb//A6ayH ef3Yr4HVz9e/IpwL4DZEy4kJxrPIBlzvFCDbnIe2Q1bu8VzUUhimAeFSeC3SzmfBmLMN 6eUNz6llh8HhzRVSuuJ/i1cya//sWgJy+0AVsOwkb23ztlK/itxmH+40qaMBbU0YTmNq F7Gjm+CNLzlz3cu53oyNJ02v/tUhlsryaRPrOa87Qxg2lhIxVFf4JNURiAl16AmxNRJw e1ow== X-BeenThere: dri-devel@lists.freedesktop.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: Direct Rendering Infrastructure - Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Cory Tusar , Andrey Smirnov , Andrey Gusakov , linux-kernel@vger.kernel.org, Tomi Valkeinen , Laurent Pinchart , Chris Healy Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" X-Virus-Scanned: ClamAV using ClamSMTP Move common code converting clock rate to an appropriate constant and configuring SYS_PLLPARAM register into a separate routine and convert the rest of the code to use it. No functional change intended. Signed-off-by: Andrey Smirnov Reviewed-by: Laurent Pinchart Reviewed-by: Andrzej Hajda Cc: Andrzej Hajda Cc: Laurent Pinchart Cc: Tomi Valkeinen Cc: Andrey Gusakov Cc: Philipp Zabel Cc: Chris Healy Cc: Cory Tusar Cc: Lucas Stach Cc: dri-devel@lists.freedesktop.org Cc: linux-kernel@vger.kernel.org --- drivers/gpu/drm/bridge/tc358767.c | 46 +++++++++++-------------------- 1 file changed, 16 insertions(+), 30 deletions(-) diff --git a/drivers/gpu/drm/bridge/tc358767.c b/drivers/gpu/drm/bridge/tc358767.c index b01c1c8341e1..7a3a1b2d5c56 100644 --- a/drivers/gpu/drm/bridge/tc358767.c +++ b/drivers/gpu/drm/bridge/tc358767.c @@ -565,35 +565,40 @@ static int tc_stream_clock_calc(struct tc_data *tc) return regmap_write(tc->regmap, DP0_VIDMNGEN1, 32768); } -static int tc_aux_link_setup(struct tc_data *tc) +static int tc_set_syspllparam(struct tc_data *tc) { unsigned long rate; - u32 dp0_auxcfg1; - u32 value; - int ret; + u32 pllparam = SYSCLK_SEL_LSCLK | LSCLK_DIV_2; rate = clk_get_rate(tc->refclk); switch (rate) { case 38400000: - value = REF_FREQ_38M4; + pllparam |= REF_FREQ_38M4; break; case 26000000: - value = REF_FREQ_26M; + pllparam |= REF_FREQ_26M; break; case 19200000: - value = REF_FREQ_19M2; + pllparam |= REF_FREQ_19M2; break; case 13000000: - value = REF_FREQ_13M; + pllparam |= REF_FREQ_13M; break; default: dev_err(tc->dev, "Invalid refclk rate: %lu Hz\n", rate); return -EINVAL; } + return regmap_write(tc->regmap, SYS_PLLPARAM, pllparam); +} + +static int tc_aux_link_setup(struct tc_data *tc) +{ + int ret; + u32 dp0_auxcfg1; + /* Setup DP-PHY / PLL */ - value |= SYSCLK_SEL_LSCLK | LSCLK_DIV_2; - ret = regmap_write(tc->regmap, SYS_PLLPARAM, value); + ret = tc_set_syspllparam(tc); if (ret) goto err; @@ -852,7 +857,6 @@ static int tc_main_link_enable(struct tc_data *tc) { struct drm_dp_aux *aux = &tc->aux; struct device *dev = tc->dev; - unsigned int rate; u32 dp_phy_ctrl; u32 value; int ret; @@ -880,25 +884,7 @@ static int tc_main_link_enable(struct tc_data *tc) if (ret) return ret; - rate = clk_get_rate(tc->refclk); - switch (rate) { - case 38400000: - value = REF_FREQ_38M4; - break; - case 26000000: - value = REF_FREQ_26M; - break; - case 19200000: - value = REF_FREQ_19M2; - break; - case 13000000: - value = REF_FREQ_13M; - break; - default: - return -EINVAL; - } - value |= SYSCLK_SEL_LSCLK | LSCLK_DIV_2; - ret = regmap_write(tc->regmap, SYS_PLLPARAM, value); + ret = tc_set_syspllparam(tc); if (ret) return ret;