On 04.03.2023 08:33, David Yang wrote:
> EXTERNAL EMAIL: Do not click links or open attachments unless you know the content is safe
>
> Rename Hisilicon Hi3798CV200 to Hi3798, to be reused with other Hi3798
> series SoCs.
>
> Signed-off-by: David Yang <mmyangfl@xxxxxxxxx>
> ---
> drivers/clk/hisilicon/Kconfig | 6 +-
> drivers/clk/hisilicon/Makefile | 2 +-
> .../{crg-hi3798cv200.c => crg-hi3798.c} | 151 +++++++++---------
> 3 files changed, 80 insertions(+), 79 deletions(-)
> rename drivers/clk/hisilicon/{crg-hi3798cv200.c => crg-hi3798.c} (73%)
>
> diff --git a/drivers/clk/hisilicon/Kconfig b/drivers/clk/hisilicon/Kconfig
> index c1ec75aa4..fa2d9920f 100644
> --- a/drivers/clk/hisilicon/Kconfig
> +++ b/drivers/clk/hisilicon/Kconfig
> @@ -37,13 +37,13 @@ config COMMON_CLK_HI3670
> help
> Build the clock driver for hi3670.
>
> -config COMMON_CLK_HI3798CV200
> - tristate "Hi3798CV200 Clock Driver"
> +config COMMON_CLK_HI3798
> + tristate "Hi3798 Clock Driver"
> depends on ARCH_HISI || COMPILE_TEST
> select RESET_HISI
> default ARCH_HISI
> help
> - Build the clock driver for hi3798cv200.
> + Build the clock driver for hi3798.
>
> config COMMON_CLK_HI6220
> bool "Hi6220 Clock Driver"
> diff --git a/drivers/clk/hisilicon/Makefile b/drivers/clk/hisilicon/Makefile
> index 2978e56cb..cfef47a19 100644
> --- a/drivers/clk/hisilicon/Makefile
> +++ b/drivers/clk/hisilicon/Makefile
> @@ -13,7 +13,7 @@ obj-$(CONFIG_COMMON_CLK_HI3519) += clk-hi3519.o
> obj-$(CONFIG_COMMON_CLK_HI3559A) += clk-hi3559a.o
> obj-$(CONFIG_COMMON_CLK_HI3660) += clk-hi3660.o
> obj-$(CONFIG_COMMON_CLK_HI3670) += clk-hi3670.o
> -obj-$(CONFIG_COMMON_CLK_HI3798CV200) += crg-hi3798cv200.o
> +obj-$(CONFIG_COMMON_CLK_HI3798) += crg-hi3798.o
> obj-$(CONFIG_COMMON_CLK_HI6220) += clk-hi6220.o
> obj-$(CONFIG_RESET_HISI) += reset.o
> obj-$(CONFIG_STUB_CLK_HI6220) += clk-hi6220-stub.o
> diff --git a/drivers/clk/hisilicon/crg-hi3798cv200.c b/drivers/clk/hisilicon/crg-hi3798.c
> similarity index 73%
> rename from drivers/clk/hisilicon/crg-hi3798cv200.c
> rename to drivers/clk/hisilicon/crg-hi3798.c
> index 08a19ba77..bdce43fbe 100644
> --- a/drivers/clk/hisilicon/crg-hi3798cv200.c
> +++ b/drivers/clk/hisilicon/crg-hi3798.c
> @@ -1,6 +1,6 @@
> // SPDX-License-Identifier: GPL-2.0-or-later
> /*
> - * Hi3798CV200 Clock and Reset Generator Driver
> + * Hi3798 Clock and Reset Generator Driver
> *
> * Copyright (c) 2016 HiSilicon Technologies Co., Ltd.
> */
> @@ -14,49 +14,49 @@
> #include "crg.h"
> #include "reset.h"
>
> -/* hi3798CV200 core CRG */
> -#define HI3798CV200_INNER_CLK_OFFSET 64
> -#define HI3798CV200_FIXED_24M 65
> -#define HI3798CV200_FIXED_25M 66
> -#define HI3798CV200_FIXED_50M 67
> -#define HI3798CV200_FIXED_75M 68
> -#define HI3798CV200_FIXED_100M 69
> -#define HI3798CV200_FIXED_150M 70
> -#define HI3798CV200_FIXED_200M 71
> -#define HI3798CV200_FIXED_250M 72
> -#define HI3798CV200_FIXED_300M 73
> -#define HI3798CV200_FIXED_400M 74
> -#define HI3798CV200_MMC_MUX 75
> -#define HI3798CV200_ETH_PUB_CLK 76
> -#define HI3798CV200_ETH_BUS_CLK 77
> -#define HI3798CV200_ETH_BUS0_CLK 78
> -#define HI3798CV200_ETH_BUS1_CLK 79
> -#define HI3798CV200_COMBPHY1_MUX 80
> -#define HI3798CV200_FIXED_12M 81
> -#define HI3798CV200_FIXED_48M 82
> -#define HI3798CV200_FIXED_60M 83
> -#define HI3798CV200_FIXED_166P5M 84
> -#define HI3798CV200_SDIO0_MUX 85
> -#define HI3798CV200_COMBPHY0_MUX 86
> -
> -#define HI3798CV200_CRG_NR_CLKS 128
> -
> -static const struct hisi_fixed_rate_clock hi3798cv200_fixed_rate_clks[] = {
> +/* hi3798 core CRG */
> +#define HI3798_INNER_CLK_OFFSET 64
> +#define HI3798_FIXED_24M 65
> +#define HI3798_FIXED_25M 66
> +#define HI3798_FIXED_50M 67
> +#define HI3798_FIXED_75M 68
> +#define HI3798_FIXED_100M 69
> +#define HI3798_FIXED_150M 70
> +#define HI3798_FIXED_200M 71
> +#define HI3798_FIXED_250M 72
> +#define HI3798_FIXED_300M 73
> +#define HI3798_FIXED_400M 74
> +#define HI3798_MMC_MUX 75
> +#define HI3798_ETH_PUB_CLK 76
> +#define HI3798_ETH_BUS_CLK 77
> +#define HI3798_ETH_BUS0_CLK 78
> +#define HI3798_ETH_BUS1_CLK 79
> +#define HI3798_COMBPHY1_MUX 80
> +#define HI3798_FIXED_12M 81
> +#define HI3798_FIXED_48M 82
> +#define HI3798_FIXED_60M 83
> +#define HI3798_FIXED_166P5M 84
> +#define HI3798_SDIO0_MUX 85
> +#define HI3798_COMBPHY0_MUX 86
> +
> +#define HI3798_CRG_NR_CLKS 128
> +
> +static const struct hisi_fixed_rate_clock hi3798_fixed_rate_clks[] = {
> { HISTB_OSC_CLK, "clk_osc", NULL, 0, 24000000, },
> { HISTB_APB_CLK, "clk_apb", NULL, 0, 100000000, },
> { HISTB_AHB_CLK, "clk_ahb", NULL, 0, 200000000, },
> - { HI3798CV200_FIXED_12M, "12m", NULL, 0, 12000000, },
> - { HI3798CV200_FIXED_24M, "24m", NULL, 0, 24000000, },
> - { HI3798CV200_FIXED_25M, "25m", NULL, 0, 25000000, },
> - { HI3798CV200_FIXED_48M, "48m", NULL, 0, 48000000, },
> - { HI3798CV200_FIXED_50M, "50m", NULL, 0, 50000000, },
> - { HI3798CV200_FIXED_60M, "60m", NULL, 0, 60000000, },
> - { HI3798CV200_FIXED_75M, "75m", NULL, 0, 75000000, },
> - { HI3798CV200_FIXED_100M, "100m", NULL, 0, 100000000, },
> - { HI3798CV200_FIXED_150M, "150m", NULL, 0, 150000000, },
> - { HI3798CV200_FIXED_166P5M, "166p5m", NULL, 0, 165000000, },
> - { HI3798CV200_FIXED_200M, "200m", NULL, 0, 200000000, },
> - { HI3798CV200_FIXED_250M, "250m", NULL, 0, 250000000, },
> + { HI3798_FIXED_12M, "12m", NULL, 0, 12000000, },
> + { HI3798_FIXED_24M, "24m", NULL, 0, 24000000, },
> + { HI3798_FIXED_25M, "25m", NULL, 0, 25000000, },
> + { HI3798_FIXED_48M, "48m", NULL, 0, 48000000, },
> + { HI3798_FIXED_50M, "50m", NULL, 0, 50000000, },
> + { HI3798_FIXED_60M, "60m", NULL, 0, 60000000, },
> + { HI3798_FIXED_75M, "75m", NULL, 0, 75000000, },
> + { HI3798_FIXED_100M, "100m", NULL, 0, 100000000, },
> + { HI3798_FIXED_150M, "150m", NULL, 0, 150000000, },
> + { HI3798_FIXED_166P5M, "166p5m", NULL, 0, 165000000, },
> + { HI3798_FIXED_200M, "200m", NULL, 0, 200000000, },
> + { HI3798_FIXED_250M, "250m", NULL, 0, 250000000, },
> };
>
> static const char *const mmc_mux_p[] = {
> @@ -72,15 +72,15 @@ static const char *const sdio_mux_p[] = {
> static u32 sdio_mux_table[] = {0, 1, 2, 3};
>
> static struct hisi_mux_clock hi3798cv200_mux_clks[] = {
> - { HI3798CV200_MMC_MUX, "mmc_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),
> + { HI3798_MMC_MUX, "mmc_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p),
> CLK_SET_RATE_PARENT, 0xa0, 8, 3, 0, mmc_mux_table, },
> - { HI3798CV200_COMBPHY0_MUX, "combphy0_mux",
> + { HI3798_COMBPHY0_MUX, "combphy0_mux",
> comphy_mux_p, ARRAY_SIZE(comphy_mux_p),
> CLK_SET_RATE_PARENT, 0x188, 2, 2, 0, comphy_mux_table, },
> - { HI3798CV200_COMBPHY1_MUX, "combphy1_mux",
> + { HI3798_COMBPHY1_MUX, "combphy1_mux",
> comphy_mux_p, ARRAY_SIZE(comphy_mux_p),
> CLK_SET_RATE_PARENT, 0x188, 10, 2, 0, comphy_mux_table, },
> - { HI3798CV200_SDIO0_MUX, "sdio0_mux", sdio_mux_p,
> + { HI3798_SDIO0_MUX, "sdio0_mux", sdio_mux_p,
> ARRAY_SIZE(sdio_mux_p), CLK_SET_RATE_PARENT,
> 0x9c, 8, 2, 0, sdio_mux_table, },
> };
> @@ -135,13 +135,13 @@ static const struct hisi_gate_clock hi3798cv200_gate_clks[] = {
> { HISTB_PCIE_AUX_CLK, "clk_pcie_aux", "24m",
> CLK_SET_RATE_PARENT, 0x18c, 3, 0, },
> /* Ethernet */
> - { HI3798CV200_ETH_PUB_CLK, "clk_pub", NULL,
> + { HI3798_ETH_PUB_CLK, "clk_pub", NULL,
> CLK_SET_RATE_PARENT, 0xcc, 5, 0, },
> - { HI3798CV200_ETH_BUS_CLK, "clk_bus", "clk_pub",
> + { HI3798_ETH_BUS_CLK, "clk_bus", "clk_pub",
> CLK_SET_RATE_PARENT, 0xcc, 0, 0, },
> - { HI3798CV200_ETH_BUS0_CLK, "clk_bus_m0", "clk_bus",
> + { HI3798_ETH_BUS0_CLK, "clk_bus_m0", "clk_bus",
> CLK_SET_RATE_PARENT, 0xcc, 1, 0, },
> - { HI3798CV200_ETH_BUS1_CLK, "clk_bus_m1", "clk_bus",
> + { HI3798_ETH_BUS1_CLK, "clk_bus_m1", "clk_bus",
> CLK_SET_RATE_PARENT, 0xcc, 2, 0, },
> { HISTB_ETH0_MAC_CLK, "clk_mac0", "clk_bus_m0",
> CLK_SET_RATE_PARENT, 0xcc, 3, 0, },
> @@ -199,7 +199,7 @@ static struct hisi_clock_data *hi3798cv200_clk_register(
> struct hisi_clock_data *clk_data;
> int ret;
>
> - clk_data = hisi_clk_alloc(pdev, HI3798CV200_CRG_NR_CLKS);
> + clk_data = hisi_clk_alloc(pdev, HI3798_CRG_NR_CLKS);
> if (!clk_data)
> return ERR_PTR(-ENOMEM);
>
> @@ -211,8 +211,8 @@ static struct hisi_clock_data *hi3798cv200_clk_register(
> if (ret)
> return ERR_PTR(ret);
>
> - ret = hisi_clk_register_fixed_rate(hi3798cv200_fixed_rate_clks,
> - ARRAY_SIZE(hi3798cv200_fixed_rate_clks),
> + ret = hisi_clk_register_fixed_rate(hi3798_fixed_rate_clks,
> + ARRAY_SIZE(hi3798_fixed_rate_clks),
> clk_data);
> if (ret)
> return ERR_PTR(ret);
> @@ -245,8 +245,8 @@ static struct hisi_clock_data *hi3798cv200_clk_register(
> ARRAY_SIZE(hi3798cv200_mux_clks),
> clk_data);
> unregister_fixed_rate:
> - hisi_clk_unregister_fixed_rate(hi3798cv200_fixed_rate_clks,
> - ARRAY_SIZE(hi3798cv200_fixed_rate_clks),
> + hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks,
> + ARRAY_SIZE(hi3798_fixed_rate_clks),
> clk_data);
> return ERR_PTR(ret);
> }
> @@ -263,8 +263,8 @@ static void hi3798cv200_clk_unregister(struct platform_device *pdev)
> hisi_clk_unregister_mux(hi3798cv200_mux_clks,
> ARRAY_SIZE(hi3798cv200_mux_clks),
> crg->clk_data);
> - hisi_clk_unregister_fixed_rate(hi3798cv200_fixed_rate_clks,
> - ARRAY_SIZE(hi3798cv200_fixed_rate_clks),
> + hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks,
> + ARRAY_SIZE(hi3798_fixed_rate_clks),
> crg->clk_data);
> }
>
> @@ -273,9 +273,9 @@ static const struct hisi_crg_funcs hi3798cv200_crg_funcs = {
> .unregister_clks = hi3798cv200_clk_unregister,
> };
>
> -/* hi3798CV200 sysctrl CRG */
> +/* hi3798 sysctrl CRG */
>
> -#define HI3798CV200_SYSCTRL_NR_CLKS 16
> +#define HI3798_SYSCTRL_NR_CLKS 16
>
> static const struct hisi_gate_clock hi3798cv200_sysctrl_gate_clks[] = {
> { HISTB_IR_CLK, "clk_ir", "24m",
> @@ -292,7 +292,7 @@ static struct hisi_clock_data *hi3798cv200_sysctrl_clk_register(
> struct hisi_clock_data *clk_data;
> int ret;
>
> - clk_data = hisi_clk_alloc(pdev, HI3798CV200_SYSCTRL_NR_CLKS);
> + clk_data = hisi_clk_alloc(pdev, HI3798_SYSCTRL_NR_CLKS);
> if (!clk_data)
> return ERR_PTR(-ENOMEM);
>
> @@ -332,16 +332,16 @@ static const struct hisi_crg_funcs hi3798cv200_sysctrl_funcs = {
> .unregister_clks = hi3798cv200_sysctrl_clk_unregister,
> };
>
> -static const struct of_device_id hi3798cv200_crg_match_table[] = {
> +static const struct of_device_id hi3798_crg_match_table[] = {
> { .compatible = "hisilicon,hi3798cv200-crg",
> .data = &hi3798cv200_crg_funcs },
> { .compatible = "hisilicon,hi3798cv200-sysctrl",
> .data = &hi3798cv200_sysctrl_funcs },
> { }
> };
> -MODULE_DEVICE_TABLE(of, hi3798cv200_crg_match_table);
> +MODULE_DEVICE_TABLE(of, hi3798_crg_match_table);
>
> -static int hi3798cv200_crg_probe(struct platform_device *pdev)
> +static int hi3798_crg_probe(struct platform_device *pdev)
> {
> struct hisi_crg_dev *crg;
>
> @@ -367,7 +367,7 @@ static int hi3798cv200_crg_probe(struct platform_device *pdev)
> return 0;
> }
>
> -static int hi3798cv200_crg_remove(struct platform_device *pdev)
> +static int hi3798_crg_remove(struct platform_device *pdev)
> {
> struct hisi_crg_dev *crg = platform_get_drvdata(pdev);
>
> @@ -376,26 +376,27 @@ static int hi3798cv200_crg_remove(struct platform_device *pdev)
> return 0;
> }
>
> -static struct platform_driver hi3798cv200_crg_driver = {
> - .probe = hi3798cv200_crg_probe,
> - .remove = hi3798cv200_crg_remove,
> +static struct platform_driver hi3798_crg_driver = {
> + .probe = hi3798_crg_probe,
> + .remove = hi3798_crg_remove,
> .driver = {
> - .name = "hi3798cv200-crg",
> - .of_match_table = hi3798cv200_crg_match_table,
> + .name = "hi3798-crg",
> + .of_match_table = hi3798_crg_match_table,
> + .of_match_table = hi3798_crg_match_table,
These 2 lines are identical. One should be enough...
> },
> };
>
> -static int __init hi3798cv200_crg_init(void)
> +static int __init hi3798_crg_init(void)
> {
> - return platform_driver_register(&hi3798cv200_crg_driver);
> + return platform_driver_register(&hi3798_crg_driver);
> }
> -core_initcall(hi3798cv200_crg_init);
> +core_initcall(hi3798_crg_init);
>
> -static void __exit hi3798cv200_crg_exit(void)
> +static void __exit hi3798_crg_exit(void)
> {
> - platform_driver_unregister(&hi3798cv200_crg_driver);
> + platform_driver_unregister(&hi3798_crg_driver);
> }
> -module_exit(hi3798cv200_crg_exit);
> +module_exit(hi3798_crg_exit);
>
> MODULE_LICENSE("GPL v2");
> -MODULE_DESCRIPTION("HiSilicon Hi3798CV200 CRG Driver");
> +MODULE_DESCRIPTION("HiSilicon Hi3798 CRG Driver");
> --
> 2.39.2
>
