From patchwork Mon Apr 10 11:07:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 81483 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp1834220vqo; Mon, 10 Apr 2023 04:42:25 -0700 (PDT) X-Google-Smtp-Source: AKy350blbZZEhYy+nvKyYEXXqxFBjV7sCKSF0b0dhflLCeGrGDQXY9pcq1cehjz2fHmHFY5ZrFEw X-Received: by 2002:a05:6402:12cd:b0:501:cced:9c6c with SMTP id k13-20020a05640212cd00b00501cced9c6cmr5340831edx.7.1681126944791; Mon, 10 Apr 2023 04:42:24 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1681126944; cv=none; d=google.com; s=arc-20160816; b=xHPkAd5Iop2kTkosEjfVTqD3Z1jL+omCKSmXoG7cKeEPb8yB3KdT/yQq1W5GSAAeEE FQ+PR/jQntzvyI0kC/QVDyzqOpDCChq3wQ05CGJpsU1vOYd/6p2dfVu84HM9eWrzafMs hFXXVATfQV0zWdXkf3YBDiGP239ezA7bHjWHJBI8dZlhWeN3vpjvizR9h9NCMfflSeZ3 ++ei1e4AnmOXcuiyOCIynjHsNs1TQrPcdEIXsqtSpAZg/Nq7eITkIaCZKZmsC7rQk85m 0gJJN2Ry4Nq7d6zQNnP01qzWiKuGtiKV8pYYjXeAGVhLcI9b4t24sjf5E3d5z43vNvu2 3sgA== 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=hOql+bAuTzb4sNeAYIK71k2lMY+HYwNHUIwpssNISEY=; b=HHesSmwWUvVklSGEgK+9cuTNnoGaq9wLwktjpSgMzz90PYjv2+7e5rIp7jEx4CYbQf WWtnRYNYreAkFoqEEcsOvAU7zmVGJjcp3aRQVomMAKwbK90LWAiyJs9YniocRV2qzHjY 6nrSbCU9/fdAKdpKtM89pTfy5lW/53WDl9jVDe9YdLApuT1AorzrptbK1jCR7NtJQqyn 3X9fmVtZuJyGQBpgIiZ/kCJ1q23p3/FwaCxJv7JsR6zS79VTJie6+9xNHvyup0H0c0LD FGmAbPuldR+cYQ6j2VnqAtrEbynCFWAZod9PdNgtcdz5KFwPw4uq6e9x2gigbXgQ33NB Knmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=LIJvdbqR; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id w22-20020aa7da56000000b00504a2e5d950si1923570eds.90.2023.04.10.04.42.00; Mon, 10 Apr 2023 04:42:24 -0700 (PDT) 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=@gmail.com header.s=20210112 header.b=LIJvdbqR; 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=QUARANTINE dis=NONE) header.from=gmail.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229812AbjDJLJ1 (ORCPT + 99 others); Mon, 10 Apr 2023 07:09:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229727AbjDJLJZ (ORCPT ); Mon, 10 Apr 2023 07:09:25 -0400 Received: from mail-pj1-x102e.google.com (mail-pj1-x102e.google.com [IPv6:2607:f8b0:4864:20::102e]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 59B4DE6F; Mon, 10 Apr 2023 04:09:03 -0700 (PDT) Received: by mail-pj1-x102e.google.com with SMTP id h24-20020a17090a9c1800b002404be7920aso4036664pjp.5; Mon, 10 Apr 2023 04:09:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1681124942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=hOql+bAuTzb4sNeAYIK71k2lMY+HYwNHUIwpssNISEY=; b=LIJvdbqRE/Z8QTufS+xs6GERTZy2dopVF8Z8woK9L7lhbNTknTxq8V/fW1Y/AwgeGl CtnySdYBQEQTVawIxEy/9RIYwMCh7ubWT/RpudZG2QD60efTn44hJmXeKqKwf1GRdwGF JNJO1uMljxZSyZh6PksPb4P5No/xH2FlmjYaHYR0VWMBzCg4ZET1w3s8Jz0f/O75Zkoa z26zAUdlEPfQFuKEyHp5a8SPOjKxSUzi+qiiHukkauL/mfMsPpxzkONJYlmRiMjcabk9 saG5UtDeKyI9lc9zxO4QozYrH5uGBu8bIYbI+P1Ii6cJJiA2BBLa2L5VJop/JtPMOv6B dZqw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1681124942; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hOql+bAuTzb4sNeAYIK71k2lMY+HYwNHUIwpssNISEY=; b=blLNToktEDXb1c39Uj1tHMahZVtIS4yKOG2t9y+5QcPmSoA9nOkuW0iPY6jI9u9Fix bI/YuXzEH3DKvIGJNssn+wvHqLf9ALzVTqQKQPoPezjjUFuWdsLw84954rdxZ69MyviX 8ADawayvry0OpsW7oihXRQMu/23d+xdFcVFqNkVffknQIlfU34VNBhzIhFvojZ+LPsoZ j1evc9HRXpTmK3vWi1lDbpIn9zeq3a9bPvlWXvDHIOqDZwOD4nF2LHo7gpgN2dA+Lo5z 2xVl41UHVxNX9uK3aEDXvWeoUmYGaoIKBkBm6bLr4I8m+3yQN9jwHa53azKAHR761Ubf 2Hcw== X-Gm-Message-State: AAQBX9ckJt3+94ktSoyYyonzmKwP8SPLBU8ABYP6lOOEru4ol4A5pBn/ KVvCVq4L6kU54lLdGvuJjJHABfwDnDM5TvLD5mg= X-Received: by 2002:a17:903:8cf:b0:1a5:167f:620f with SMTP id lk15-20020a17090308cf00b001a5167f620fmr8065493plb.15.1681124942145; Mon, 10 Apr 2023 04:09:02 -0700 (PDT) Received: from d.home.yangfl.dn42 ([104.28.213.201]) by smtp.gmail.com with ESMTPSA id r5-20020a170902be0500b001a076568da9sm7464728pls.216.2023.04.10.04.08.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 10 Apr 2023 04:09:01 -0700 (PDT) From: David Yang To: linux-clk@vger.kernel.org Cc: David Yang , Michael Turquette , Stephen Boyd , linux-kernel@vger.kernel.org Subject: [PATCH v3 06/14] clk: hisilicon: hi3519: Use helper functions Date: Mon, 10 Apr 2023 19:07:18 +0800 Message-Id: <20230410110733.192151-7-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230410110733.192151-1-mmyangfl@gmail.com> References: <20230410110733.192151-1-mmyangfl@gmail.com> MIME-Version: 1.0 X-Spam-Status: No, score=-0.2 required=5.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS autolearn=unavailable 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?1762789367437133595?= X-GMAIL-MSGID: =?utf-8?q?1762789367437133595?= Use common helper functions and register clks with a single of_device_id data. Signed-off-by: David Yang --- drivers/clk/hisilicon/clk-hi3519.c | 128 ++++------------------------- 1 file changed, 15 insertions(+), 113 deletions(-) diff --git a/drivers/clk/hisilicon/clk-hi3519.c b/drivers/clk/hisilicon/clk-hi3519.c index ad0c7f350cf0..eac66bde1361 100644 --- a/drivers/clk/hisilicon/clk-hi3519.c +++ b/drivers/clk/hisilicon/clk-hi3519.c @@ -10,7 +10,7 @@ #include #include #include "clk.h" -#include "reset.h" +#include "crg.h" #define HI3519_INNER_CLK_OFFSET 64 #define HI3519_FIXED_24M 65 @@ -73,131 +73,33 @@ static const struct hisi_gate_clock hi3519_gate_clks[] = { CLK_SET_RATE_PARENT, 0xe4, 18, 0, }, }; -static struct hisi_clock_data *hi3519_clk_register(struct platform_device *pdev) -{ - struct hisi_clock_data *clk_data; - int ret; - - clk_data = hisi_clk_alloc(pdev, HI3519_NR_CLKS); - if (!clk_data) - return ERR_PTR(-ENOMEM); - - ret = hisi_clk_register_fixed_rate(hi3519_fixed_rate_clks, - ARRAY_SIZE(hi3519_fixed_rate_clks), - clk_data); - if (ret) - return ERR_PTR(ret); - - ret = hisi_clk_register_mux(hi3519_mux_clks, - ARRAY_SIZE(hi3519_mux_clks), - clk_data); - if (ret) - goto unregister_fixed_rate; - - ret = hisi_clk_register_gate(hi3519_gate_clks, - ARRAY_SIZE(hi3519_gate_clks), - clk_data); - if (ret) - goto unregister_mux; - - ret = of_clk_add_provider(pdev->dev.of_node, - of_clk_src_onecell_get, &clk_data->clk_data); - if (ret) - goto unregister_gate; - - return clk_data; - -unregister_fixed_rate: - hisi_clk_unregister_fixed_rate(hi3519_fixed_rate_clks, - ARRAY_SIZE(hi3519_fixed_rate_clks), - clk_data); - -unregister_mux: - hisi_clk_unregister_mux(hi3519_mux_clks, - ARRAY_SIZE(hi3519_mux_clks), - clk_data); -unregister_gate: - hisi_clk_unregister_gate(hi3519_gate_clks, - ARRAY_SIZE(hi3519_gate_clks), - clk_data); - return ERR_PTR(ret); -} - -static void hi3519_clk_unregister(struct platform_device *pdev) -{ - struct hi3519_crg_data *crg = platform_get_drvdata(pdev); - - of_clk_del_provider(pdev->dev.of_node); - - hisi_clk_unregister_gate(hi3519_gate_clks, - ARRAY_SIZE(hi3519_mux_clks), - crg->clk_data); - hisi_clk_unregister_mux(hi3519_mux_clks, - ARRAY_SIZE(hi3519_mux_clks), - crg->clk_data); - hisi_clk_unregister_fixed_rate(hi3519_fixed_rate_clks, - ARRAY_SIZE(hi3519_fixed_rate_clks), - crg->clk_data); -} - -static int hi3519_clk_probe(struct platform_device *pdev) -{ - struct hi3519_crg_data *crg; - - crg = devm_kmalloc(&pdev->dev, sizeof(*crg), GFP_KERNEL); - if (!crg) - return -ENOMEM; - - crg->rstc = hisi_reset_init(pdev); - if (!crg->rstc) - return -ENOMEM; - - crg->clk_data = hi3519_clk_register(pdev); - if (IS_ERR(crg->clk_data)) { - hisi_reset_exit(crg->rstc); - return PTR_ERR(crg->clk_data); - } - - platform_set_drvdata(pdev, crg); - return 0; -} - -static int hi3519_clk_remove(struct platform_device *pdev) -{ - struct hi3519_crg_data *crg = platform_get_drvdata(pdev); - - hisi_reset_exit(crg->rstc); - hi3519_clk_unregister(pdev); - return 0; -} - +static const struct hisi_clocks hi3519_crg_clks = { + .nr = HI3519_NR_CLKS, + .fixed_rate_clks = hi3519_fixed_rate_clks, + .fixed_rate_clks_num = ARRAY_SIZE(hi3519_fixed_rate_clks), + .mux_clks = hi3519_mux_clks, + .mux_clks_num = ARRAY_SIZE(hi3519_mux_clks), + .gate_clks = hi3519_gate_clks, + .gate_clks_num = ARRAY_SIZE(hi3519_gate_clks), +}; static const struct of_device_id hi3519_clk_match_table[] = { - { .compatible = "hisilicon,hi3519-crg" }, + { .compatible = "hisilicon,hi3519-crg", + .data = &hi3519_crg_clks }, { } }; MODULE_DEVICE_TABLE(of, hi3519_clk_match_table); static struct platform_driver hi3519_clk_driver = { - .probe = hi3519_clk_probe, - .remove = hi3519_clk_remove, + .probe = hisi_crg_probe, + .remove = hisi_crg_remove, .driver = { .name = "hi3519-clk", .of_match_table = hi3519_clk_match_table, }, }; -static int __init hi3519_clk_init(void) -{ - return platform_driver_register(&hi3519_clk_driver); -} -core_initcall(hi3519_clk_init); - -static void __exit hi3519_clk_exit(void) -{ - platform_driver_unregister(&hi3519_clk_driver); -} -module_exit(hi3519_clk_exit); +module_platform_driver(hi3519_clk_driver); MODULE_LICENSE("GPL v2"); MODULE_DESCRIPTION("HiSilicon Hi3519 Clock Driver");