From patchwork Fri Jan 13 11:06:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: AngeloGioacchino Del Regno X-Patchwork-Id: 43201 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4e01:0:0:0:0:0 with SMTP id p1csp217793wrt; Fri, 13 Jan 2023 03:35:08 -0800 (PST) X-Google-Smtp-Source: AMrXdXsZqIbhVE+tqv3IVNu7MP/zWzOMMsi+jiDaQVGqW55WdxcOY4rfnrZnoyHTeznYrzHDf9W3 X-Received: by 2002:a05:6402:548f:b0:49b:57f6:d9a with SMTP id fg15-20020a056402548f00b0049b57f60d9amr6417713edb.21.1673609708757; Fri, 13 Jan 2023 03:35:08 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673609708; cv=none; d=google.com; s=arc-20160816; b=J+WG/6AklUb7MWsqZjk0tJDZjioolYs4Kw/KJg4ydvUs1V4w2cPR9fLuhSKn0STpd5 NqzMtQ0fBrXKtM0GK+jhxj8DDcWL9es/mzFbzRD0HQZNasObNbZ4WG4rmBopdYAE/TuE Rik1JTENX/wbLNCmn4sra0xEznb/bJT+B0vG6RYl3OQQQTWUJ8Q/RD+OkD4Dvt/Mfu90 kN7NBmNWDL7fdZEgaZk2MNamMgEPgzgM8DJF68+/skSjW4cdoIv6DoEGjl8tCUzzi2SD ldSzv1u2LoyjIAOywrTnOZWVU3XhBQP04sZbkxCO9lInVpVR376Rg2Liy0bmsiCdj5Nm VbLw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=2wj1NDUspl/lh2JxWp557VpNe2372Bl+Z4h8QvWuScg=; b=ulTwskDDAMFkf2E3DfZ8MBwYC6t5XPbipMHSbJT6x95AkN8+ivUA7eU7xsEdx0uSe9 M/l/SrVJL3N8G+qCYMmo+bpLGzWTZFUoi9IKQFAPqwjUN/7K88AG3dkj9azWZA5Mzzam VOm26+Pjjuk/7/lfXfB7cB+wsA6H5lxar7gC3F4nptl6CY6f7ShcIK/sC3pvxvLVLn90 wseT3iACIeMX91F8eb1ELMas097IRYpraOn7xAqsMBA0B2z+j2wWyu6KJDPP1h6VSpvx pGzVaKbcBGvXBW527JjbiUnNbnvhs93NF1Er4VUjwDK2BMwGgo7XkAWW5Xs2NZMqwX13 5tng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=H7zwtXKi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b8-20020a056402278800b0046c3b3aa791si24624314ede.477.2023.01.13.03.34.44; Fri, 13 Jan 2023 03:35:08 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=H7zwtXKi; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241126AbjAMLdv (ORCPT + 99 others); Fri, 13 Jan 2023 06:33:51 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52040 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S241146AbjAMLc6 (ORCPT ); Fri, 13 Jan 2023 06:32:58 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [IPv6:2a00:1098:0:82:1000:25:2eeb:e5ab]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63A844882B; Fri, 13 Jan 2023 03:07:25 -0800 (PST) Received: from IcarusMOD.eternityproject.eu (2-237-20-237.ip236.fastwebnet.it [2.237.20.237]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kholk11) by madras.collabora.co.uk (Postfix) with ESMTPSA id E37CE6602DD7; Fri, 13 Jan 2023 11:07:22 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1673608044; bh=SXiLONoRIH0CB+iFY3cC1DgibyfjwwOez/ev+oSe93E=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=H7zwtXKiSJIvYUdxmx+dqpK/XBuebU/UdSFRFj5SxaPdzjqlpfW4nJtL/WIACGLe9 WFwduJeFh7cDGLAFEJ0ODW4FhG7fM04Dlm6cWG7hSmMfvk7mwnek1QLQZxFzt3WoZL oNaNtZbBfZs54/6bh4NbPULdFVE1Q5FfJmc6mg2BzioDTithftbYPLflzvDjtQcLOl k0cpouOEC2blQWGlQ9mkc1DaeKxSFfL39+s/YFSrgdKSV/cDiDeoOrny5Q1xfTlgqw sS3+YB1wsoeda8Gb5Uezn4wyzTCmOAeXS6v/zFo4PmfD8CuESu2pJpGWMyOLhXAbPX 57HTNNYcUzENQ== From: AngeloGioacchino Del Regno To: mturquette@baylibre.com Cc: sboyd@kernel.org, matthias.bgg@gmail.com, robh+dt@kernel.org, krzysztof.kozlowski+dt@linaro.org, angelogioacchino.delregno@collabora.com, wenst@chromium.org, johnson.wang@mediatek.com, miles.chen@mediatek.com, fparent@baylibre.com, chun-jie.chen@mediatek.com, sam.shih@mediatek.com, y.oudjana@protonmail.com, nfraprado@collabora.com, rex-bc.chen@mediatek.com, ryder.lee@kernel.org, daniel@makrotopia.org, jose.exposito89@gmail.com, yangyingliang@huawei.com, pablo.sun@mediatek.com, msp@baylibre.com, weiyi.lu@mediatek.com, ikjn@chromium.org, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, devicetree@vger.kernel.org, kernel@collabora.com Subject: [PATCH v3 16/23] clk: mediatek: mt8186: Join top_adj_div and top_muxes Date: Fri, 13 Jan 2023 12:06:09 +0100 Message-Id: <20230113110616.111001-17-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.39.0 In-Reply-To: <20230113110616.111001-1-angelogioacchino.delregno@collabora.com> References: <20230113110616.111001-1-angelogioacchino.delregno@collabora.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754906974127216349?= X-GMAIL-MSGID: =?utf-8?q?1754906974127216349?= Like done for MT8192, join the two to register them in one shot, as there's no point in doing that separately from one another. Signed-off-by: AngeloGioacchino Del Regno --- drivers/clk/mediatek/clk-mt8186-topckgen.c | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8186-topckgen.c b/drivers/clk/mediatek/clk-mt8186-topckgen.c index 3ce2818dcbdd..c1107b2b614c 100644 --- a/drivers/clk/mediatek/clk-mt8186-topckgen.c +++ b/drivers/clk/mediatek/clk-mt8186-topckgen.c @@ -669,9 +669,6 @@ static struct mtk_composite top_muxes[] = { MUX(CLK_TOP_APLL_I2S4_MCK_SEL, "apll_i2s4_mck_sel", apll_mck_parents, 0x0320, 19, 1), MUX(CLK_TOP_APLL_TDMOUT_MCK_SEL, "apll_tdmout_mck_sel", apll_mck_parents, 0x0320, 20, 1), -}; - -static const struct mtk_composite top_adj_divs[] = { DIV_GATE(CLK_TOP_APLL12_CK_DIV0, "apll12_div0", "apll_i2s0_mck_sel", 0x0320, 0, 0x0328, 8, 0), DIV_GATE(CLK_TOP_APLL12_CK_DIV1, "apll12_div1", "apll_i2s1_mck_sel", @@ -749,27 +746,19 @@ static int clk_mt8186_topck_probe(struct platform_device *pdev) if (r) goto unregister_muxes; - r = mtk_clk_register_composites(&pdev->dev, top_adj_divs, - ARRAY_SIZE(top_adj_divs), base, - &mt8186_clk_lock, clk_data); - if (r) - goto unregister_composite_muxes; - r = clk_mt8186_reg_mfg_mux_notifier(&pdev->dev, clk_data->hws[CLK_TOP_MFG]->clk); if (r) - goto unregister_composite_divs; + goto unregister_composite_muxes; r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); if (r) - goto unregister_composite_divs; + goto unregister_composite_muxes; platform_set_drvdata(pdev, clk_data); return r; -unregister_composite_divs: - mtk_clk_unregister_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), clk_data); unregister_composite_muxes: mtk_clk_unregister_composites(top_muxes, ARRAY_SIZE(top_muxes), clk_data); unregister_muxes: @@ -789,7 +778,6 @@ static int clk_mt8186_topck_remove(struct platform_device *pdev) struct device_node *node = pdev->dev.of_node; of_clk_del_provider(node); - mtk_clk_unregister_composites(top_adj_divs, ARRAY_SIZE(top_adj_divs), clk_data); mtk_clk_unregister_composites(top_muxes, ARRAY_SIZE(top_muxes), clk_data); mtk_clk_unregister_muxes(top_mtk_muxes, ARRAY_SIZE(top_mtk_muxes), clk_data); mtk_clk_unregister_factors(top_divs, ARRAY_SIZE(top_divs), clk_data);