Received: by 2002:ac0:a582:0:0:0:0:0 with SMTP id m2-v6csp1489259imm; Wed, 17 Oct 2018 22:08:53 -0700 (PDT) X-Google-Smtp-Source: ACcGV63XietdxlVhHaJjKU6n0Jn/4O/XBDfONXDycAD78vhJvD5GDG14ROhlz98V8QeLT8iyugii X-Received: by 2002:a62:48ce:: with SMTP id q75-v6mr29731195pfi.22.1539839333725; Wed, 17 Oct 2018 22:08:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539839333; cv=none; d=google.com; s=arc-20160816; b=AZ1HHXgo6HS52fBn7ECv2OA/KM0ttsL+EV/5GQ/8tFs4nNxevVGCJ4JKuYaAn8XX/B 2NAJ2SrTGBKuHtPd5OzbAJ6QN+yUdv1fRatBoZaCwZqIsUZs8SnOk7MM5+4z+n4QGRqu /ckqb2vrmO2jvmXRoq+lXQqtZ/PEEMtzcXAVGb0YB5DxPnFzljyiaht42Y7nMoRHf5QI 7Ga75cw0H2Y1dW8RpNKgZIuu2gSc8zZIg2pd416eQltj5fYsdLxECceOfrKWBrp6RqeO 1MNeML+h4an6ewTI4D/KSVGdYLmdw8aylkV6yc0aRXt0h2BJMlz29Zgx0NEqr6vu9CXf LFcQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=Z/B0eHccAAxWz9wY8p5j3JKIMXGtsBKmUBHua1c+VpM=; b=O2IsOzeRJ+9sXMilrN/upJOPti4xrZp4pX7F+PKODzplLGhUVAP0T70wXmbKp+N0GT BcWy8mDtaM7Xep5syXD8wg8P5V/vFxOAvNr2WQeWVc5Ol3qK0P0IMbD6GQj3/T/IDSQb 3lcvBgM1fjlx8fVy/vNPs3YUuRpIR2sVuu2vYjIWGjJQ+Raupy9zfD88nPUtl2YH3IFc nF6lYpcTMy28aSxhmZIviTmZt9vqwyr0jJKt5sxCq2k0WoSfxlUv63mk/R9IGUtQE0Tg lbB3s47jTfWsKIEc72MWVZcnbeAkVheozcBM7HdOO2mAJKQb6zhYaDRnYVnuS3mlahmq eaLg== 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 m16-v6si17980896pgl.462.2018.10.17.22.08.38; Wed, 17 Oct 2018 22:08:53 -0700 (PDT) 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 S1727452AbeJRNGu (ORCPT + 99 others); Thu, 18 Oct 2018 09:06:50 -0400 Received: from mail-sh2.amlogic.com ([58.32.228.45]:28728 "EHLO mail-sh2.amlogic.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727328AbeJRNGu (ORCPT ); Thu, 18 Oct 2018 09:06:50 -0400 Received: from localhost.localdomain (10.18.11.217) by mail-sh2.amlogic.com (10.18.11.6) with Microsoft SMTP Server id 15.0.1320.4; Thu, 18 Oct 2018 13:07:27 +0800 From: Jianxin Pan To: Jerome Brunet , Neil Armstrong CC: Yixun Lan , Jianxin Pan , Kevin Hilman , Carlo Caione , Michael Turquette , Stephen Boyd , Rob Herring , Miquel Raynal , Boris Brezillon , Martin Blumenstingl , Liang Yang , Jian Hu , Qiufang Dai , Hanjie Lin , Victor Wan , , , , , Subject: [PATCH v5 1/3] clk: meson: add emmc sub clock phase delay driver Date: Thu, 18 Oct 2018 13:07:23 +0800 Message-ID: <1539839245-13793-2-git-send-email-jianxin.pan@amlogic.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1539839245-13793-1-git-send-email-jianxin.pan@amlogic.com> References: <1539839245-13793-1-git-send-email-jianxin.pan@amlogic.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [10.18.11.217] Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Yixun Lan Export the emmc sub clock phase delay ops which will be used by the emmc sub clock driver itself. Signed-off-by: Yixun Lan Signed-off-by: Jianxin Pan --- drivers/clk/meson/Makefile | 2 +- drivers/clk/meson/clk-phase-delay.c | 79 +++++++++++++++++++++++++++++++++++++ drivers/clk/meson/clkc.h | 13 ++++++ 3 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 drivers/clk/meson/clk-phase-delay.c diff --git a/drivers/clk/meson/Makefile b/drivers/clk/meson/Makefile index 72ec8c4..39ce566 100644 --- a/drivers/clk/meson/Makefile +++ b/drivers/clk/meson/Makefile @@ -2,7 +2,7 @@ # Makefile for Meson specific clk # -obj-$(CONFIG_COMMON_CLK_AMLOGIC) += clk-pll.o clk-mpll.o clk-phase.o +obj-$(CONFIG_COMMON_CLK_AMLOGIC) += clk-pll.o clk-mpll.o clk-phase.o clk-phase-delay.o obj-$(CONFIG_COMMON_CLK_AMLOGIC_AUDIO) += clk-triphase.o sclk-div.o obj-$(CONFIG_COMMON_CLK_MESON_AO) += meson-aoclk.o obj-$(CONFIG_COMMON_CLK_MESON8B) += meson8b.o diff --git a/drivers/clk/meson/clk-phase-delay.c b/drivers/clk/meson/clk-phase-delay.c new file mode 100644 index 0000000..b9573a7 --- /dev/null +++ b/drivers/clk/meson/clk-phase-delay.c @@ -0,0 +1,79 @@ +// SPDX-License-Identifier: (GPL-2.0+ OR MIT) +/* + * Amlogic Meson MMC Sub Clock Controller Driver + * + * Copyright (c) 2017 Baylibre SAS. + * Author: Jerome Brunet + * + * Copyright (c) 2018 Amlogic, inc. + * Author: Yixun Lan + */ + +#include +#include "clkc.h" + +static int meson_clk_phase_delay_get_phase(struct clk_hw *hw) +{ + struct clk_regmap *clk = to_clk_regmap(hw); + struct meson_clk_phase_delay_data *ph = + meson_clk_get_phase_delay_data(clk); + unsigned long period_ps, p, d; + int degrees; + u32 val; + + regmap_read(clk->map, ph->phase.reg_off, &val); + p = PARM_GET(ph->phase.width, ph->phase.shift, val); + degrees = p * 360 / (1 << (ph->phase.width)); + + period_ps = DIV_ROUND_UP((unsigned long)NSEC_PER_SEC * 1000, + clk_hw_get_rate(hw)); + + d = PARM_GET(ph->delay.width, ph->delay.shift, val); + degrees += d * ph->delay_step_ps * 360 / period_ps; + degrees %= 360; + + return degrees; +} + +static void meson_clk_apply_phase_delay(struct clk_regmap *clk, + unsigned int phase, + unsigned int delay) +{ + struct meson_clk_phase_delay_data *ph = clk->data; + u32 val; + + regmap_read(clk->map, ph->delay.reg_off, &val); + val = PARM_SET(ph->phase.width, ph->phase.shift, val, phase); + val = PARM_SET(ph->delay.width, ph->delay.shift, val, delay); + regmap_write(clk->map, ph->delay.reg_off, val); +} + +static int meson_clk_phase_delay_set_phase(struct clk_hw *hw, int degrees) +{ + struct clk_regmap *clk = to_clk_regmap(hw); + struct meson_clk_phase_delay_data *ph = + meson_clk_get_phase_delay_data(clk); + unsigned long period_ps, d = 0, r; + u64 p; + + p = degrees % 360; + period_ps = DIV_ROUND_UP((unsigned long)NSEC_PER_SEC * 1000, + clk_hw_get_rate(hw)); + + /* First compute the phase index (p), the remainder (r) is the + * part we'll try to acheive using the delays (d). + */ + r = do_div(p, 360 / (1 << (ph->phase.width))); + d = DIV_ROUND_CLOSEST(r * period_ps, + 360 * ph->delay_step_ps); + d = min(d, PMASK(ph->delay.width)); + + meson_clk_apply_phase_delay(clk, p, d); + return 0; +} + +const struct clk_ops meson_clk_phase_delay_ops = { + .get_phase = meson_clk_phase_delay_get_phase, + .set_phase = meson_clk_phase_delay_set_phase, +}; +EXPORT_SYMBOL_GPL(meson_clk_phase_delay_ops); diff --git a/drivers/clk/meson/clkc.h b/drivers/clk/meson/clkc.h index 6b96d55..3309d78 100644 --- a/drivers/clk/meson/clkc.h +++ b/drivers/clk/meson/clkc.h @@ -105,6 +105,18 @@ struct clk_regmap _name = { \ }, \ }; +struct meson_clk_phase_delay_data { + struct parm phase; + struct parm delay; + unsigned int delay_step_ps; +}; + +static inline struct meson_clk_phase_delay_data * +meson_clk_get_phase_delay_data(struct clk_regmap *clk) +{ + return (struct meson_clk_phase_delay_data *)clk->data; +} + /* clk_ops */ extern const struct clk_ops meson_clk_pll_ro_ops; extern const struct clk_ops meson_clk_pll_ops; @@ -112,5 +124,6 @@ struct clk_regmap _name = { \ extern const struct clk_ops meson_clk_mpll_ro_ops; extern const struct clk_ops meson_clk_mpll_ops; extern const struct clk_ops meson_clk_phase_ops; +extern const struct clk_ops meson_clk_phase_delay_ops; #endif /* __CLKC_H */ -- 1.9.1