From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,UNPARSEABLE_RELAY autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id A719CC43381 for ; Tue, 5 Mar 2019 06:48:05 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 76A932075B for ; Tue, 5 Mar 2019 06:48:05 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="Mg0ROfLl" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 76A932075B Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=mediatek.com Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Date:To:From:Subject:Message-ID:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=spuylXTqhG6a93OihtUIR+JWIkehgE6WW26u44QO/1Q=; b=Mg0ROfLlr9YKJl 1SvIN2lYQdweuptoLpIgdnRBY4TGlb560pP5a+zVYsP/MJKhvl6iEd0np6OH19PvmkNXU6YmBT8/O O7jp00FqjftVYOiQMwlyaKQayVhdpr6nlKmygj8k35ds10ZDnAWAO9xoX0Qs65e6+K7Chs/0JwNo5 ai/b0bnwFatHAmsnKf5vs1KDT6ZwupPcUw0lrewx8gqbQSt2hUJL8CxAeiPznu75CnjwwRrLCy5wO 0VkH1rbcpC6GHZcmk8xwOtqOHiPRJX7i/5m4gQK8QjHKFyqALJsIjh9X4z0bnsbwg8Hj91vqGKSv2 9iFBFMbFtVUiZjUYCntw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux)) id 1h13rt-0000Yi-Uz; Tue, 05 Mar 2019 06:48:01 +0000 Received: from mailgw02.mediatek.com ([216.200.240.185]) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1h13rq-0000XW-DN; Tue, 05 Mar 2019 06:47:59 +0000 X-UUID: b31ec6f153fa4092a4f43b172a883189-20190304 X-UUID: b31ec6f153fa4092a4f43b172a883189-20190304 Received: from mtkcas68.mediatek.inc [(172.29.94.19)] by mailgw02.mediatek.com (envelope-from ) (musrelay.mediatek.com ESMTP with TLS) with ESMTP id 356336306; Mon, 04 Mar 2019 22:47:53 -0800 Received: from mtkmbs03n2.mediatek.inc (172.21.101.182) by MTKMBS62N2.mediatek.inc (172.29.193.42) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Mon, 4 Mar 2019 22:47:51 -0800 Received: from mtkcas08.mediatek.inc (172.21.101.126) by mtkmbs03n2.mediatek.inc (172.21.101.182) with Microsoft SMTP Server (TLS) id 15.0.1395.4; Tue, 5 Mar 2019 14:47:49 +0800 Received: from [172.21.77.4] (172.21.77.4) by mtkcas08.mediatek.inc (172.21.101.73) with Microsoft SMTP Server id 15.0.1395.4 via Frontend Transport; Tue, 5 Mar 2019 14:47:49 +0800 Message-ID: <1551768469.22671.5.camel@mtksdaap41> Subject: Re: [PATCH v5 7/9] clk: mediatek: Add configurable pcw_chg_reg to mtk_pll_data From: James Liao To: Weiyi Lu Date: Tue, 5 Mar 2019 14:47:49 +0800 In-Reply-To: <20190305050546.23431-9-weiyi.lu@mediatek.com> References: <20190305050546.23431-1-weiyi.lu@mediatek.com> <20190305050546.23431-9-weiyi.lu@mediatek.com> X-Mailer: Evolution 3.10.4-0ubuntu2 MIME-Version: 1.0 X-TM-SNTS-SMTP: BB7437BE7D6C11E8DD1012AC98EC689955FF0A46FF12DEF0BA8447C8CF79784D2000:8 X-MTK: N X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20190304_224758_451858_8A153A34 X-CRM114-Status: GOOD ( 15.21 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Rob Herring , Nicolas Boichat , srv_heupstream@mediatek.com, Stephen Boyd , linux-kernel@vger.kernel.org, stable@vger.kernel.org, Fan Chen , linux-mediatek@lists.infradead.org, Matthias Brugger , linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+infradead-linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Tue, 2019-03-05 at 13:05 +0800, Weiyi Lu wrote: > In previous MediaTek PLL design, it assumes the pcw change control > is always on the CON1 register. > However, the pcw change bit on MT8183 was moved onto CON0 because > the the PCW length of audio PLLs are extended to 32-bit. > Add configurable pcw_chg_reg to set the pcw change control register > address or using the default control register CON1 if without > setting in pll data. > > Signed-off-by: Weiyi Lu Reviewed-by: James Liao > --- > drivers/clk/mediatek/clk-mtk.h | 1 + > drivers/clk/mediatek/clk-pll.c | 17 +++++++++++------ > 2 files changed, 12 insertions(+), 6 deletions(-) > > diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h > index 928905496c4b..37ae944548e9 100644 > --- a/drivers/clk/mediatek/clk-mtk.h > +++ b/drivers/clk/mediatek/clk-mtk.h > @@ -221,6 +221,7 @@ struct mtk_pll_data { > int pcwibits; > uint32_t pcw_reg; > int pcw_shift; > + uint32_t pcw_chg_reg; > const struct mtk_pll_div_table *div_table; > const char *parent_name; > }; > diff --git a/drivers/clk/mediatek/clk-pll.c b/drivers/clk/mediatek/clk-pll.c > index 67aaa3082d9b..65cee1d6c400 100644 > --- a/drivers/clk/mediatek/clk-pll.c > +++ b/drivers/clk/mediatek/clk-pll.c > @@ -27,7 +27,7 @@ > #define CON0_BASE_EN BIT(0) > #define CON0_PWR_ON BIT(0) > #define CON0_ISO_EN BIT(1) > -#define CON0_PCW_CHG BIT(31) > +#define PCW_CHG_MASK BIT(31) > > #define AUDPLL_TUNER_EN BIT(31) > > @@ -51,6 +51,7 @@ struct mtk_clk_pll { > void __iomem *tuner_addr; > void __iomem *tuner_en_addr; > void __iomem *pcw_addr; > + void __iomem *pcw_chg_addr; > const struct mtk_pll_data *data; > }; > > @@ -122,7 +123,7 @@ static void __mtk_pll_tuner_disable(struct mtk_clk_pll *pll) > static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, > int postdiv) > { > - u32 con1, val; > + u32 chg, val; > int pll_en; > > pll_en = readl(pll->base_addr + REG_CON0) & CON0_BASE_EN; > @@ -147,14 +148,14 @@ static void mtk_pll_set_rate_regs(struct mtk_clk_pll *pll, u32 pcw, > val |= pcw << pll->data->pcw_shift; > writel(val, pll->pcw_addr); > > - con1 = readl(pll->base_addr + REG_CON1); > + chg = readl(pll->pcw_chg_addr); > > if (pll_en) > - con1 |= CON0_PCW_CHG; > + chg |= PCW_CHG_MASK; > > - writel(con1, pll->base_addr + REG_CON1); > + writel(chg, pll->pcw_chg_addr); > if (pll->tuner_addr) > - writel(con1 + 1, pll->tuner_addr); > + writel(val + 1, pll->tuner_addr); > > /* restore tuner_en */ > __mtk_pll_tuner_enable(pll); > @@ -329,6 +330,10 @@ static struct clk *mtk_clk_register_pll(const struct mtk_pll_data *data, > pll->pwr_addr = base + data->pwr_reg; > pll->pd_addr = base + data->pd_reg; > pll->pcw_addr = base + data->pcw_reg; > + if (data->pcw_chg_reg) > + pll->pcw_chg_addr = base + data->pcw_chg_reg; > + else > + pll->pcw_chg_addr = pll->base_addr + REG_CON1; > if (data->tuner_reg) > pll->tuner_addr = base + data->tuner_reg; > if (data->tuner_en_reg) _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel