Received: by 2002:a05:6a10:f3d0:0:0:0:0 with SMTP id a16csp4400647pxv; Mon, 5 Jul 2021 23:22:40 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzVO2lcr/BxXCTjpiBqs2typ7o4Zz8dT3tjjQ8TrRZ8k1PbpUy44plGTs5Gtjo5NdU6NmZO X-Received: by 2002:a92:c5c8:: with SMTP id s8mr11900650ilt.38.1625552560660; Mon, 05 Jul 2021 23:22:40 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1625552560; cv=none; d=google.com; s=arc-20160816; b=auKQe03rzQuy2Luv6+W6PTUN4Rx9pcv+PeQy0/+qVtH46LG29RDl4V5KMAevQm09OA EM+Iq+bhb7ajF4/OOJRyHVGfXV5v0crHQJMlawO1xlinmnUkZt7nNXe0UzeW4kQMvVkc togmXKmGrq9W0CsTAUcaLH6MuMOQmNiYyUhmPpPT3aRjIqMxMwoo6bjHswPTxQyLi2rE se4TsI1lODqdhj7nYZsKtg+Hlb3NR7g8ejt6u/4LtMbqyso/24F8/LZ9MX+LOpAQ/t2h HHuRfGgGDf8KyuSzvDgQhlGAyhUKBx7Eb4pJJhcbb8oJtN8hTgsVCfWRSgI94+e5ZTCg IU1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:mime-version:references:in-reply-to:message-id :date:subject:cc:to:from; bh=JkLwfLkbJVQUQ2dkvX0QRHuxPnNftC2kARcFF0vC95E=; b=lIO//1mBJ5DWQePoHFNBOiK08QRFo81l8d+g/VoOl8jN4mLbf/pJLzo9uEojPutf7v GiSElKcxd0AMV09CSDdB1Gvjy/RzfIYEZR0+AWPa055IH2eDt9xiHAWS0iS9wbNRsVaA 4tyfrJ2L0gEtlbWFibV3UTPMt3E3VEF9zOo+imM8UCeT2QqU4fglpMVNCdjXxQcffoc3 KkAa1IG/tnilfDwGfYyIp7J0Tv6GggbZUWNBRswbviMre7YHINoyHCONqGe/sdkV+emV rhV4ptqMP87JI9rg+65XCjVNG7xOplBr9p8ReN67XL0ECqg8ctmkQZ+2Ymry+HKdeuXX e2gg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id g3si15515375ilc.117.2021.07.05.23.22.29; Mon, 05 Jul 2021 23:22:40 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=mediatek.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230335AbhGFGXN (ORCPT + 99 others); Tue, 6 Jul 2021 02:23:13 -0400 Received: from mailgw02.mediatek.com ([210.61.82.184]:38269 "EHLO mailgw02.mediatek.com" rhost-flags-OK-FAIL-OK-FAIL) by vger.kernel.org with ESMTP id S230346AbhGFGXN (ORCPT ); Tue, 6 Jul 2021 02:23:13 -0400 X-UUID: ff63013757754e8297a5d033ca3a54cd-20210706 X-UUID: ff63013757754e8297a5d033ca3a54cd-20210706 Received: from mtkmbs10n1.mediatek.inc [(172.21.101.34)] by mailgw02.mediatek.com (envelope-from ) (Generic MTA with TLSv1.2 ECDHE-RSA-AES256-GCM-SHA384 256/256) with ESMTP id 743711962; Tue, 06 Jul 2021 14:20:30 +0800 Received: from mtkcas10.mediatek.inc (172.21.101.39) by mtkmbs07n1.mediatek.inc (172.21.101.16) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 6 Jul 2021 14:20:28 +0800 Received: from mtksdccf07.mediatek.inc (172.21.84.99) by mtkcas10.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 6 Jul 2021 14:20:28 +0800 From: Chun-Jie Chen To: Matthias Brugger , Stephen Boyd , Nicolas Boichat , Rob Herring CC: , , , , , , , Weiyi Lu , Chun-Jie Chen Subject: [v13 07/21] clk: mediatek: Add configurable enable control to mtk_pll_data Date: Tue, 6 Jul 2021 14:19:06 +0800 Message-ID: <20210706061920.16013-8-chun-jie.chen@mediatek.com> X-Mailer: git-send-email 2.18.0 In-Reply-To: <20210706061920.16013-1-chun-jie.chen@mediatek.com> References: <20210706061920.16013-1-chun-jie.chen@mediatek.com> MIME-Version: 1.0 Content-Type: text/plain X-MTK: N Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org In all MediaTek PLL design, bit0 of CON0 register is always the enable bit. However, there's a special case of usbpll on MT8192. The enable bit of usbpll is moved to bit2 of other register. Add configurable en_reg and pll_en_bit for enable control or default 0 where pll data are static variables. Hence, CON0_BASE_EN could also be removed. And there might have another special case on other chips, the enable bit is still on CON0 register but not at bit0. Reviewed-by: Ikjoon Jang Signed-off-by: Weiyi Lu Signed-off-by: Chun-Jie Chen --- drivers/clk/mediatek/clk-mtk.h | 20 +++++++++++--------- drivers/clk/mediatek/clk-pll.c | 15 ++++++++++----- 2 files changed, 21 insertions(+), 14 deletions(-) diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index c3d6756b0c7e..31c7cb304508 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -213,13 +213,13 @@ struct mtk_pll_div_table { struct mtk_pll_data { int id; const char *name; - uint32_t reg; - uint32_t pwr_reg; - uint32_t en_mask; - uint32_t pd_reg; - uint32_t tuner_reg; - uint32_t tuner_en_reg; - uint8_t tuner_en_bit; + u32 reg; + u32 pwr_reg; + u32 en_mask; + u32 pd_reg; + u32 tuner_reg; + u32 tuner_en_reg; + u8 tuner_en_bit; int pd_shift; unsigned int flags; const struct clk_ops *ops; @@ -228,11 +228,13 @@ struct mtk_pll_data { unsigned long fmax; int pcwbits; int pcwibits; - uint32_t pcw_reg; + u32 pcw_reg; int pcw_shift; - uint32_t pcw_chg_reg; + u32 pcw_chg_reg; const struct mtk_pll_div_table *div_table; const char *parent_name; + u32 en_reg; + u8 pll_en_bit; /* Assume 0, indicates BIT(0) by default */ }; void mtk_clk_register_plls(struct device_node *node, diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c index 11ed5d1d1c36..7fb001a4e7d8 100644 --- a/drivers/clk/mediatek/clk-pll.c +++ b/drivers/clk/mediatek/clk-pll.c @@ -44,6 +44,7 @@ struct mtk_clk_pll { void __iomem *tuner_en_addr; void __iomem *pcw_addr; void __iomem *pcw_chg_addr; + void __iomem *en_addr; const struct mtk_pll_data *data; }; @@ -56,7 +57,7 @@ static int mtk_pll_is_prepared(struct clk_hw *hw) { struct mtk_clk_pll *pll = to_mtk_clk_pll(hw); - return (readl(pll->base_addr + REG_CON0) & CON0_BASE_EN) != 0; + return (readl(pll->en_addr) & BIT(pll->data->pll_en_bit)) != 0; } static unsigned long __mtk_pll_recalc_rate(struct mtk_clk_pll *pll, u32 fin, @@ -248,8 +249,8 @@ static int mtk_pll_prepare(struct clk_hw *hw) writel(r, pll->pwr_addr); udelay(1); - r = readl(pll->base_addr + REG_CON0) | CON0_BASE_EN; - writel(r, pll->base_addr + REG_CON0); + r = readl(pll->en_addr) | BIT(pll->data->pll_en_bit); + writel(r, pll->en_addr); div_en_mask = pll->data->en_mask & ~CON0_BASE_EN; if (div_en_mask) { @@ -290,8 +291,8 @@ static void mtk_pll_unprepare(struct clk_hw *hw) writel(r, pll->base_addr + REG_CON0); } - r = readl(pll->base_addr + REG_CON0) & ~CON0_BASE_EN; - writel(r, pll->base_addr + REG_CON0); + r = readl(pll->en_addr) & ~BIT(pll->data->pll_en_bit); + writel(r, pll->en_addr); r = readl(pll->pwr_addr) | CON0_ISO_EN; writel(r, pll->pwr_addr); @@ -333,6 +334,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data, pll->tuner_addr = base + data->tuner_reg; if (data->tuner_en_reg) pll->tuner_en_addr = base + data->tuner_en_reg; + if (data->en_reg) + pll->en_addr = base + data->en_reg; + else + pll->en_addr = pll->base_addr + REG_CON0; pll->hw.init = &init; pll->data = data; -- 2.18.0