From nobody Sun Sep 22 04:34:24 2024 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id EAD02C433F5 for ; Thu, 19 May 2022 13:53:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S239409AbiESNxo (ORCPT ); Thu, 19 May 2022 09:53:44 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:39002 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S239314AbiESNuo (ORCPT ); Thu, 19 May 2022 09:50:44 -0400 Received: from mail-qk1-x735.google.com (mail-qk1-x735.google.com [IPv6:2607:f8b0:4864:20::735]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8EACCE27B0; Thu, 19 May 2022 06:50:24 -0700 (PDT) Received: by mail-qk1-x735.google.com with SMTP id v11so4768231qkf.1; Thu, 19 May 2022 06:50:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=8V7106cncXJIAE2fTOvUkVnCzPXvRlGPeVGDdYP0Urg=; b=lVLRYfEIntAhPN8pTkRP3yHVS1Wvy4CnFf5JBKdwx3l8qzeMcj+d5GMEZoq/mfPY2K iT6NYq7AqdLfqqyRvsv/RhbAy82WjPR4hEOq1KRfE/tLA4dt9BttZDxHNScHAlLK5w85 NLKTVgcYe5y927C9PvzdIgHB8Wb/Z7iKBmOM9QJrL5tkxmmxu2Sb/5NZPeI3c8QwyI2Q JODxgHnr0MXK0CfPzsYpdimsRynXRA+Cb8W973e0NEiBKKKa1mxaXubbfhFLjEHNlIO1 UEC8MSiAAW0HPY4mgQyh/DASn4onAb28nSx0/igmIwqoY883rP7+y0m5VeBuIKMc1S14 JR4w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=8V7106cncXJIAE2fTOvUkVnCzPXvRlGPeVGDdYP0Urg=; b=iXaY2L16JCJw+fRopfsPGAKIRBuizvzahdelslwvph94vzqkfMdYMNAyNksWcImlFx Oj44Zc5C5xFsAbcPhYfhPVBk0DVhnLIRKpy+Vh/W1Kl+qSpchO8r8T6HHltCJSh/oYc5 6B8EyWIkKHavFRTEznp4IqAnd8Bc2PylQWgPdTv0YAzwXGQOLqggG8fE+E0dnU0VUMpo 4zFXBxvD2cSer5RIcRFxx76r0VVL54OuVCTZVhQNX+rn2dsR+XeskYFiyqcWsiqlhZeG f2Swcie4xPMIh8GYL1pwS2nKX1sRx3VBNVsaynq86KMZvi4MuPgR2290Tm/tX/aNnI/E rxhg== X-Gm-Message-State: AOAM530rrKnPKvNXGG5Dhq4NehCIpGoGcowwcP09tcw6xsHZhaliuif4 Vo2zwL2b9BT+9XDv8dx+je8= X-Google-Smtp-Source: ABdhPJyER/K8IeEG7nTHno0GPuvLt9c2Lxx+kEjuTcz5s714bprXvG/OVwM8fVTvtf4ybt2dnibycA== X-Received: by 2002:a05:620a:258e:b0:680:f33c:dbcd with SMTP id x14-20020a05620a258e00b00680f33cdbcdmr3197345qko.542.1652968194312; Thu, 19 May 2022 06:49:54 -0700 (PDT) Received: from localhost.localdomain ([217.138.206.82]) by smtp.gmail.com with ESMTPSA id i186-20020a3754c3000000b0069fc13ce23dsm1315024qkb.110.2022.05.19.06.49.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 May 2022 06:49:54 -0700 (PDT) From: Yassine Oudjana X-Google-Original-From: Yassine Oudjana To: Michael Turquette , Stephen Boyd , Matthias Brugger , Philipp Zabel Cc: Yassine Oudjana , Chen-Yu Tsai , Miles Chen , AngeloGioacchino Del Regno , Chun-Jie Chen , =?UTF-8?q?Jos=C3=A9=20Exp=C3=B3sito?= , Rex-BC Chen , Yassine Oudjana , linux-mediatek@lists.infradead.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, ~postmarketos/upstreaming@lists.sr.ht Subject: [PATCH 5/6] clk: mediatek: Unregister reset controller on simple remove Date: Thu, 19 May 2022 17:47:27 +0400 Message-Id: <20220519134728.456643-6-y.oudjana@protonmail.com> X-Mailer: git-send-email 2.36.1 In-Reply-To: <20220519134728.456643-1-y.oudjana@protonmail.com> References: <20220519134728.456643-1-y.oudjana@protonmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Yassine Oudjana Store clk_data and rst_data pointers in a new wrapper struct, set it as platform driver data, then use it in mtk_clk_simple_remove to unregister the reset controller. Signed-off-by: Yassine Oudjana --- Dependencies: - clk: mediatek: Move to struct clk_hw provider APIs (series) https://patchwork.kernel.org/project/linux-mediatek/cover/20220510104804.= 544597-1-wenst@chromium.org/=20 - Cleanup MediaTek clk reset drivers and support MT8192/MT8195 (series) https://patchwork.kernel.org/project/linux-mediatek/cover/20220503093856.= 22250-1-rex-bc.chen@mediatek.com/ - Export required symbols to compile clk drivers as module (single patch) https://patchwork.kernel.org/project/linux-mediatek/patch/20220518111652.= 223727-7-angelogioacchino.delregno@collabora.com/ drivers/clk/mediatek/clk-mtk.c | 47 +++++++++++++++++++++------------- drivers/clk/mediatek/clk-mtk.h | 5 ++++ 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/drivers/clk/mediatek/clk-mtk.c b/drivers/clk/mediatek/clk-mtk.c index 1b5591733e2b..3382802663f4 100644 --- a/drivers/clk/mediatek/clk-mtk.c +++ b/drivers/clk/mediatek/clk-mtk.c @@ -422,35 +422,41 @@ void mtk_clk_unregister_dividers(const struct mtk_clk= _divider *mcds, int num, int mtk_clk_simple_probe(struct platform_device *pdev) { const struct mtk_clk_desc *mcd; - struct clk_hw_onecell_data *clk_data; + struct mtk_simple_clk_controller *clk_ctrl; struct device_node *node =3D pdev->dev.of_node; - struct mtk_clk_rst_data *rst_data; int r; =20 mcd =3D of_device_get_match_data(&pdev->dev); if (!mcd) return -EINVAL; =20 - clk_data =3D mtk_alloc_clk_data(mcd->num_clks); - if (!clk_data) + clk_ctrl =3D kzalloc(sizeof(*clk_ctrl), GFP_KERNEL); + if (!clk_ctrl) return -ENOMEM; =20 + clk_ctrl->clk_data =3D mtk_alloc_clk_data(mcd->num_clks); + if (!clk_ctrl->clk_data) { + r =3D -ENOMEM; + goto free_clk_ctrl; + } + r =3D mtk_clk_register_gates_with_dev(node, mcd->clks, mcd->num_clks, - clk_data, &pdev->dev); + clk_ctrl->clk_data, &pdev->dev); if (r) - goto free_data; + goto free_clk_data; =20 - r =3D of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); + r =3D of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_ctrl->clk_d= ata); if (r) goto unregister_clks; =20 - platform_set_drvdata(pdev, clk_data); + platform_set_drvdata(pdev, clk_ctrl); =20 if (mcd->rst_desc) { - rst_data =3D mtk_register_reset_controller_with_dev(&pdev->dev, - mcd->rst_desc); - if (IS_ERR(rst_data)) { - r =3D PTR_ERR(rst_data); + clk_ctrl->rst_data =3D + mtk_register_reset_controller_with_dev(&pdev->dev, + mcd->rst_desc); + if (IS_ERR(clk_ctrl->rst_data)) { + r =3D PTR_ERR(clk_ctrl->rst_data); goto unregister_clks; } } @@ -458,9 +464,11 @@ int mtk_clk_simple_probe(struct platform_device *pdev) return r; =20 unregister_clks: - mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data); -free_data: - mtk_free_clk_data(clk_data); + mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_ctrl->clk_data); +free_clk_data: + mtk_free_clk_data(clk_ctrl->clk_data); +free_clk_ctrl: + kfree(clk_ctrl); return r; } EXPORT_SYMBOL_GPL(mtk_clk_simple_probe); @@ -468,12 +476,15 @@ EXPORT_SYMBOL_GPL(mtk_clk_simple_probe); int mtk_clk_simple_remove(struct platform_device *pdev) { const struct mtk_clk_desc *mcd =3D of_device_get_match_data(&pdev->dev); - struct clk_hw_onecell_data *clk_data =3D platform_get_drvdata(pdev); + struct mtk_simple_clk_controller *clk_ctrl =3D platform_get_drvdata(pdev); struct device_node *node =3D pdev->dev.of_node; =20 of_clk_del_provider(node); - mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_data); - mtk_free_clk_data(clk_data); + if (clk_ctrl->rst_data) + mtk_unregister_reset_controller(clk_ctrl->rst_data); + mtk_clk_unregister_gates(mcd->clks, mcd->num_clks, clk_ctrl->clk_data); + mtk_free_clk_data(clk_ctrl->clk_data); + kfree(clk_ctrl); =20 return 0; } diff --git a/drivers/clk/mediatek/clk-mtk.h b/drivers/clk/mediatek/clk-mtk.h index 1b95c484d5aa..fa092bca97c8 100644 --- a/drivers/clk/mediatek/clk-mtk.h +++ b/drivers/clk/mediatek/clk-mtk.h @@ -189,6 +189,11 @@ void mtk_free_clk_data(struct clk_hw_onecell_data *clk= _data); struct clk_hw *mtk_clk_register_ref2usb_tx(const char *name, const char *parent_name, void __iomem *reg); =20 +struct mtk_simple_clk_controller { + struct clk_hw_onecell_data *clk_data; + struct mtk_clk_rst_data *rst_data; +}; + struct mtk_clk_desc { const struct mtk_gate *clks; size_t num_clks; --=20 2.36.1