From patchwork Mon Feb 6 15:29:13 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: 53371 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp2299852wrn; Mon, 6 Feb 2023 07:33:35 -0800 (PST) X-Google-Smtp-Source: AK7set8gGfLD17M+c+kNiGAOHJURX2ctOo7uQdFaONGmWWMd2pb0eMf4/2qjUCgfLqJLZqqw7F5J X-Received: by 2002:a17:902:f2d2:b0:198:f048:5171 with SMTP id h18-20020a170902f2d200b00198f0485171mr7425981plc.35.1675697615198; Mon, 06 Feb 2023 07:33:35 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675697615; cv=none; d=google.com; s=arc-20160816; b=LLiY9bOAMjg+icv3uE/QKMsxEf/vlPv/cZzwgZikCBeN0rtaqjFqt8BD9tXcJGLDDH +H8BOWnbQOTNIau2npk7N45YTzn/UIF7r2V0AqH36pM5JtJElyUOpjNSYi6Z8hppkzm6 WB+0z/ONt4ItM0u/fL5eqCqnyhGmRB4G7t1VFWcOqU2lKuhOjRQKJcS34l7/0xgLng+a dqOWPYIb21pNmd9hE4kCntU1ihpoxU1yllt3KEYz26YV58RuOHjEZyZFqHkfkZBW7TtW YwYb/DA19n92Ea/U5hxe1ieWWm9XHXfOVuhN+N8jwiNxSNHJlW2ZDV5jIJX8Xb48nTi5 X3xA== 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=bgLIFKkNfNp3TOo3SpUKWkR+wzQfGXVzm7NFMNpiRoY=; b=h/J8DyFfFunjCg5bTSV4jkEG5CkhTLoTvDZEivC5eCO/DeUJsgCwiPoTQy/qLEABqG 59GC2FGVobNPQgY9IO1UcEF5JDqNY9njBXVNJjIHi48xLYhzoCgVOW7UUrKYr1zN01ZN SkGbGqgVmWehtY4mj2ASfvznmaAWrmAHWDZ/Pwzs6d3e/hXHkH5TIlLMBpyt9R78rhdg H0eVIIz1e2eOBX6jkHC7RCDAfVX6pPGGtvWi32dsU77ePMZffUDFI9epXfAxPe/hoP85 UnGSY/7ukEVlXb7qILXwAT7SSanrblskQTn2aJSWu6p/uleyy/IOTDs30xuFM67LWTKZ p3IA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@collabora.com header.s=mail header.b=BXnUV9xS; 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 s9-20020a63b409000000b004e73c30e3fbsi11269147pgf.571.2023.02.06.07.33.22; Mon, 06 Feb 2023 07:33:35 -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=BXnUV9xS; 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 S231394AbjBFPc2 (ORCPT + 99 others); Mon, 6 Feb 2023 10:32:28 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60530 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231272AbjBFPbi (ORCPT ); Mon, 6 Feb 2023 10:31:38 -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 080A32A152; Mon, 6 Feb 2023 07:30:32 -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 F1BA46602D99; Mon, 6 Feb 2023 15:30:26 +0000 (GMT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1675697428; bh=oAASzuVx1byGrCnmh1/Av/9a8x6FoBwlTi2SX3re7kQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BXnUV9xS5c1Q8UXi8i55B63R/ievJdLHe9Nn3HLG3MHStPItRZg12ymjV/S3s+Q7E q2qNRxLE9DIBehzNi5AlBio3tEjM9PsYMNfAavjv7qiXrI6Uemt/MAh4oBEYQWWolZ jLttiaSPuK1W5SdK9IRBgPJKW8CjRqzXJ1Qyq56RQU4RpDdmrJPR2ekd+mvRk3eBxU 3yi+jyKLV3qmTNJE0dL+jnMjgzs6V6LxU56FzDsQUNao7okrWe2VQlezKJTCnqjZyP hgGU9mBkNKHZ/TMXgF4GY4g25L4hVPewyhrTUeE6XP4dUP460GPd1Y5hO0BAsFrUie J7Xvs0y3l8sVA== 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 30/45] clk: mediatek: mt7986-infracfg: Migrate to common probe mechanism Date: Mon, 6 Feb 2023 16:29:13 +0100 Message-Id: <20230206152928.918562-31-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?1757096302294060307?= X-GMAIL-MSGID: =?utf-8?q?1757096302294060307?= Convert this driver to use the common mtk_clk_simple_probe() mechanism. While at it, also use module_platform_driver() instead, as this driver just gained a .remove() callback during the conversion. Signed-off-by: AngeloGioacchino Del Regno --- drivers/clk/mediatek/clk-mt7986-infracfg.c | 61 ++++++---------------- 1 file changed, 17 insertions(+), 44 deletions(-) diff --git a/drivers/clk/mediatek/clk-mt7986-infracfg.c b/drivers/clk/mediatek/clk-mt7986-infracfg.c index 7a75cc85769d..ae05bdc2bd20 100644 --- a/drivers/clk/mediatek/clk-mt7986-infracfg.c +++ b/drivers/clk/mediatek/clk-mt7986-infracfg.c @@ -160,57 +160,30 @@ static const struct mtk_gate infra_clks[] = { GATE_INFRA2(CLK_INFRA_IPCIEB_CK, "infra_ipcieb", "sysaxi_sel", 15), }; -static int clk_mt7986_infracfg_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; - int nr = ARRAY_SIZE(infra_divs) + ARRAY_SIZE(infra_muxes) + - ARRAY_SIZE(infra_clks); - - base = of_iomap(node, 0); - if (!base) { - pr_err("%s(): ioremap failed\n", __func__); - return -ENOMEM; - } - - clk_data = mtk_alloc_clk_data(nr); - - if (!clk_data) - return -ENOMEM; - - mtk_clk_register_factors(infra_divs, ARRAY_SIZE(infra_divs), clk_data); - mtk_clk_register_muxes(&pdev->dev, infra_muxes, - ARRAY_SIZE(infra_muxes), node, - &mt7986_clk_lock, clk_data); - mtk_clk_register_gates(&pdev->dev, node, infra_clks, - ARRAY_SIZE(infra_clks), clk_data); - - r = of_clk_add_hw_provider(node, of_clk_hw_onecell_get, clk_data); - if (r) { - pr_err("%s(): could not register clock provider: %d\n", - __func__, r); - goto free_infracfg_data; - } - return r; - -free_infracfg_data: - mtk_free_clk_data(clk_data); - return r; - -} +static const struct mtk_clk_desc infra_desc = { + .clks = infra_clks, + .num_clks = ARRAY_SIZE(infra_clks), + .factor_clks = infra_divs, + .num_factor_clks = ARRAY_SIZE(infra_divs), + .mux_clks = infra_muxes, + .num_mux_clks = ARRAY_SIZE(infra_muxes), + .clk_lock = &mt7986_clk_lock, +}; static const struct of_device_id of_match_clk_mt7986_infracfg[] = { - { .compatible = "mediatek,mt7986-infracfg", }, - {} + { .compatible = "mediatek,mt7986-infracfg", .data = &infra_desc }, + { /* sentinel */ } }; static struct platform_driver clk_mt7986_infracfg_drv = { - .probe = clk_mt7986_infracfg_probe, .driver = { .name = "clk-mt7986-infracfg", .of_match_table = of_match_clk_mt7986_infracfg, }, + .probe = mtk_clk_simple_probe, + .remove = mtk_clk_simple_remove, }; -builtin_platform_driver(clk_mt7986_infracfg_drv); +module_platform_driver(clk_mt7986_infracfg_drv); + +MODULE_DESCRIPTION("MediaTek MT7986 infracfg clocks driver"); +MODULE_LICENSE("GPL");