From patchwork Tue Dec 26 05:38:35 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: JeeHeng Sia X-Patchwork-Id: 183257 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:6f82:b0:100:9c79:88ff with SMTP id tb2csp695144dyb; Mon, 25 Dec 2023 21:40:53 -0800 (PST) X-Google-Smtp-Source: AGHT+IGMmzCVVVzu6HuM39mQXIwRM2u5X6LzZHH52SwXS/tqI/QbT0RJ+JoE+mSNv7IedarthFMv X-Received: by 2002:a17:90a:3002:b0:28c:42c8:7fbf with SMTP id g2-20020a17090a300200b0028c42c87fbfmr587617pjb.29.1703569253084; Mon, 25 Dec 2023 21:40:53 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1703569253; cv=none; d=google.com; s=arc-20160816; b=QGn1z6nSDoXDjTAfR/BY4Swh6Yljef410E3UqRZhp8MtBn/Pp4tU5E2Zoa1P+6/caQ oCzGDoefEsEZRIuf/6ft/cN5W45DkjRe9RI0Fi4cZQjINxbBdPxTzWoo33APa8dqXj4e 12w97zU0nG3lN+zZZXIlYpOYmRKXemXn1T4XhASC98VMI+nc7KHKFao58ozZ2CT40IWK AUk6gEEOLv1mOH0EAOppTqRIdTBn1Zl5Rt7XYX1HHheNMbcL5caCvSKaqQckTFSsCTf5 /oLpyEWcGjxoKIVcHJ35OyAK+6VVb6iWqFiM6pqhnihAPZMjFVsg2HL+d3l/u7obl1Bs 8F7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from; bh=BU+GNXNW3Ocf2p7ptbhgqIsrB84Ecslc0z9jZllT8o4=; fh=nAnTSeHk7ZG6JaVuKwLyTGDSWDb/q5GiASFSvBr1exo=; b=zBJc5RKUvNQbqw1K0J0bA41DKirlV6R87yWAKSpVJGpYq82BoYM6nHwQqwRLFBNjDd 5WyTAkPGPcMbgeL+pNeu+5/lToR6ZbSwbkxKpS1co3EVQQ00RLBSMsvsfF5bdfyxc0k+ SvOnujyM9w6I3jnn+lzKdra2vscA3unGnRcq9lsb76TGlJtTvgysXNbDeGbKgmYEfmPG pmx0CxtOMWzDarViQWNFqwsde5XZSpWauenjQKEaaV8cca0e6PNCSKOu/xP82lIt9Lf4 uFQGlmC4iLfcUxVVp6T1oZXvBALTd2Tjf5+V3muJ45I2Yj++6tchzsrf7p0v1q7lJopo MX+Q== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-11360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11360-ouuuleilei=gmail.com@vger.kernel.org" Received: from sv.mirrors.kernel.org (sv.mirrors.kernel.org. [2604:1380:45e3:2400::1]) by mx.google.com with ESMTPS id u8-20020a17090a4bc800b0028c147a15f5si6103541pjl.17.2023.12.25.21.40.52 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 25 Dec 2023 21:40:53 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-11360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) client-ip=2604:1380:45e3:2400::1; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel+bounces-11360-ouuuleilei=gmail.com@vger.kernel.org designates 2604:1380:45e3:2400::1 as permitted sender) smtp.mailfrom="linux-kernel+bounces-11360-ouuuleilei=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sv.mirrors.kernel.org (Postfix) with ESMTPS id CEFA6280FBA for ; Tue, 26 Dec 2023 05:40:52 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 1FE954CB2C; Tue, 26 Dec 2023 05:39:44 +0000 (UTC) X-Original-To: linux-kernel@vger.kernel.org Received: from fd01.gateway.ufhost.com (fd01.gateway.ufhost.com [61.152.239.71]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 82D444B5AD; Tue, 26 Dec 2023 05:39:37 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=starfivetech.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=starfivetech.com Received: from EXMBX165.cuchost.com (unknown [175.102.18.54]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "EXMBX165", Issuer "EXMBX165" (not verified)) by fd01.gateway.ufhost.com (Postfix) with ESMTP id B98868043; Tue, 26 Dec 2023 13:39:22 +0800 (CST) Received: from EXMBX066.cuchost.com (172.16.7.66) by EXMBX165.cuchost.com (172.16.6.75) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Tue, 26 Dec 2023 13:39:22 +0800 Received: from jsia-virtual-machine.localdomain (202.188.176.82) by EXMBX066.cuchost.com (172.16.6.66) with Microsoft SMTP Server (TLS) id 15.0.1497.42; Tue, 26 Dec 2023 13:39:16 +0800 From: Sia Jee Heng To: , , , , , , , , , , , , CC: , , , , , Subject: [RFC 03/16] clk: starfive: Rename file name "jh71x0" to "common" Date: Tue, 26 Dec 2023 13:38:35 +0800 Message-ID: <20231226053848.25089-4-jeeheng.sia@starfivetech.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20231226053848.25089-1-jeeheng.sia@starfivetech.com> References: <20231226053848.25089-1-jeeheng.sia@starfivetech.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-ClientProxiedBy: EXCAS064.cuchost.com (172.16.6.24) To EXMBX066.cuchost.com (172.16.6.66) X-YovoleRuleAgent: yovoleflag X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1786321833046220499 X-GMAIL-MSGID: 1786321833046220499 StarFive JH8100 shares a similar clock and reset design with JH7110. To facilitate the reuse of the file and its functionalities, files containing the "jh71x0" naming convention are renamed to use the "common" wording. Signed-off-by: Sia Jee Heng Reviewed-by: Ley Foon Tan Reviewed-by: Emil Renner Berthing --- drivers/clk/starfive/Kconfig | 8 ++++---- drivers/clk/starfive/Makefile | 2 +- .../{clk-starfive-jh71x0.c => clk-starfive-common.c} | 4 ++-- .../{clk-starfive-jh71x0.h => clk-starfive-common.h} | 4 ++-- drivers/clk/starfive/clk-starfive-jh7100-audio.c | 2 +- drivers/clk/starfive/clk-starfive-jh7100.c | 2 +- drivers/clk/starfive/clk-starfive-jh7110.h | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) rename drivers/clk/starfive/{clk-starfive-jh71x0.c => clk-starfive-common.c} (99%) rename drivers/clk/starfive/{clk-starfive-jh71x0.h => clk-starfive-common.h} (97%) diff --git a/drivers/clk/starfive/Kconfig b/drivers/clk/starfive/Kconfig index bd29358ffeec..ff8eace36e64 100644 --- a/drivers/clk/starfive/Kconfig +++ b/drivers/clk/starfive/Kconfig @@ -1,12 +1,12 @@ # SPDX-License-Identifier: GPL-2.0 -config CLK_STARFIVE_JH71X0 +config CLK_STARFIVE_COMMON bool config CLK_STARFIVE_JH7100 bool "StarFive JH7100 clock support" depends on ARCH_STARFIVE || COMPILE_TEST - select CLK_STARFIVE_JH71X0 + select CLK_STARFIVE_COMMON default ARCH_STARFIVE help Say yes here to support the clock controller on the StarFive JH7100 @@ -15,7 +15,7 @@ config CLK_STARFIVE_JH7100 config CLK_STARFIVE_JH7100_AUDIO tristate "StarFive JH7100 audio clock support" depends on CLK_STARFIVE_JH7100 - select CLK_STARFIVE_JH71X0 + select CLK_STARFIVE_COMMON default m if ARCH_STARFIVE help Say Y or M here to support the audio clocks on the StarFive JH7100 @@ -33,7 +33,7 @@ config CLK_STARFIVE_JH7110_SYS bool "StarFive JH7110 system clock support" depends on ARCH_STARFIVE || COMPILE_TEST select AUXILIARY_BUS - select CLK_STARFIVE_JH71X0 + select CLK_STARFIVE_COMMON select RESET_STARFIVE_JH7110 if RESET_CONTROLLER select CLK_STARFIVE_JH7110_PLL default ARCH_STARFIVE diff --git a/drivers/clk/starfive/Makefile b/drivers/clk/starfive/Makefile index 199ac0f37a2f..012f7ee83f8e 100644 --- a/drivers/clk/starfive/Makefile +++ b/drivers/clk/starfive/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_CLK_STARFIVE_JH71X0) += clk-starfive-jh71x0.o +obj-$(CONFIG_CLK_STARFIVE_COMMON) += clk-starfive-common.o obj-$(CONFIG_CLK_STARFIVE_JH7100) += clk-starfive-jh7100.o obj-$(CONFIG_CLK_STARFIVE_JH7100_AUDIO) += clk-starfive-jh7100-audio.o diff --git a/drivers/clk/starfive/clk-starfive-jh71x0.c b/drivers/clk/starfive/clk-starfive-common.c similarity index 99% rename from drivers/clk/starfive/clk-starfive-jh71x0.c rename to drivers/clk/starfive/clk-starfive-common.c index aebc99264a0b..a12490c97957 100644 --- a/drivers/clk/starfive/clk-starfive-jh71x0.c +++ b/drivers/clk/starfive/clk-starfive-common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 /* - * StarFive JH71X0 Clock Generator Driver + * StarFive Clock Generator Driver * * Copyright (C) 2021-2022 Emil Renner Berthing */ @@ -10,7 +10,7 @@ #include #include -#include "clk-starfive-jh71x0.h" +#include "clk-starfive-common.h" static struct jh71x0_clk *jh71x0_clk_from(struct clk_hw *hw) { diff --git a/drivers/clk/starfive/clk-starfive-jh71x0.h b/drivers/clk/starfive/clk-starfive-common.h similarity index 97% rename from drivers/clk/starfive/clk-starfive-jh71x0.h rename to drivers/clk/starfive/clk-starfive-common.h index 34bb11c72eb7..1f32f7024e9f 100644 --- a/drivers/clk/starfive/clk-starfive-jh71x0.h +++ b/drivers/clk/starfive/clk-starfive-common.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __CLK_STARFIVE_JH71X0_H -#define __CLK_STARFIVE_JH71X0_H +#ifndef __CLK_STARFIVE_COMMON_H +#define __CLK_STARFIVE_COMMON_H #include #include diff --git a/drivers/clk/starfive/clk-starfive-jh7100-audio.c b/drivers/clk/starfive/clk-starfive-jh7100-audio.c index ee4bda14a40e..dc4c278606d7 100644 --- a/drivers/clk/starfive/clk-starfive-jh7100-audio.c +++ b/drivers/clk/starfive/clk-starfive-jh7100-audio.c @@ -15,7 +15,7 @@ #include -#include "clk-starfive-jh71x0.h" +#include "clk-starfive-common.h" /* external clocks */ #define JH7100_AUDCLK_AUDIO_SRC (JH7100_AUDCLK_END + 0) diff --git a/drivers/clk/starfive/clk-starfive-jh7100.c b/drivers/clk/starfive/clk-starfive-jh7100.c index 69cc11ea7e33..6bb6a6af9f28 100644 --- a/drivers/clk/starfive/clk-starfive-jh7100.c +++ b/drivers/clk/starfive/clk-starfive-jh7100.c @@ -15,7 +15,7 @@ #include -#include "clk-starfive-jh71x0.h" +#include "clk-starfive-common.h" /* external clocks */ #define JH7100_CLK_OSC_SYS (JH7100_CLK_END + 0) diff --git a/drivers/clk/starfive/clk-starfive-jh7110.h b/drivers/clk/starfive/clk-starfive-jh7110.h index 0659adae4d76..6b1bdf860f00 100644 --- a/drivers/clk/starfive/clk-starfive-jh7110.h +++ b/drivers/clk/starfive/clk-starfive-jh7110.h @@ -2,7 +2,7 @@ #ifndef __CLK_STARFIVE_JH7110_H #define __CLK_STARFIVE_JH7110_H -#include "clk-starfive-jh71x0.h" +#include "clk-starfive-common.h" /* top clocks of ISP/VOUT domain from JH7110 SYSCRG */ struct jh7110_top_sysclk {