From patchwork Fri Mar 3 15:14:09 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 63971 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp466213wrd; Fri, 3 Mar 2023 07:19:56 -0800 (PST) X-Google-Smtp-Source: AK7set8eP8Nn2ZoL+hSvlUmXat47UWMmiUb3M0ZG1usLVsgjaF8u3yrpr0Mp5ItB03osWIqHgtkz X-Received: by 2002:a17:907:d109:b0:878:78f9:d1be with SMTP id uy9-20020a170907d10900b0087878f9d1bemr1857884ejc.23.1677856796144; Fri, 03 Mar 2023 07:19:56 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677856796; cv=none; d=google.com; s=arc-20160816; b=ifAZJgOXHCsHooPNnf4jZWMKxC4OWmEyEiIq5t9ccpQEjPztOHIRj1A1e1pmMkLddZ hsDlvDZAiaS2VQ7gzRAYGdS6ZgoPIG04sY8G9nQidWoGuAX/qyCMlUHkrpb9YdCtxlj6 rbTlJHR8zEmKqHTsJtr2VnULWOEbNc23oFAvgncvMKH0Xd0BorNkptV3G5KBKuO21GPD L10gj3j0/NOpRcHfq6mxX2/b0aB1avYcdG5Bx3MdF10j47tAxQcQriW2yVNmA/ICyTrs WVro3sT3ZO/S0fsq09MsU65Q3oa8UIcByNiz1mSk/6ogR9P9eQj4X5rwWEwFlBnWmvgf 25Pg== 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=g9Mn0jwkvOokLptdjMTn8t5cF0UBdVv812btjIaJ5HM=; b=qpJpdmQnuKmImImgDLvMgp1ZjNJ5QOOL6+bb454tqkIDPpG1QPlQswEOPx7SJOQsVf 7SMbSEu4Kj6aDc/mr4LJ8pDSbNLW3hNei9/AuRD19EhTUptdgIHToRSHCA9QxWtJP5U4 56uxQDE05VCvVuwl9XgN5whcz1fMc7L1Mj7zmQ0uy6FMy2/ZlkoxDyk1TuiwYMm+XDU3 SZOgZJL6TwQOdsAL0Ewg7U1/P/CaqvYQUWcUW+eiO3s/FG8GAAU+T8n8mYpDOG0gw74l eDOqVpoyyzyhuDQVjppf1kjLgmWSt2LFStDNESdf+TlDhSdzWpVPow3vdSqVSDAodJRU W/WA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=lVjhbB51; 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 sc23-20020a1709078a1700b008b178b624a4si315038ejc.21.2023.03.03.07.19.33; Fri, 03 Mar 2023 07:19:56 -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=@gmail.com header.s=20210112 header.b=lVjhbB51; 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 S231355AbjCCPPl (ORCPT + 99 others); Fri, 3 Mar 2023 10:15:41 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59630 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230463AbjCCPPj (ORCPT ); Fri, 3 Mar 2023 10:15:39 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA1A715550; Fri, 3 Mar 2023 07:15:34 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id a7so1741710pfx.10; Fri, 03 Mar 2023 07:15:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677856534; 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=g9Mn0jwkvOokLptdjMTn8t5cF0UBdVv812btjIaJ5HM=; b=lVjhbB513I23fQKL89tqSgsaVQJAFNJIDa68pYxJBL6LcM/wJ9Kx0xC6eFyWx+snf3 wjKYxq1PCjESWEf/vT4+oM2kk1a6RyJSOwLPjJdSuJE/lMboX5auTaBeRIzLDZDk71F9 mSURDW42UjlSoPHWqxHWJ1/uOMKh17svyn8OT6eLVqOXxS5W9tGwcZl8fp40LXKSZL0o D1JxJxrc+MD/0ImZrZYxVUnK7PglA7Ty6dK4JLh/UIglQ5Kk2+iqmxXqouibYerQO7aM 4vcJgHQluyaZ5NgIhRCwzkEb6iWmbdsRtELlDbs7sWkDt43Ew1fi97nsVYFI90hyvZvj 84Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677856534; 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=g9Mn0jwkvOokLptdjMTn8t5cF0UBdVv812btjIaJ5HM=; b=L/MdmTdE0Wnqk0GOJ3pMU7qFuC1l1T5t8LMpxgsdS7thjl1lkCBI7G35v8Hs7/TBiT y30iUXRKhoQcqPoDW3qx6OBlnyh5MQya/eeSeSrl4wuo+Q2w1RomdObWBJfCp4u4ktP+ 2M+qOc1nvbPYM4KSgM3ZkcYP+HisCfQsXGNLbm8MP1rEuyesttbxO7sW3vGEakH0L8vf OHWYy2JXcbfXHdYjgS9XmF0sI+GZ91bRpjbA8u/zjrt/s3mHsyusjh/uuCxb3RHzU0bz eQ5Zk1B5ZfgIkllXyP50hBNqScLNNbo1MngfCm/c1gc5XSkIP1l0o5copsmZADyEJZgd Icyw== X-Gm-Message-State: AO0yUKUtDxW/Nn3HEUJe3gfW7lZnXuY7ePv0ws1cHHtzVUuyITjTH67W 3Fn8vw0SCkW/uXCe+O1FuS0wSAW8ydJVygDEAAY= X-Received: by 2002:a62:2581:0:b0:5a9:cb6b:7843 with SMTP id l123-20020a622581000000b005a9cb6b7843mr2077259pfl.27.1677856534120; Fri, 03 Mar 2023 07:15:34 -0800 (PST) Received: from y.ha.lan ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id p4-20020aa78604000000b005a8bdc18453sm1739721pfn.35.2023.03.03.07.15.27 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 07:15:33 -0800 (PST) From: David Yang To: mmyangfl@gmail.com Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 1/5] clk: hisilicon: Rename Hi3798CV200 to Hi3798 Date: Fri, 3 Mar 2023 23:14:09 +0800 Message-Id: <20230303151417.104321-2-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303151417.104321-1-mmyangfl@gmail.com> References: <20230303151417.104321-1-mmyangfl@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1759360367845678489?= X-GMAIL-MSGID: =?utf-8?q?1759360367845678489?= Rename Hisilicon Hi3798CV200 to Hi3798, to be reused with other Hi3798 series SoCs. Signed-off-by: David Yang --- 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, }, }; -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"); From patchwork Fri Mar 3 15:14:10 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 63976 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp467552wrd; Fri, 3 Mar 2023 07:22:36 -0800 (PST) X-Google-Smtp-Source: AK7set8QCofOyspa4AO7QO4rpoC7NT0whmDEuwrpMzYCaWBY+5qSP2Iq6UY1yOHAd7xttxkOOXO6 X-Received: by 2002:a17:907:6091:b0:8b1:7de0:c854 with SMTP id ht17-20020a170907609100b008b17de0c854mr2645788ejc.41.1677856956612; Fri, 03 Mar 2023 07:22:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677856956; cv=none; d=google.com; s=arc-20160816; b=ZERQteHQadnJVRmBBKFIxey8GfwOD7Mgcw1mb2uyaWQp0BagAewzMOpQML/SwVwKhc bSRLZdP3Mv5PN3HKd8rGDd+NknptKSunhea1lPRq1DcxPsX+FsSNCseGDO+AwgmJ6jUQ 8+6UhLCAnWvpMFBtVFxn838IWHlHJqP4JIDb9xmfaj61SnoDP6XTWLcHHFfo2z0FnV1N kGETgivZUVhj2mDlnBHF7i+IZCnsOitoB3+eK89iRygO/L9OFokl3EJqnmuu5YQ6z68m QP5If6CQdiPqcqoH3/e+Q5ccbtxaTEYSqm4JYlvSA6jG/ErsIWlTI9bOP5S4quIdqwiw I55g== 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=giFfJwXNPJLMNED9GYpA4et3XffJ1cdsmrq2P3gr9F4=; b=ewgJWq4kdXKrxmVNf7HKBaiDC86+Lsu44sr2BQVnwObZ91ZLjlB+LjUx5YCseFvAxf V3Vj4Wnm6T8GGKwcwslKlb+MAtEMQVxy2ZNuMaRX59T5zWyygWRJxqEZORjetQ+vQVX8 gF1BIP+ErRJ4tE4JdJvjesU1yxd7O4rWEumZ6PE/u7xSjeE4AmAcUEKCl6PEC0pEXhEP 87sitBWchmfJPLKr75yWRsctUdCh2lLrYAGBe8+Nl9lxP2A+CQwJoO3mGBo7JdjbXcbW FUsHXtkybXWWlfodQgJ1OW3SDtkIp+tF+NJNNECtl1VF9FTXfWZqDn6kzwCdWZgC6gpt +jVg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=KwqYBsWk; 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 qb6-20020a1709077e8600b008d1ace2d1b3si946554ejc.335.2023.03.03.07.22.13; Fri, 03 Mar 2023 07:22:36 -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=@gmail.com header.s=20210112 header.b=KwqYBsWk; 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 S230353AbjCCPPw (ORCPT + 99 others); Fri, 3 Mar 2023 10:15:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59990 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231461AbjCCPPs (ORCPT ); Fri, 3 Mar 2023 10:15:48 -0500 Received: from mail-pf1-x429.google.com (mail-pf1-x429.google.com [IPv6:2607:f8b0:4864:20::429]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 387BD1F4AB; Fri, 3 Mar 2023 07:15:46 -0800 (PST) Received: by mail-pf1-x429.google.com with SMTP id a7so1742117pfx.10; Fri, 03 Mar 2023 07:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677856546; 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=giFfJwXNPJLMNED9GYpA4et3XffJ1cdsmrq2P3gr9F4=; b=KwqYBsWktWCPQfD45lhXLzcJcD3IQizu11gLk+QCTCCHOetHJopzX22oQL8CL3J5Z7 n5jq+OEOuepE3M/Lo33QN2+cPKrL1vAARthBxSoYqrzL8AoCJWZ/4k3YqhVpWBYpE4Vf wofWl3P771ngFdiryBquX/af3RgvAeS+qlsA6T9BGxwG8MBwlVJ/usxT5pCI821R+SYH GmI+KTVTMe6GRJbxmC2uT3Rs0VtunPU+jgEJX+zI4WccYC/pWKLaZpUr2YLBG8/lMDrH jsSh5L/Jsq49rwW3fZ6Z/s444ayWEMsEkanPA2lPFXOC43mZ01LlHM0iAZxbtLQBfCFy VTrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677856546; 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=giFfJwXNPJLMNED9GYpA4et3XffJ1cdsmrq2P3gr9F4=; b=kTr/E3wz5DR+RijvwX68+45Ug3FjdU1X9U8xmikfztdD7qXFDxs7LedxvHGnl5cMtV IpzERUluqW05e5y1DrLjOFq9Wyv2uMrtHlXHeMU74nk9Cai48o88xYHbKc2qsVUVvHgr kOmOgFzb4v1NnPH/B1tJktCevGUrU/Oj28fu/ggICP0ZYtkHW2AnNmuKUDo6hjRAju5v kgxB46qT9IhqmGW3/e30StWFK8cyBdnjQZrFsOHosuYaglKkV2fS2ChwZbl0rnH4D7u8 tdeuEc9jj99D4pHxZaGHkfahO+ZgIQieOR3VJAZXuPYk7IC1Wy3hNsH72fLTYC6Zw9kS dsKA== X-Gm-Message-State: AO0yUKV6bazK9oRdpj0M5lGEGRCvSpLOCUH04VcnpZuUWpAbDV4w9wMA ZYKWe5d6sJULSzQ63TRzsVA= X-Received: by 2002:aa7:9464:0:b0:600:cc40:2587 with SMTP id t4-20020aa79464000000b00600cc402587mr2051066pfq.6.1677856545863; Fri, 03 Mar 2023 07:15:45 -0800 (PST) Received: from y.ha.lan ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id p4-20020aa78604000000b005a8bdc18453sm1739721pfn.35.2023.03.03.07.15.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 07:15:45 -0800 (PST) From: David Yang To: mmyangfl@gmail.com Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/5] clk: hisilicon: Extract common functions Date: Fri, 3 Mar 2023 23:14:10 +0800 Message-Id: <20230303151417.104321-3-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303151417.104321-1-mmyangfl@gmail.com> References: <20230303151417.104321-1-mmyangfl@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1759360536171559684?= X-GMAIL-MSGID: =?utf-8?q?1759360536171559684?= To be reused with other Hi3798 series SoCs. Signed-off-by: David Yang --- drivers/clk/hisilicon/crg-hi3798.c | 238 ++++++++++++++++------------- 1 file changed, 136 insertions(+), 102 deletions(-) diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c index bdce43fbe..9c933172b 100644 --- a/drivers/clk/hisilicon/crg-hi3798.c +++ b/drivers/clk/hisilicon/crg-hi3798.c @@ -59,6 +59,124 @@ static const struct hisi_fixed_rate_clock hi3798_fixed_rate_clks[] = { { HI3798_FIXED_250M, "250m", NULL, 0, 250000000, }, }; +struct hi3798_crg_clks { + const struct hisi_phase_clock *phase_clks; + int phase_clks_nums; + const struct hisi_mux_clock *mux_clks; + int mux_clks_nums; + const struct hisi_gate_clock *gate_clks; + int gate_clks_nums; +}; + +static struct hisi_clock_data *hi3798_clk_register( + struct platform_device *pdev, const struct hi3798_crg_clks *clks) +{ + struct hisi_clock_data *clk_data; + int ret; + + clk_data = hisi_clk_alloc(pdev, HI3798_CRG_NR_CLKS); + if (!clk_data) + return ERR_PTR(-ENOMEM); + + /* hisi_phase_clock is resource managed */ + ret = hisi_clk_register_phase(&pdev->dev, clks->phase_clks, + clks->phase_clks_nums, clk_data); + if (ret) + return ERR_PTR(ret); + + ret = hisi_clk_register_fixed_rate(hi3798_fixed_rate_clks, + ARRAY_SIZE(hi3798_fixed_rate_clks), + clk_data); + if (ret) + return ERR_PTR(ret); + + ret = hisi_clk_register_mux(clks->mux_clks, clks->mux_clks_nums, clk_data); + if (ret) + goto unregister_fixed_rate; + + ret = hisi_clk_register_gate(clks->gate_clks, clks->gate_clks_nums, 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_gate: + hisi_clk_unregister_gate(clks->gate_clks, clks->gate_clks_nums, clk_data); +unregister_mux: + hisi_clk_unregister_mux(clks->mux_clks, clks->mux_clks_nums, clk_data); +unregister_fixed_rate: + hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks, + ARRAY_SIZE(hi3798_fixed_rate_clks), + clk_data); + return ERR_PTR(ret); +} + +static void hi3798_clk_unregister( + struct platform_device *pdev, const struct hi3798_crg_clks *clks) +{ + struct hisi_crg_dev *crg = platform_get_drvdata(pdev); + + of_clk_del_provider(pdev->dev.of_node); + + hisi_clk_unregister_gate(clks->gate_clks, clks->gate_clks_nums, crg->clk_data); + hisi_clk_unregister_mux(clks->mux_clks, clks->mux_clks_nums, crg->clk_data); + hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks, + ARRAY_SIZE(hi3798_fixed_rate_clks), + crg->clk_data); +} + +/* hi3798 sysctrl CRG */ + +#define HI3798_SYSCTRL_NR_CLKS 16 + +struct hi3798_sysctrl_clks { + const struct hisi_gate_clock *gate_clks; + int gate_clks_nums; +}; + +static struct hisi_clock_data *hi3798_sysctrl_clk_register( + struct platform_device *pdev, const struct hi3798_sysctrl_clks *clks) +{ + struct hisi_clock_data *clk_data; + int ret; + + clk_data = hisi_clk_alloc(pdev, HI3798_SYSCTRL_NR_CLKS); + if (!clk_data) + return ERR_PTR(-ENOMEM); + + ret = hisi_clk_register_gate(clks->gate_clks, clks->gate_clks_nums, clk_data); + if (ret) + return ERR_PTR(ret); + + 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_gate: + hisi_clk_unregister_gate(clks->gate_clks, clks->gate_clks_nums, clk_data); + return ERR_PTR(ret); +} + +static void hi3798_sysctrl_clk_unregister( + struct platform_device *pdev, const struct hi3798_sysctrl_clks *clks) +{ + struct hisi_crg_dev *crg = platform_get_drvdata(pdev); + + of_clk_del_provider(pdev->dev.of_node); + + hisi_clk_unregister_gate(clks->gate_clks, clks->gate_clks_nums, crg->clk_data); +} + +/* hi3798CV200 */ + static const char *const mmc_mux_p[] = { "100m", "50m", "25m", "200m", "150m" }; static u32 mmc_mux_table[] = {0, 1, 2, 3, 6}; @@ -193,79 +311,24 @@ static const struct hisi_gate_clock hi3798cv200_gate_clks[] = { CLK_SET_RATE_PARENT, 0xb0, 18, 0 }, }; +static const struct hi3798_crg_clks hi3798cv200_crg_clks_data = { + .phase_clks = hi3798cv200_phase_clks, + .phase_clks_nums = ARRAY_SIZE(hi3798cv200_phase_clks), + .mux_clks = hi3798cv200_mux_clks, + .mux_clks_nums = ARRAY_SIZE(hi3798cv200_mux_clks), + .gate_clks = hi3798cv200_gate_clks, + .gate_clks_nums = ARRAY_SIZE(hi3798cv200_gate_clks), +}; + static struct hisi_clock_data *hi3798cv200_clk_register( struct platform_device *pdev) { - struct hisi_clock_data *clk_data; - int ret; - - clk_data = hisi_clk_alloc(pdev, HI3798_CRG_NR_CLKS); - if (!clk_data) - return ERR_PTR(-ENOMEM); - - /* hisi_phase_clock is resource managed */ - ret = hisi_clk_register_phase(&pdev->dev, - hi3798cv200_phase_clks, - ARRAY_SIZE(hi3798cv200_phase_clks), - clk_data); - if (ret) - return ERR_PTR(ret); - - ret = hisi_clk_register_fixed_rate(hi3798_fixed_rate_clks, - ARRAY_SIZE(hi3798_fixed_rate_clks), - clk_data); - if (ret) - return ERR_PTR(ret); - - ret = hisi_clk_register_mux(hi3798cv200_mux_clks, - ARRAY_SIZE(hi3798cv200_mux_clks), - clk_data); - if (ret) - goto unregister_fixed_rate; - - ret = hisi_clk_register_gate(hi3798cv200_gate_clks, - ARRAY_SIZE(hi3798cv200_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_gate: - hisi_clk_unregister_gate(hi3798cv200_gate_clks, - ARRAY_SIZE(hi3798cv200_gate_clks), - clk_data); -unregister_mux: - hisi_clk_unregister_mux(hi3798cv200_mux_clks, - ARRAY_SIZE(hi3798cv200_mux_clks), - clk_data); -unregister_fixed_rate: - hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks, - ARRAY_SIZE(hi3798_fixed_rate_clks), - clk_data); - return ERR_PTR(ret); + return hi3798_clk_register(pdev, &hi3798cv200_crg_clks_data); } static void hi3798cv200_clk_unregister(struct platform_device *pdev) { - struct hisi_crg_dev *crg = platform_get_drvdata(pdev); - - of_clk_del_provider(pdev->dev.of_node); - - hisi_clk_unregister_gate(hi3798cv200_gate_clks, - ARRAY_SIZE(hi3798cv200_gate_clks), - crg->clk_data); - hisi_clk_unregister_mux(hi3798cv200_mux_clks, - ARRAY_SIZE(hi3798cv200_mux_clks), - crg->clk_data); - hisi_clk_unregister_fixed_rate(hi3798_fixed_rate_clks, - ARRAY_SIZE(hi3798_fixed_rate_clks), - crg->clk_data); + hi3798_clk_unregister(pdev, &hi3798cv200_crg_clks_data); } static const struct hisi_crg_funcs hi3798cv200_crg_funcs = { @@ -273,10 +336,6 @@ static const struct hisi_crg_funcs hi3798cv200_crg_funcs = { .unregister_clks = hi3798cv200_clk_unregister, }; -/* hi3798 sysctrl CRG */ - -#define HI3798_SYSCTRL_NR_CLKS 16 - static const struct hisi_gate_clock hi3798cv200_sysctrl_gate_clks[] = { { HISTB_IR_CLK, "clk_ir", "24m", CLK_SET_RATE_PARENT, 0x48, 4, 0, }, @@ -286,45 +345,20 @@ static const struct hisi_gate_clock hi3798cv200_sysctrl_gate_clks[] = { CLK_SET_RATE_PARENT, 0x48, 10, 0, }, }; +static const struct hi3798_sysctrl_clks hi3798cv200_sysctrl_clks_data = { + .gate_clks = hi3798cv200_sysctrl_gate_clks, + .gate_clks_nums = ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks), +}; + static struct hisi_clock_data *hi3798cv200_sysctrl_clk_register( struct platform_device *pdev) { - struct hisi_clock_data *clk_data; - int ret; - - clk_data = hisi_clk_alloc(pdev, HI3798_SYSCTRL_NR_CLKS); - if (!clk_data) - return ERR_PTR(-ENOMEM); - - ret = hisi_clk_register_gate(hi3798cv200_sysctrl_gate_clks, - ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks), - clk_data); - if (ret) - return ERR_PTR(ret); - - 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_gate: - hisi_clk_unregister_gate(hi3798cv200_sysctrl_gate_clks, - ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks), - clk_data); - return ERR_PTR(ret); + return hi3798_sysctrl_clk_register(pdev, &hi3798cv200_sysctrl_clks_data); } static void hi3798cv200_sysctrl_clk_unregister(struct platform_device *pdev) { - struct hisi_crg_dev *crg = platform_get_drvdata(pdev); - - of_clk_del_provider(pdev->dev.of_node); - - hisi_clk_unregister_gate(hi3798cv200_sysctrl_gate_clks, - ARRAY_SIZE(hi3798cv200_sysctrl_gate_clks), - crg->clk_data); + hi3798_sysctrl_clk_unregister(pdev, &hi3798cv200_sysctrl_clks_data); } static const struct hisi_crg_funcs hi3798cv200_sysctrl_funcs = { From patchwork Fri Mar 3 15:14:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 63972 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp466258wrd; Fri, 3 Mar 2023 07:20:04 -0800 (PST) X-Google-Smtp-Source: AK7set9E0QMRkRRoPa2TSXtBZFLcg313hBIGQda6x1usfD9VTYApSWhG9kKFwotaHn4VfKYjt/og X-Received: by 2002:a17:906:28d3:b0:88d:619:15fc with SMTP id p19-20020a17090628d300b0088d061915fcmr1703549ejd.21.1677856803864; Fri, 03 Mar 2023 07:20:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677856803; cv=none; d=google.com; s=arc-20160816; b=lSi/mGe+rLhl/LoiQlhSTUBXS7oqK46g+nvj3cPYB5XYtVy82Hy5dTMKQfzZ4LtF7+ jJ1D0XVhPcXxub/6zUXnQLqm6RPmZoiG90iW4QKXj7xRElozG2WaHUf2SdI5CIrKtFlA psrw796UabA+Tj893eADWX3WaDj1Sy9DSHforECUhpP7l5LdatqoIbuU9xI/qT1YX8/x XWrgCu7DiNEMz7WbKkZH1CV2ZMDBwLj0yK2laGzBXFGyrf1udf5k0cZZJTPf3u144w+B CKWLdemTnXDishs+xsza2NJgV7kI2lCyk/0VCVQxOtI2MSGJdapvAHt3Wg43dhLk+DsV AA6w== 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=6iAHNFRrErL7el295aKmjr3jbvg5dczAcuNZAYIE3HY=; b=GueOe+8OmzdSF4ssE3tR1/OLzdYUr/8CNREFe1j7BKkHgdOImc+A9TK4PbUV3KZ8hD sqgH57M6qDvcbH/bZYrj2SJWePEIFOHc3QVohncnK2MTniZPsdtq5kkBly7kBL5zb0O0 oGvJKlCSfulY/rWIkJFgQTZByx8auPdRfiXb5MfMu7QZatoT8Tx+nX++89L29Vb+JQ6j f7mLBWuO76QjAxIVaalDhaUOO6eqdmwO36y44D3OiwzUdjQxsXv8agqRjF50/RbI2KMB CmH5wYuvKMBBEiaO17bPNQGdkWQFTaG3Bq9/1IylYBMMjq9zul/ov7VN+zJ2RXi1a7F8 ogRQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=kE9CYEKW; 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 t15-20020a17090616cf00b008d6385c40c4si2429086ejd.696.2023.03.03.07.19.41; Fri, 03 Mar 2023 07:20:03 -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=@gmail.com header.s=20210112 header.b=kE9CYEKW; 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 S231444AbjCCPQE (ORCPT + 99 others); Fri, 3 Mar 2023 10:16:04 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:60454 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230510AbjCCPQC (ORCPT ); Fri, 3 Mar 2023 10:16:02 -0500 Received: from mail-pj1-x1036.google.com (mail-pj1-x1036.google.com [IPv6:2607:f8b0:4864:20::1036]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C97E81ABE0; Fri, 3 Mar 2023 07:15:58 -0800 (PST) Received: by mail-pj1-x1036.google.com with SMTP id y2so2825697pjg.3; Fri, 03 Mar 2023 07:15:58 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677856558; 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=6iAHNFRrErL7el295aKmjr3jbvg5dczAcuNZAYIE3HY=; b=kE9CYEKWX3Sct6bWzan1A+UEOTNKckGtnsSyosCKP0FShm9MZOM4yCMIdfbiVcFIqj PzzjtUO3+F4bHYFRSEyp69uckvRV1f0RlGgjMNDYnHiAtXT5wyIIC0FdBUezz1wYCAIL poUdckREKHj6MwKY9XPcHjpDjAlAi02dv4hBcEka/37PA0ZvTRYo/B9Nbsrvo/RqDS5N b0vQ5TGV6eK18PfTWp5uDr6XeU+w3Hg3U9PdJV1TspvMOnnbMtS7EZrWzljv/fQ0wJWz TQiU61Cv5poGiEI/wfzmNtate7zkdqJiCUgbT+CTiyPHL4dhh8KyQGhxIIi/wmavRNl+ Xobw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677856558; 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=6iAHNFRrErL7el295aKmjr3jbvg5dczAcuNZAYIE3HY=; b=cE1o5mDFS+rsbw6G4bmifk/5J75Xwb2HcDq/JR80nvg9xgz8WaBoanjmwQA0iJnFda JC0sgMgOAopjJEBgpnWxij9KcZjEeu7A+82EkfgUCWeKz/E3M6PN40+xbA0ErpKryZQL m+7JE9GNuLUC7ZT73+vkrInl3TqSvPFGUM11l2qqg20vJDMJdhZ4spKZv//i8DHrDyOu /zYpJ4CBVOk35gfZUQ69WnwUQOisIzW1qNNpAS4V8mwy+UtW2leel7XJ1cxtJuzCPL/h wgZnxL+knkTk1jXgGsWo5e+u6OUy3oCElZ8w1T6XFc6VUZlU2zsY5YghuNt9pYpc04sP YRUg== X-Gm-Message-State: AO0yUKVsHaoT5pwMGbjwK5eg/2ZT7uxru9GINIGMlisu9i7sfylrqzqZ FTQdG0GN6LfL1crRTj713GM= X-Received: by 2002:a05:6a20:3955:b0:be:c1b2:514d with SMTP id r21-20020a056a20395500b000bec1b2514dmr2043353pzg.13.1677856558208; Fri, 03 Mar 2023 07:15:58 -0800 (PST) Received: from y.ha.lan ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id p4-20020aa78604000000b005a8bdc18453sm1739721pfn.35.2023.03.03.07.15.52 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 07:15:57 -0800 (PST) From: David Yang To: mmyangfl@gmail.com Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 3/5] clk: hisilicon: Rename some symbols for Hi3798CV200 Date: Fri, 3 Mar 2023 23:14:11 +0800 Message-Id: <20230303151417.104321-4-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303151417.104321-1-mmyangfl@gmail.com> References: <20230303151417.104321-1-mmyangfl@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1759360376363462735?= X-GMAIL-MSGID: =?utf-8?q?1759360376363462735?= These symbols might cause confusion when adding support for other Hi3798 series SoCs. Signed-off-by: David Yang --- drivers/clk/hisilicon/crg-hi3798.c | 41 ++++++++++++------------- include/dt-bindings/clock/histb-clock.h | 2 ++ 2 files changed, 22 insertions(+), 21 deletions(-) diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c index 9c933172b..f834805d7 100644 --- a/drivers/clk/hisilicon/crg-hi3798.c +++ b/drivers/clk/hisilicon/crg-hi3798.c @@ -27,8 +27,6 @@ #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 @@ -177,30 +175,31 @@ static void hi3798_sysctrl_clk_unregister( /* hi3798CV200 */ -static const char *const mmc_mux_p[] = { +static const char *const hi3798cv200_mmc_mux_p[] = { "100m", "50m", "25m", "200m", "150m" }; -static u32 mmc_mux_table[] = {0, 1, 2, 3, 6}; +static u32 hi3798cv200_mmc_mux_table[] = {0, 1, 2, 3, 6}; -static const char *const comphy_mux_p[] = { +static const char *const hi3798cv200_comphy_mux_p[] = { "100m", "25m"}; -static u32 comphy_mux_table[] = {2, 3}; +static u32 hi3798cv200_comphy_mux_table[] = {2, 3}; -static const char *const sdio_mux_p[] = { +static const char *const hi3798cv200_sdio_mux_p[] = { "100m", "50m", "150m", "166p5m" }; -static u32 sdio_mux_table[] = {0, 1, 2, 3}; +static u32 hi3798cv200_sdio_mux_table[] = {0, 1, 2, 3}; static struct hisi_mux_clock hi3798cv200_mux_clks[] = { - { HI3798_MMC_MUX, "mmc_mux", mmc_mux_p, ARRAY_SIZE(mmc_mux_p), - CLK_SET_RATE_PARENT, 0xa0, 8, 3, 0, mmc_mux_table, }, - { HI3798_COMBPHY0_MUX, "combphy0_mux", - comphy_mux_p, ARRAY_SIZE(comphy_mux_p), - CLK_SET_RATE_PARENT, 0x188, 2, 2, 0, comphy_mux_table, }, - { HI3798_COMBPHY1_MUX, "combphy1_mux", - comphy_mux_p, ARRAY_SIZE(comphy_mux_p), - CLK_SET_RATE_PARENT, 0x188, 10, 2, 0, comphy_mux_table, }, - { HI3798_SDIO0_MUX, "sdio0_mux", sdio_mux_p, - ARRAY_SIZE(sdio_mux_p), CLK_SET_RATE_PARENT, - 0x9c, 8, 2, 0, sdio_mux_table, }, + { HI3798_MMC_MUX, "mmc_mux", hi3798cv200_mmc_mux_p, + ARRAY_SIZE(hi3798cv200_mmc_mux_p), CLK_SET_RATE_PARENT, + 0xa0, 8, 3, 0, hi3798cv200_mmc_mux_table, }, + { HI3798_COMBPHY0_MUX, "combphy0_mux", hi3798cv200_comphy_mux_p, + ARRAY_SIZE(hi3798cv200_comphy_mux_p), CLK_SET_RATE_PARENT, + 0x188, 2, 2, 0, hi3798cv200_comphy_mux_table, }, + { HI3798_COMBPHY1_MUX, "combphy1_mux", hi3798cv200_comphy_mux_p, + ARRAY_SIZE(hi3798cv200_comphy_mux_p), CLK_SET_RATE_PARENT, + 0x188, 10, 2, 0, hi3798cv200_comphy_mux_table, }, + { HI3798_SDIO0_MUX, "sdio0_mux", hi3798cv200_sdio_mux_p, + ARRAY_SIZE(hi3798cv200_sdio_mux_p), CLK_SET_RATE_PARENT, + 0x9c, 8, 2, 0, hi3798cv200_sdio_mux_table, }, }; static u32 mmc_phase_regvals[] = {0, 1, 2, 3, 4, 5, 6, 7}; @@ -253,9 +252,9 @@ 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 */ - { HI3798_ETH_PUB_CLK, "clk_pub", NULL, + { HISTB_ETH_PUB_CLK, "clk_pub", NULL, CLK_SET_RATE_PARENT, 0xcc, 5, 0, }, - { HI3798_ETH_BUS_CLK, "clk_bus", "clk_pub", + { HISTB_ETH_BUS_CLK, "clk_bus", "clk_pub", CLK_SET_RATE_PARENT, 0xcc, 0, 0, }, { HI3798_ETH_BUS0_CLK, "clk_bus_m0", "clk_bus", CLK_SET_RATE_PARENT, 0xcc, 1, 0, }, diff --git a/include/dt-bindings/clock/histb-clock.h b/include/dt-bindings/clock/histb-clock.h index e64e5770a..ed47c43c3 100644 --- a/include/dt-bindings/clock/histb-clock.h +++ b/include/dt-bindings/clock/histb-clock.h @@ -58,6 +58,8 @@ #define HISTB_USB3_UTMI_CLK1 48 #define HISTB_USB3_PIPE_CLK1 49 #define HISTB_USB3_SUSPEND_CLK1 50 +#define HISTB_ETH_PUB_CLK 51 +#define HISTB_ETH_BUS_CLK 52 /* clocks provided by mcu CRG */ #define HISTB_MCE_CLK 1 From patchwork Fri Mar 3 15:14:12 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 63973 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp466521wrd; Fri, 3 Mar 2023 07:20:37 -0800 (PST) X-Google-Smtp-Source: AK7set8azVMDqX/RoTvK9UgaZ8VxOg+wiVzgblK5lkbz1XgGHBGwjHGiY/iYSeKzMTwMH0t8O9Nc X-Received: by 2002:a17:906:d42:b0:900:a150:cea5 with SMTP id r2-20020a1709060d4200b00900a150cea5mr1835307ejh.54.1677856837595; Fri, 03 Mar 2023 07:20:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677856837; cv=none; d=google.com; s=arc-20160816; b=Br/gbxcybN7kXoEBvfiXTQo6wX2qATcIJ3poU4Tk0dbG5BcLgHPRUT3L6VJ9txrMnu bD6lM5qEwvblNIB15AUZmW/W88pN977lTI5jU5sIq7/gisRgz/euFMXEgwHtua1rrkqJ /PU+kR2hPRkUDqXz6pgrKLyozXcznAy8vsZrNJw5836P+ld9ZyHTeh6Z6CY1R1IBrQC5 diha0t/Rz+phn7mnLRLjf0fN2PK9pgblI4/kRvGlS2V7pCXNTdu+Mpri1ndC1cdiNbn0 kQyZzREEtxYED34CtVHjIbkZ5AlJJ9CTpbKdn7165CF8qA/NL/4PUwGC9fnolG/jVrY9 3Vuw== 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=uVLpRrnbJZYVSWnf+8w+Ja+4k+GNp4CYJagkV8lja6A=; b=a3kioNjOUnLbxDWJPrrm8FlApahgQVMJy/Ic37cxZvqQUx4yOJ0UozRGPtPJp9g4n3 aTwgv4f13oK3sCqicnwYQEW9jNoCzVgJSFstuRXIcrz63Wd40m2HJnaxS0ziBysgue51 8oCy9rWPsRx4x9I2qY4ccipXnve7yNJs3XE+JRuqt8vvdSNaZwFAYyb81M7YjGxxVvS8 /fjb+Sx4Ho38A2ovazsPtP9l673o82xF4ugGodGMqXZk7btc83TzpbSPcZV3dA8HUfd7 wzvUJF3K8jU1aaADLhsyC8+52rOI9fuso8V9rFm65/v3p/780pZINAf6fYIRT9TbmpW9 hsuQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=MYZlbShp; 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 b13-20020aa7c90d000000b004acc613462fsi2656284edt.525.2023.03.03.07.20.14; Fri, 03 Mar 2023 07:20:37 -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=@gmail.com header.s=20210112 header.b=MYZlbShp; 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 S231461AbjCCPQZ (ORCPT + 99 others); Fri, 3 Mar 2023 10:16:25 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32880 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231318AbjCCPQX (ORCPT ); Fri, 3 Mar 2023 10:16:23 -0500 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 2A48C1ABE5; Fri, 3 Mar 2023 07:16:11 -0800 (PST) Received: by mail-pj1-x102e.google.com with SMTP id h11-20020a17090a2ecb00b00237c740335cso2544291pjs.3; Fri, 03 Mar 2023 07:16:11 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677856570; 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=uVLpRrnbJZYVSWnf+8w+Ja+4k+GNp4CYJagkV8lja6A=; b=MYZlbShpiWJ8tuVB+tv5E9GwjjdpSgKTQegKaVgGsW5ffcy3jf0ZyB5HSZ7sJlibMz 54j91VyFRpmq2oNU6dxVfd3vNBs7EqX7gy3ATDdOgRFYoUHJH4YP40P1aSdSFdXOx0zX XQ62kdJGbazjYbRnRcgPonp2qAn3lfn4NhOvdOdyOoJuUUmT8x1w9QYkOkcONwoNpHXe 1pih8PhDi7ZGqZ0fqZScvwO4dCQpofJ+0FY4ZgFYJ3lLSWpeYc+osCAzxuIXxh0PtQT/ MwECweGSZ0nKY0k02zPy5VPjH0R0DC1Yp0zKMYQPo/d6tiwVUPS3VqQDgovaySSOybrz Syyg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677856570; 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=uVLpRrnbJZYVSWnf+8w+Ja+4k+GNp4CYJagkV8lja6A=; b=3Sne2ZHHZ4kp7UQfFaqU3vRSPHvFRSM0CZ0nNB7/hs0J49SqiA+GwLkvAYzOyxLN03 ASPUNd+DmC1eCD3uErRBu7lssqWKf1UiqH2xwFUOSXOZFbOEMerqPgJBMmkAnUejUdw6 bsDdMgVcRgznAoVXk1KDv9+BiVTeRoKrBDjcRsY2HYKAs8U08MaSfSNLYtSQfkFSII6m eVJmwKC23p06WMMMVs/+MdYw+qfJ65Fv4TaPgE3BaJ8fUPhXueytkkr78QAC/OlumD7K VEgJhrA1CG7ULRUXFe1ArsMpg/3/GlhJ4D/NCoT/LTLsdiWTR3K4Bj+ZsJss7RqhIHRZ hHRw== X-Gm-Message-State: AO0yUKXIk5qlWLDhr8rLhNcm5Lv6WkUsJuygQQOH7RPVSOS91wNvbWRe pYOVOC4GSDwbhYXT7P4xLv8= X-Received: by 2002:a05:6a20:748b:b0:cd:83b1:4236 with SMTP id p11-20020a056a20748b00b000cd83b14236mr2258340pzd.36.1677856570607; Fri, 03 Mar 2023 07:16:10 -0800 (PST) Received: from y.ha.lan ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id p4-20020aa78604000000b005a8bdc18453sm1739721pfn.35.2023.03.03.07.16.04 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 07:16:09 -0800 (PST) From: David Yang To: mmyangfl@gmail.com Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 4/5] clk: hisilicon: Add inner clocks for Hi3798MV100 Date: Fri, 3 Mar 2023 23:14:12 +0800 Message-Id: <20230303151417.104321-5-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303151417.104321-1-mmyangfl@gmail.com> References: <20230303151417.104321-1-mmyangfl@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1759360411257564993?= X-GMAIL-MSGID: =?utf-8?q?1759360411257564993?= These are inner clocks for Hi3798MV100, but not exist on Hi3798CV200. Signed-off-by: David Yang --- drivers/clk/hisilicon/crg-hi3798.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c index f834805d7..791d39e6a 100644 --- a/drivers/clk/hisilicon/crg-hi3798.c +++ b/drivers/clk/hisilicon/crg-hi3798.c @@ -36,6 +36,9 @@ #define HI3798_FIXED_166P5M 84 #define HI3798_SDIO0_MUX 85 #define HI3798_COMBPHY0_MUX 86 +#define HI3798_FIXED_3M 87 +#define HI3798_FIXED_15M 88 +#define HI3798_FIXED_83P3M 89 #define HI3798_CRG_NR_CLKS 128 @@ -43,13 +46,16 @@ 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, }, + { HI3798_FIXED_3M, "3m", NULL, 0, 3000000, }, { HI3798_FIXED_12M, "12m", NULL, 0, 12000000, }, + { HI3798_FIXED_15M, "15m", NULL, 0, 15000000, }, { 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_83P3M, "83p3m", NULL, 0, 83333333, }, { HI3798_FIXED_100M, "100m", NULL, 0, 100000000, }, { HI3798_FIXED_150M, "150m", NULL, 0, 150000000, }, { HI3798_FIXED_166P5M, "166p5m", NULL, 0, 165000000, }, From patchwork Fri Mar 3 15:14:13 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yangfl X-Patchwork-Id: 63977 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:5915:0:0:0:0:0 with SMTP id v21csp467824wrd; Fri, 3 Mar 2023 07:23:10 -0800 (PST) X-Google-Smtp-Source: AK7set9Lm+r/g6yG6TDWiU988MFGpDGiDzjrpeAzYTJ1l0bE6LQGb3bCsoQGmPSoDCckGWHmg2QU X-Received: by 2002:aa7:c2d7:0:b0:4ab:4d55:6f74 with SMTP id m23-20020aa7c2d7000000b004ab4d556f74mr2629331edp.13.1677856990296; Fri, 03 Mar 2023 07:23:10 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1677856990; cv=none; d=google.com; s=arc-20160816; b=LcFUGdrDjIU4kebo4JPatu8ogX6wmxd+GixGmzGJBmUfKn2I3lVVO3J5j+/HGuMoBL E2uLQxtdisTgEQD8itnhDxxarvpIz2qXpPzy0ioAwgsjNYVi86PUBP7lk4BJIAG1jjWQ 5YEGTPrfnV9S30KEFEcQLCG3usGFC1AUaQi54pEWScCjrihDV4Lv+NH1vlgV8pfPGhXD WpNqbA9Xpv2ZK3iZn599BIxOV1sJ9frnWt9nS+hcJ3Ke6Qw0NvOfSm35NfptaCUYuwSz jiHe+dR/+zBY7POMyC3vsH2GQZ2GFyVsMAm3v+Taxl/06JQWMM6cz7HcfUIAqgUabTfn SM3w== 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=RrMn0SwpKPyx8iIIWVBsxNdVCt1aGQBV4CeIy3b7rNQ=; b=DnKNY6127CA7Ga0aeJycxJl+vqYjrPp5pZqJGhkHmxuY4rWxXi9YpyLbrCHifSCCn6 1ckUNfGEhrKmea1FSm11JKvvO5D1vmbnoifTUxDadSuv6ikuka4aojmOUcwl/f8JWpzc UL+zOY1pkLOrOierDJlTs6BQAmDV1dmDA+cSDcb+1wJizCoafkT+vPiY1tdEnzZwugV0 5SODkePfCoJEEPtRkjX4UrT/aU1UFyLWYtltsmNhN9Hl4mjr/3atMmjx2XryNdBX6qsv ybTO03ndL5YAREcZR5JrO7kK0XMVFSCPu3TTQKKYSIYJaoo7/n12inzFk9Nr1RK9rLKK 88uQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gmail.com header.s=20210112 header.b=l4rHQ4gt; 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 ml22-20020a170906cc1600b008e1dd2b8defsi2251822ejb.685.2023.03.03.07.22.47; Fri, 03 Mar 2023 07:23:10 -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=@gmail.com header.s=20210112 header.b=l4rHQ4gt; 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 S231405AbjCCPQn (ORCPT + 99 others); Fri, 3 Mar 2023 10:16:43 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:33520 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231483AbjCCPQj (ORCPT ); Fri, 3 Mar 2023 10:16:39 -0500 Received: from mail-pg1-x52f.google.com (mail-pg1-x52f.google.com [IPv6:2607:f8b0:4864:20::52f]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id E5CEE1554D; Fri, 3 Mar 2023 07:16:22 -0800 (PST) Received: by mail-pg1-x52f.google.com with SMTP id q23so1676925pgt.7; Fri, 03 Mar 2023 07:16:22 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; t=1677856582; 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=RrMn0SwpKPyx8iIIWVBsxNdVCt1aGQBV4CeIy3b7rNQ=; b=l4rHQ4gtdLbQ/zBuqFwiJPRCEHS5Lr226olBxaX5NHNmzQseDCUqI6Y68JKinig4lb 0yflUxs5MAfAbwHhjaBRR9EBvNTyiwwcR1Ex1DmYO9GLPzROTqPo2t3vy2X1DhgOmfs/ v4GKNE3YTYNnjRFTo+ZmWazPWeSwxeg4wOtnnSVOcALQ8c18ArdeRABSTYsAE/JpkwEE Sd/l08SgVyki2s2og55rOGjLhca+yPUZqt4O58OneNoUPpaI5zAEMIfe6Pf3BUPHm5OI 8aij4WUmjMCpB28fRFYAVqkbUBRekp7mkoMsvrF3br4RmbpZBHOmzoanfgJJrI5ZeJn1 lvnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1677856582; 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=RrMn0SwpKPyx8iIIWVBsxNdVCt1aGQBV4CeIy3b7rNQ=; b=VyLn4wyiMJA4qH7dzlyz8bl5Ws56nD4dTWaOTZLd/+m+DP7v0H59YZO/gRMhse1NFN t7MuAtZWLnuDlp18xVtgEyMpGQZOxbNg3l9pckV5YdiYRoFhXybq1SGL+eALOLj+fwUy eBaIbe50SzquO6bEBGWGiNcM3u43R0+KnPY4RV0bcaxSqlYwkiD2yRPVf9bQBlxDVEae ntkrO9qXMOmOgfBjf1vcBnGrnumyFdTgqRicTgUMSAa1HWz8J/uFYqHpjIrX0hMdhcp/ 2Ci62N+RKsIEdh0R4ofRpBCsPKdJeOPFgW/FdwHxKTDWKqYQ0ZkpVTWYQMwM26QvwJxn PIFg== X-Gm-Message-State: AO0yUKUoFvQuvAuHByIfwXSKb6aRQxpqNHXRezHvWeDoGncvPXogjPPc EEDAYd3PHEK7uAUMKyBfrMM= X-Received: by 2002:aa7:8f30:0:b0:5e8:6839:1f13 with SMTP id y16-20020aa78f30000000b005e868391f13mr2297215pfr.10.1677856582327; Fri, 03 Mar 2023 07:16:22 -0800 (PST) Received: from y.ha.lan ([104.28.213.199]) by smtp.gmail.com with ESMTPSA id p4-20020aa78604000000b005a8bdc18453sm1739721pfn.35.2023.03.03.07.16.17 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 03 Mar 2023 07:16:21 -0800 (PST) From: David Yang To: mmyangfl@gmail.com Cc: Michael Turquette , Stephen Boyd , Rob Herring , Krzysztof Kozlowski , linux-clk@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 5/5] clk: hisilicon: Add CRG driver for Hi3798MV100 SoC Date: Fri, 3 Mar 2023 23:14:13 +0800 Message-Id: <20230303151417.104321-6-mmyangfl@gmail.com> X-Mailer: git-send-email 2.39.1 In-Reply-To: <20230303151417.104321-1-mmyangfl@gmail.com> References: <20230303151417.104321-1-mmyangfl@gmail.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,FREEMAIL_FROM, RCVD_IN_DNSWL_NONE,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?1759360571423588762?= X-GMAIL-MSGID: =?utf-8?q?1759360571423588762?= Add CRG driver for Hi3798MV100 SoC. CRG (Clock and Reset Generator) module generates clock and reset signals used by other module blocks on SoC. Signed-off-by: David Yang --- .../devicetree/bindings/clock/hisi-crg.txt | 2 + drivers/clk/hisilicon/crg-hi3798.c | 193 ++++++++++++++++-- include/dt-bindings/clock/histb-clock.h | 11 + 3 files changed, 192 insertions(+), 14 deletions(-) diff --git a/Documentation/devicetree/bindings/clock/hisi-crg.txt b/Documentation/devicetree/bindings/clock/hisi-crg.txt index cc60b3d42..972c038c8 100644 --- a/Documentation/devicetree/bindings/clock/hisi-crg.txt +++ b/Documentation/devicetree/bindings/clock/hisi-crg.txt @@ -13,6 +13,8 @@ Required Properties: - "hisilicon,hi3516cv300-crg" - "hisilicon,hi3516cv300-sysctrl" - "hisilicon,hi3519-crg" + - "hisilicon,hi3798mv100-crg" + - "hisilicon,hi3798mv100-sysctrl" - "hisilicon,hi3798cv200-crg" - "hisilicon,hi3798cv200-sysctrl" diff --git a/drivers/clk/hisilicon/crg-hi3798.c b/drivers/clk/hisilicon/crg-hi3798.c index 791d39e6a..095009c91 100644 --- a/drivers/clk/hisilicon/crg-hi3798.c +++ b/drivers/clk/hisilicon/crg-hi3798.c @@ -27,6 +27,7 @@ #define HI3798_FIXED_300M 73 #define HI3798_FIXED_400M 74 #define HI3798_MMC_MUX 75 +#define HI3798_ETH_MUX 77 #define HI3798_ETH_BUS0_CLK 78 #define HI3798_ETH_BUS1_CLK 79 #define HI3798_COMBPHY1_MUX 80 @@ -179,6 +180,178 @@ static void hi3798_sysctrl_clk_unregister( hisi_clk_unregister_gate(clks->gate_clks, clks->gate_clks_nums, crg->clk_data); } +/* hi3798MV100 */ + +static const char *const hi3798mv100_mmc_mux_p[] = { + "75m", "100m", "50m", "15m" }; +static u32 hi3798mv100_mmc_mux_table[] = {0, 1, 2, 3}; + +static const char *const hi3798mv100_eth_mux_p[] = { + "83p3m" }; +static u32 hi3798mv100_eth_mux_table[] = {2}; + +static struct hisi_mux_clock hi3798mv100_mux_clks[] = { + { HI3798_MMC_MUX, "mmc_mux", hi3798mv100_mmc_mux_p, + ARRAY_SIZE(hi3798mv100_mmc_mux_p), CLK_SET_RATE_PARENT, + 0xa0, 8, 2, 0, hi3798mv100_mmc_mux_table, }, + { HI3798_SDIO0_MUX, "sdio0_mux", hi3798mv100_mmc_mux_p, + ARRAY_SIZE(hi3798mv100_mmc_mux_p), CLK_SET_RATE_PARENT, + 0x9c, 8, 2, 0, hi3798mv100_mmc_mux_table, }, + { HI3798_ETH_MUX, "eth_mux", hi3798mv100_eth_mux_p, + ARRAY_SIZE(hi3798mv100_eth_mux_p), CLK_SET_RATE_PARENT, + 0xcc, 2, 2, 0, hi3798mv100_eth_mux_table, }, +}; + +static u32 mmc_phase_regvals[] = {0, 1, 2, 3, 4, 5, 6, 7}; +static u32 mmc_phase_degrees[] = {0, 45, 90, 135, 180, 225, 270, 315}; + +static struct hisi_phase_clock hi3798mv100_phase_clks[] = { + { HISTB_MMC_SAMPLE_CLK, "mmc_sample", "clk_mmc_ciu", + CLK_SET_RATE_PARENT, 0xa0, 12, 3, mmc_phase_degrees, + mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) }, + { HISTB_MMC_DRV_CLK, "mmc_drive", "clk_mmc_ciu", + CLK_SET_RATE_PARENT, 0xa0, 16, 3, mmc_phase_degrees, + mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) }, +}; + +static const struct hisi_gate_clock hi3798mv100_gate_clks[] = { + /* NAND */ + { HISTB_NAND_CLK, "clk_nand", "clk_apb", + CLK_SET_RATE_PARENT, 0x60, 0, 0, }, + /* UART */ + { HISTB_UART1_CLK, "clk_uart1", "3m", + CLK_SET_RATE_PARENT, 0x68, 0, 0, }, + { HISTB_UART2_CLK, "clk_uart2", "83p3m", + CLK_SET_RATE_PARENT, 0x68, 4, 0, }, + /* I2C */ + { HISTB_I2C0_CLK, "clk_i2c0", "clk_apb", + CLK_SET_RATE_PARENT, 0x6C, 4, 0, }, + { HISTB_I2C1_CLK, "clk_i2c1", "clk_apb", + CLK_SET_RATE_PARENT, 0x6C, 8, 0, }, + { HISTB_I2C2_CLK, "clk_i2c2", "clk_apb", + CLK_SET_RATE_PARENT, 0x6C, 12, 0, }, + /* SPI */ + { HISTB_SPI0_CLK, "clk_spi0", "clk_apb", + CLK_SET_RATE_PARENT, 0x70, 0, 0, }, + /* SDIO */ + { HISTB_SDIO0_BIU_CLK, "clk_sdio0_biu", "200m", + CLK_SET_RATE_PARENT, 0x9c, 0, 0, }, + { HISTB_SDIO0_CIU_CLK, "clk_sdio0_ciu", "sdio0_mux", + CLK_SET_RATE_PARENT, 0x9c, 1, 0, }, + /* EMMC */ + { HISTB_MMC_BIU_CLK, "clk_mmc_biu", "200m", + CLK_SET_RATE_PARENT, 0xa0, 0, 0, }, + { HISTB_MMC_CIU_CLK, "clk_mmc_ciu", "mmc_mux", + CLK_SET_RATE_PARENT, 0xa0, 1, 0, }, + /* Ethernet */ + { HISTB_ETH_BUS_CLK, "clk_bus", NULL, + CLK_SET_RATE_PARENT, 0xcc, 0, 0, }, + { HISTB_ETH_PUB_CLK, "clk_pub", "eth_mux", + CLK_SET_RATE_PARENT, 0xcc, 1, 0, }, + /* USB2 */ + { HISTB_USB2_BUS_CLK, "clk_u2_bus", "clk_ahb", + CLK_SET_RATE_PARENT, 0xb8, 0, 0, }, + { HISTB_USB2_PHY_CLK, "clk_u2_phy", "60m", + CLK_SET_RATE_PARENT, 0xb8, 4, 0, }, + { HISTB_USB2_12M_CLK, "clk_u2_12m", "12m", + CLK_SET_RATE_PARENT, 0xb8, 2, 0 }, + { HISTB_USB2_48M_CLK, "clk_u2_48m", "48m", + CLK_SET_RATE_PARENT, 0xb8, 1, 0 }, + { HISTB_USB2_UTMI_CLK, "clk_u2_utmi", "60m", + CLK_SET_RATE_PARENT, 0xb8, 5, 0 }, + { HISTB_USB2_UTMI_CLK1, "clk_u2_utmi1", "60m", + CLK_SET_RATE_PARENT, 0xb8, 6, 0 }, + { HISTB_USB2_OTG_UTMI_CLK, "clk_u2_otg_utmi", "60m", + CLK_SET_RATE_PARENT, 0xb8, 3, 0 }, + { HISTB_USB2_PHY1_REF_CLK, "clk_u2_phy1_ref", "24m", + CLK_SET_RATE_PARENT, 0xbc, 0, 0 }, + { HISTB_USB2_PHY2_REF_CLK, "clk_u2_phy2_ref", "24m", + CLK_SET_RATE_PARENT, 0xbc, 2, 0 }, + /* USB2 2 */ + { HISTB_USB2_2_BUS_CLK, "clk_u2_2_bus", "clk_ahb", + CLK_SET_RATE_PARENT, 0x198, 0, 0, }, + { HISTB_USB2_2_PHY_CLK, "clk_u2_2_phy", "60m", + CLK_SET_RATE_PARENT, 0x198, 4, 0, }, + { HISTB_USB2_2_12M_CLK, "clk_u2_2_12m", "12m", + CLK_SET_RATE_PARENT, 0x198, 2, 0 }, + { HISTB_USB2_2_48M_CLK, "clk_u2_2_48m", "48m", + CLK_SET_RATE_PARENT, 0x198, 1, 0 }, + { HISTB_USB2_2_UTMI_CLK, "clk_u2_2_utmi", "60m", + CLK_SET_RATE_PARENT, 0x198, 5, 0 }, + { HISTB_USB2_2_UTMI_CLK1, "clk_u2_2_utmi1", "60m", + CLK_SET_RATE_PARENT, 0x198, 6, 0 }, + { HISTB_USB2_2_OTG_UTMI_CLK, "clk_u2_2_otg_utmi", "60m", + CLK_SET_RATE_PARENT, 0x198, 3, 0 }, + { HISTB_USB2_2_PHY1_REF_CLK, "clk_u2_2_phy1_ref", "24m", + CLK_SET_RATE_PARENT, 0x190, 0, 0 }, + { HISTB_USB2_2_PHY2_REF_CLK, "clk_u2_2_phy2_ref", "24m", + CLK_SET_RATE_PARENT, 0x190, 2, 0 }, + /* USB3 */ + { HISTB_USB3_BUS_CLK, "clk_u3_bus", NULL, + CLK_SET_RATE_PARENT, 0xb0, 0, 0 }, + { HISTB_USB3_UTMI_CLK, "clk_u3_utmi", NULL, + CLK_SET_RATE_PARENT, 0xb0, 4, 0 }, + { HISTB_USB3_PIPE_CLK, "clk_u3_pipe", NULL, + CLK_SET_RATE_PARENT, 0xb0, 3, 0 }, + { HISTB_USB3_SUSPEND_CLK, "clk_u3_suspend", NULL, + CLK_SET_RATE_PARENT, 0xb0, 2, 0 }, +}; + +static const struct hi3798_crg_clks hi3798mv100_crg_clks_data = { + .phase_clks = hi3798mv100_phase_clks, + .phase_clks_nums = ARRAY_SIZE(hi3798mv100_phase_clks), + .mux_clks = hi3798mv100_mux_clks, + .mux_clks_nums = ARRAY_SIZE(hi3798mv100_mux_clks), + .gate_clks = hi3798mv100_gate_clks, + .gate_clks_nums = ARRAY_SIZE(hi3798mv100_gate_clks), +}; + +static struct hisi_clock_data *hi3798mv100_clk_register( + struct platform_device *pdev) +{ + return hi3798_clk_register(pdev, &hi3798mv100_crg_clks_data); +} + +static void hi3798mv100_clk_unregister(struct platform_device *pdev) +{ + hi3798_clk_unregister(pdev, &hi3798mv100_crg_clks_data); +} + +static const struct hisi_crg_funcs hi3798mv100_crg_funcs = { + .register_clks = hi3798mv100_clk_register, + .unregister_clks = hi3798mv100_clk_unregister, +}; + +static const struct hisi_gate_clock hi3798mv100_sysctrl_gate_clks[] = { + { HISTB_IR_CLK, "clk_ir", "24m", + CLK_SET_RATE_PARENT, 0x48, 4, 0, }, + { HISTB_TIMER01_CLK, "clk_timer01", "24m", + CLK_SET_RATE_PARENT, 0x48, 6, 0, }, + { HISTB_UART0_CLK, "clk_uart0", "83p3m", + CLK_SET_RATE_PARENT, 0x48, 12, 0, }, +}; + +static const struct hi3798_sysctrl_clks hi3798mv100_sysctrl_clks_data = { + .gate_clks = hi3798mv100_sysctrl_gate_clks, + .gate_clks_nums = ARRAY_SIZE(hi3798mv100_sysctrl_gate_clks), +}; + +static struct hisi_clock_data *hi3798mv100_sysctrl_clk_register( + struct platform_device *pdev) +{ + return hi3798_sysctrl_clk_register(pdev, &hi3798mv100_sysctrl_clks_data); +} + +static void hi3798mv100_sysctrl_clk_unregister(struct platform_device *pdev) +{ + hi3798_sysctrl_clk_unregister(pdev, &hi3798mv100_sysctrl_clks_data); +} + +static const struct hisi_crg_funcs hi3798mv100_sysctrl_funcs = { + .register_clks = hi3798mv100_sysctrl_clk_register, + .unregister_clks = hi3798mv100_sysctrl_clk_unregister, +}; + /* hi3798CV200 */ static const char *const hi3798cv200_mmc_mux_p[] = { @@ -208,18 +381,6 @@ static struct hisi_mux_clock hi3798cv200_mux_clks[] = { 0x9c, 8, 2, 0, hi3798cv200_sdio_mux_table, }, }; -static u32 mmc_phase_regvals[] = {0, 1, 2, 3, 4, 5, 6, 7}; -static u32 mmc_phase_degrees[] = {0, 45, 90, 135, 180, 225, 270, 315}; - -static struct hisi_phase_clock hi3798cv200_phase_clks[] = { - { HISTB_MMC_SAMPLE_CLK, "mmc_sample", "clk_mmc_ciu", - CLK_SET_RATE_PARENT, 0xa0, 12, 3, mmc_phase_degrees, - mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) }, - { HISTB_MMC_DRV_CLK, "mmc_drive", "clk_mmc_ciu", - CLK_SET_RATE_PARENT, 0xa0, 16, 3, mmc_phase_degrees, - mmc_phase_regvals, ARRAY_SIZE(mmc_phase_regvals) }, -}; - static const struct hisi_gate_clock hi3798cv200_gate_clks[] = { /* UART */ { HISTB_UART2_CLK, "clk_uart2", "75m", @@ -317,8 +478,8 @@ static const struct hisi_gate_clock hi3798cv200_gate_clks[] = { }; static const struct hi3798_crg_clks hi3798cv200_crg_clks_data = { - .phase_clks = hi3798cv200_phase_clks, - .phase_clks_nums = ARRAY_SIZE(hi3798cv200_phase_clks), + .phase_clks = hi3798mv100_phase_clks, + .phase_clks_nums = ARRAY_SIZE(hi3798mv100_phase_clks), .mux_clks = hi3798cv200_mux_clks, .mux_clks_nums = ARRAY_SIZE(hi3798cv200_mux_clks), .gate_clks = hi3798cv200_gate_clks, @@ -372,6 +533,10 @@ static const struct hisi_crg_funcs hi3798cv200_sysctrl_funcs = { }; static const struct of_device_id hi3798_crg_match_table[] = { + { .compatible = "hisilicon,hi3798mv100-crg", + .data = &hi3798mv100_crg_funcs }, + { .compatible = "hisilicon,hi3798mv100-sysctrl", + .data = &hi3798mv100_sysctrl_funcs }, { .compatible = "hisilicon,hi3798cv200-crg", .data = &hi3798cv200_crg_funcs }, { .compatible = "hisilicon,hi3798cv200-sysctrl", diff --git a/include/dt-bindings/clock/histb-clock.h b/include/dt-bindings/clock/histb-clock.h index ed47c43c3..4fbf86e75 100644 --- a/include/dt-bindings/clock/histb-clock.h +++ b/include/dt-bindings/clock/histb-clock.h @@ -60,6 +60,17 @@ #define HISTB_USB3_SUSPEND_CLK1 50 #define HISTB_ETH_PUB_CLK 51 #define HISTB_ETH_BUS_CLK 52 +#define HISTB_USB2_UTMI_CLK1 53 +#define HISTB_NAND_CLK 54 +#define HISTB_USB2_2_BUS_CLK 55 +#define HISTB_USB2_2_PHY_CLK 56 +#define HISTB_USB2_2_UTMI_CLK 57 +#define HISTB_USB2_2_UTMI_CLK1 58 +#define HISTB_USB2_2_12M_CLK 59 +#define HISTB_USB2_2_48M_CLK 60 +#define HISTB_USB2_2_OTG_UTMI_CLK 61 +#define HISTB_USB2_2_PHY1_REF_CLK 62 +#define HISTB_USB2_2_PHY2_REF_CLK 63 /* clocks provided by mcu CRG */ #define HISTB_MCE_CLK 1