From patchwork Tue Dec 26 05:38:33 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sia Jee Heng X-Patchwork-Id: 13504780 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB7DEC46CD4 for ; Tue, 26 Dec 2023 05:39:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:CC:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=xzAzh7Ib4HxEQq48o+GYazegw6qfqCyVQi/9LcMAo1Q=; b=mCUpAL+MOE5kTD uvLl1LAIwufeRo+v6AJO99efNhPjgdTmsC9TVmw2TxxV9etCRwJriBOLj0nhPTFennI2RFYR9FyJe jJRHSQPPCyZLvAWb0eaNd1Frov7WBEvqoTyxeI/19dMrXVehHa1OnB2tY8F6OB9rqgOXdIG8XT0NG w/g3ZnTqs7Xi1mnYY10IfPwKFaTxGJ7EGp2dgupeh0ceBIF9Gy2quQ5eA67YjRqyAn7hLR0AiIvNP ZI7J//1hiTzlVdQtjtKvSRDfEFE9ir1c1W/fImlbQEGx7y6mddWr+9IEkemxwnuZAfE57pm931PRD DaQx0LBhlbcvilPIl7xQ==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rI0AU-00Biws-08; Tue, 26 Dec 2023 05:39:54 +0000 Received: from ex01.ufhost.com ([61.152.239.75]) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rI0AQ-00BiqK-13 for linux-riscv@lists.infradead.org; Tue, 26 Dec 2023 05:39:52 +0000 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 ex01.ufhost.com (Postfix) with ESMTP id 7370924E28F; Tue, 26 Dec 2023 13:39:09 +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:09 +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:03 +0800 From: Sia Jee Heng To: , , , , , , , , , , , , CC: , , , , , Subject: [RFC 01/16] reset: starfive: Rename file name "jh71x0" to "common" Date: Tue, 26 Dec 2023 13:38:33 +0800 Message-ID: <20231226053848.25089-2-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> MIME-Version: 1.0 X-Originating-IP: [202.188.176.82] X-ClientProxiedBy: EXCAS064.cuchost.com (172.16.6.24) To EXMBX066.cuchost.com (172.16.6.66) X-YovoleRuleAgent: yovoleflag X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231225_213950_669163_B76FB776 X-CRM114-Status: GOOD ( 11.67 ) X-BeenThere: linux-riscv@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org 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/clk-starfive-jh7110-sys.c | 2 +- drivers/reset/starfive/Kconfig | 6 +++--- drivers/reset/starfive/Makefile | 2 +- .../{reset-starfive-jh71x0.c => reset-starfive-common.c} | 4 ++-- .../{reset-starfive-jh71x0.h => reset-starfive-common.h} | 6 +++--- drivers/reset/starfive/reset-starfive-jh7100.c | 2 +- drivers/reset/starfive/reset-starfive-jh7110.c | 4 ++-- .../{reset-starfive-jh71x0.h => reset-starfive-common.h} | 4 ++-- 8 files changed, 15 insertions(+), 15 deletions(-) rename drivers/reset/starfive/{reset-starfive-jh71x0.c => reset-starfive-common.c} (97%) rename drivers/reset/starfive/{reset-starfive-jh71x0.h => reset-starfive-common.h} (75%) rename include/soc/starfive/{reset-starfive-jh71x0.h => reset-starfive-common.h} (81%) diff --git a/drivers/clk/starfive/clk-starfive-jh7110-sys.c b/drivers/clk/starfive/clk-starfive-jh7110-sys.c index 3884eff9fe93..6e45c580c9ba 100644 --- a/drivers/clk/starfive/clk-starfive-jh7110-sys.c +++ b/drivers/clk/starfive/clk-starfive-jh7110-sys.c @@ -14,7 +14,7 @@ #include #include -#include +#include #include diff --git a/drivers/reset/starfive/Kconfig b/drivers/reset/starfive/Kconfig index d832339f61bc..29fbcf1a7d83 100644 --- a/drivers/reset/starfive/Kconfig +++ b/drivers/reset/starfive/Kconfig @@ -1,12 +1,12 @@ # SPDX-License-Identifier: GPL-2.0-only -config RESET_STARFIVE_JH71X0 +config RESET_STARFIVE_COMMON bool config RESET_STARFIVE_JH7100 bool "StarFive JH7100 Reset Driver" depends on ARCH_STARFIVE || COMPILE_TEST - select RESET_STARFIVE_JH71X0 + select RESET_STARFIVE_COMMON default ARCH_STARFIVE help This enables the reset controller driver for the StarFive JH7100 SoC. @@ -15,7 +15,7 @@ config RESET_STARFIVE_JH7110 bool "StarFive JH7110 Reset Driver" depends on CLK_STARFIVE_JH7110_SYS select AUXILIARY_BUS - select RESET_STARFIVE_JH71X0 + select RESET_STARFIVE_COMMON default ARCH_STARFIVE help This enables the reset controller driver for the StarFive JH7110 SoC. diff --git a/drivers/reset/starfive/Makefile b/drivers/reset/starfive/Makefile index 7a44b66fb9d5..582e4c160bd4 100644 --- a/drivers/reset/starfive/Makefile +++ b/drivers/reset/starfive/Makefile @@ -1,5 +1,5 @@ # SPDX-License-Identifier: GPL-2.0 -obj-$(CONFIG_RESET_STARFIVE_JH71X0) += reset-starfive-jh71x0.o +obj-$(CONFIG_RESET_STARFIVE_COMMON) += reset-starfive-common.o obj-$(CONFIG_RESET_STARFIVE_JH7100) += reset-starfive-jh7100.o obj-$(CONFIG_RESET_STARFIVE_JH7110) += reset-starfive-jh7110.o diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.c b/drivers/reset/starfive/reset-starfive-common.c similarity index 97% rename from drivers/reset/starfive/reset-starfive-jh71x0.c rename to drivers/reset/starfive/reset-starfive-common.c index 55bbbd2de52c..dab454e46bbf 100644 --- a/drivers/reset/starfive/reset-starfive-jh71x0.c +++ b/drivers/reset/starfive/reset-starfive-common.c @@ -1,6 +1,6 @@ // SPDX-License-Identifier: GPL-2.0-or-later /* - * Reset driver for the StarFive JH71X0 SoCs + * Reset driver for the StarFive SoCs * * Copyright (C) 2021 Emil Renner Berthing */ @@ -12,7 +12,7 @@ #include #include -#include "reset-starfive-jh71x0.h" +#include "reset-starfive-common.h" struct jh71x0_reset { struct reset_controller_dev rcdev; diff --git a/drivers/reset/starfive/reset-starfive-jh71x0.h b/drivers/reset/starfive/reset-starfive-common.h similarity index 75% rename from drivers/reset/starfive/reset-starfive-jh71x0.h rename to drivers/reset/starfive/reset-starfive-common.h index db7d39a87f87..266acc4b2caf 100644 --- a/drivers/reset/starfive/reset-starfive-jh71x0.h +++ b/drivers/reset/starfive/reset-starfive-common.h @@ -3,12 +3,12 @@ * Copyright (C) 2021 Emil Renner Berthing */ -#ifndef __RESET_STARFIVE_JH71X0_H -#define __RESET_STARFIVE_JH71X0_H +#ifndef __RESET_STARFIVE_COMMON_H +#define __RESET_STARFIVE_COMMON_H int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_node, void __iomem *assert, void __iomem *status, const u32 *asserted, unsigned int nr_resets, struct module *owner); -#endif /* __RESET_STARFIVE_JH71X0_H */ +#endif /* __RESET_STARFIVE_COMMON_H */ diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c index 2a56f7fd4ba7..546dea2e5811 100644 --- a/drivers/reset/starfive/reset-starfive-jh7100.c +++ b/drivers/reset/starfive/reset-starfive-jh7100.c @@ -8,7 +8,7 @@ #include #include -#include "reset-starfive-jh71x0.h" +#include "reset-starfive-common.h" #include diff --git a/drivers/reset/starfive/reset-starfive-jh7110.c b/drivers/reset/starfive/reset-starfive-jh7110.c index 29a43f0f2ad6..87dba01491ae 100644 --- a/drivers/reset/starfive/reset-starfive-jh7110.c +++ b/drivers/reset/starfive/reset-starfive-jh7110.c @@ -7,9 +7,9 @@ #include -#include +#include -#include "reset-starfive-jh71x0.h" +#include "reset-starfive-common.h" #include diff --git a/include/soc/starfive/reset-starfive-jh71x0.h b/include/soc/starfive/reset-starfive-common.h similarity index 81% rename from include/soc/starfive/reset-starfive-jh71x0.h rename to include/soc/starfive/reset-starfive-common.h index 47b486ececc5..56d8f413cf18 100644 --- a/include/soc/starfive/reset-starfive-jh71x0.h +++ b/include/soc/starfive/reset-starfive-common.h @@ -1,6 +1,6 @@ /* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __SOC_STARFIVE_RESET_JH71X0_H -#define __SOC_STARFIVE_RESET_JH71X0_H +#ifndef __SOC_STARFIVE_RESET_COMMON_H +#define __SOC_STARFIVE_RESET_COMMON_H #include #include