From patchwork Mon Feb 6 15:29:15 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: 53374 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2299943wrn; Mon, 6 Feb 2023 07:33:47 -0800 (PST) X-Google-Smtp-Source: AK7set+NODRIkjNxMQCXjdKOYpPqt4doC+aBzyVcTzPHi/K+U/8AbyAdcI+Q7NNW1DLKiK5txuag X-Received: by 2002:a05:6a20:42a8:b0:be:c5de:7157 with SMTP id o40-20020a056a2042a800b000bec5de7157mr24830823pzj.53.1675697627258; Mon, 06 Feb 2023 07:33:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675697627; cv=none; d=google.com; s=arc-20160816; b=rIwsg4KuMJUBRpt9nUoYqIrV8juOGKScRQ2Y8O3MYITUuadpv+FfPfQpSNw8gXe5Lo l3jJHvkGhaOmmwh70owvPC51nExRaNXa3eu7MRp990kbrDf7aoPL5/2LGv3XqIjW81ZZ XVJrDtRN0gAiiR5QP4xr8DIMbhChZXE1Y6jdFTkf+FLNr/gcllN7OfxKKdkkMP9g/cQ8 USqaC9EST+7zPwDzgRSrgH+GBeOopqbRWDkls9oD7fB2y3GmFA3ml76DKHtHz7vVhwQp PvlWBU3jSLmNDvtc5t8f3SJV3UmNlS51JtKuDIIRMNg2eDwq0icUmjNrvZ9bXJmdjxdN CVTg== 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=qfkyL35Q87avz+YthEsjK3kkTCX1OXcSswA6mNUoIxY=; b=D7wRsRuVDMAEhqTaSTzFIMfqUDtQHO/Gdzg95+s7xBAiIoLerv4JyekCETxYJWSCrz H0bz6ev3vegto1FSsbjdDHoLCh0rx5inSUV0MtbvJ4wsGoNPp8qJ4gKUs3V5opOf5DYf Lfwp4TrflhnR9SHTUMik2cGB7ybWi6Ff+E5LfTOHVGdjr4Fq8YzmPs/oM3w6vwNHq2JA OdWDI4dgS1s5U+I2QUnOxTL2QhWCFYdgLXDqrUJhj/B2rn7GH8lGGgMRpo6JLFy09sqr zZeuXq+sL6gZ2q8sOyhjMAJbiEliEZmlIT9AMB5eKDCto4fPw3mANsgNc793MwvI/qwy dLCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=CUjEfutN; 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=REJECT sp=REJECT 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 w191-20020a6382c8000000b004f1d9a1e295si11591387pgd.531.2023.02.06.07.33.34; Mon, 06 Feb 2023 07:33:47 -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=CUjEfutN; 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=REJECT sp=REJECT dis=NONE) header.from=collabora.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231608AbjBFPct (ORCPT + 99 others); Mon, 6 Feb 2023 10:32:49 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33010 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231518AbjBFPbv (ORCPT ); Mon, 6 Feb 2023 10:31:51 -0500 Received: from madras.collabora.co.uk (madras.collabora.co.uk [46.235.227.172]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A696E2A17C; Mon, 6 Feb 2023 07:30:43 -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 B147F6602F9E; Mon, 6 Feb 2023 15:30:29 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1675697430; bh=CLknQX9SFUtoj2mggvrjYiI8IwHCqlwdtblptlQ1mvs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=CUjEfutNPBNJn9kp6rdEDbgiQYmiYBqtDmuDrDsSbER2UHXD4DjTY6UA/qS+ogsLS BH1601JSCas/+bNHskg/PU/Rodue62Ipgnw5O0V+111foZKtLmY5xnQ5OMolc/pKvG FDSDIxVgXuGYfT3qQwN9laouzgxXRo2WQ+UjaJjSfCAoJU7eXWwn0AXk8WxpviIEy2 VyQB1N4pSvGFMdfw63Qafe5TzAmwzY0RgvOJzdXVpEe1CFG+CVWwkoueQomnnAeKFl 9mYvxaoMgUYx+FV+NDMB1fXCRv71/6wVkSxkvrOzfqttl07Uud/caN2UUa90sZjB2g B+UtZ4pQyxuNg== From: AngeloGioacchino Del Regno To: mturquette@baylibre.com Cc: sboyd@kernel.org, matthias.bgg@gmail.com, angelogioacchino.delregno@collabora.com, wenst@chromium.org, johnson.wang@mediatek.com, miles.chen@mediatek.com, chun-jie.chen@mediatek.com, daniel@makrotopia.org, fparent@baylibre.com, msp@baylibre.com, nfraprado@collabora.com, rex-bc.chen@mediatek.com, zhaojh329@gmail.com, sam.shih@mediatek.com, edward-jw.yang@mediatek.com, yangyingliang@huawei.com, granquet@baylibre.com, pablo.sun@mediatek.com, sean.wang@mediatek.com, chen.zhong@mediatek.com, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org Subject: [PATCH v1 32/45] clk: mediatek: mt8186-mcu: Migrate to common probe mechanism Date: Mon, 6 Feb 2023 16:29:15 +0100 Message-Id: <20230206152928.918562-33-angelogioacchino.delregno@collabora.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230206152928.918562-1-angelogioacchino.delregno@collabora.com> References: <20230206152928.918562-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?1757096315302632234?= X-GMAIL-MSGID: =?utf-8?q?1757096315302632234?= Convert MT8186 MCUSYS clocks to the common mtk_clk_simple_probe(). Signed-off-by: AngeloGioacchino Del Regno --- drivers/clk/mediatek/clk-mt8186-mcu.c | 68 +++++---------------------- 1 file changed, 13 insertions(+), 55 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt8186-mcu.c b/drivers/clk/mediatek/clk-mt8186-mcu.c index e52a2d986c99..895856df95df 100644 --- a/drivers/clk/mediatek/clk-mt8186-mcu.c +++ b/drivers/clk/mediatek/clk-mt8186-mcu.c @@ -43,67 +43,25 @@ static struct mtk_composite mcu_muxes[] = { MUX(CLK_MCU_ARMPLL_BUS_SEL, "mcu_armpll_bus_sel", mcu_armpll_bus_parents, 0x2E0, 9, 2), }; -static const struct of_device_id of_match_clk_mt8186_mcu[] = { - { .compatible = "mediatek,mt8186-mcusys", }, - {} +static const struct mtk_clk_desc mcu_desc = { + .composite_clks = mcu_muxes, + .num_composite_clks = ARRAY_SIZE(mcu_muxes), }; -static int clk_mt8186_mcu_probe(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data; - struct device_node *node = pdev->dev.of_node; - int r; - void __iomem *base; - - clk_data = mtk_alloc_clk_data(CLK_MCU_NR_CLK); - if (!clk_data) - return -ENOMEM; - - base = devm_platform_ioremap_resource(pdev, 0); - if (IS_ERR(base)) { - r = PTR_ERR(base); - goto free_mcu_data; - } - - r = mtk_clk_register_composites(&pdev->dev, mcu_muxes, - ARRAY_SIZE(mcu_muxes), base, - NULL, clk_data); - if (r) - goto free_mcu_data; - - r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (r) - goto unregister_composite_muxes; - - platform_set_drvdata(pdev, clk_data); - - return r; - -unregister_composite_muxes: - mtk_clk_unregister_composites(mcu_muxes, ARRAY_SIZE(mcu_muxes), clk_data); -free_mcu_data: - mtk_free_clk_data(clk_data); - return r; -} - -static int clk_mt8186_mcu_remove(struct platform_device *pdev) -{ - struct clk_hw_onecell_data *clk_data = platform_get_drvdata(pdev); - struct device_node *node = pdev->dev.of_node; - - of_clk_del_provider(node); - mtk_clk_unregister_composites(mcu_muxes, ARRAY_SIZE(mcu_muxes), clk_data); - mtk_free_clk_data(clk_data); - - return 0; -} +static const struct of_device_id of_match_clk_mt8186_mcu[] = { + { .compatible = "mediatek,mt8186-mcusys", .data = &mcu_desc }, + { /* sentinel */} +}; static struct platform_driver clk_mt8186_mcu_drv = { - .probe = clk_mt8186_mcu_probe, - .remove = clk_mt8186_mcu_remove, .driver = { .name = "clk-mt8186-mcu", .of_match_table = of_match_clk_mt8186_mcu, }, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, }; -builtin_platform_driver(clk_mt8186_mcu_drv); +module_platform_driver(clk_mt8186_mcu_drv); + +MODULE_DESCRIPTION("MediaTek MT8186 mcusys clocks driver"); +MODULE_LICENSE("GPL");