From mboxrd@z Thu Jan 1 00:00:00 1970 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 C5295CD342F for ; Fri, 8 May 2026 05:38:06 +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=RmCzsseXP2DWnG6eU9XNVSBBqWG9tl4KzRGBoNcQ92c=; b=ZyZGfQBtkSahao 8ZKGAyMX/3dgJsI00a6WH8OW/Qq74pECa0ZJsUU2beMY94N6Ahy2uk1Z2yr0lAaqtu9f9dM2ub7Cx dMrYHtb67dsVxTzmYYlyJ+mx4nKPF/pkbCVu/kaHEcV/YxwoAMRiOP1achPuFUbVyRk9Y0c6UMFI3 AWDmWbRq3esrBCuFFt1HAVus5WWxqzEVtySdHiWpVy+KaK4WIPlkhiu+3lo2NFrWqwm5nJUMQ7Qqd gL+/MB7azhPROI6m27vwCjHhm04cXACL+QKAchG4EJahhvzStwmAyvi57gMwnkJBbffeRYiU/PD8F NLgs9LzJWQAdDdXxMOdA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.99.1 #2 (Red Hat Linux)) id 1wLDto-00000005cXH-2CWe; Fri, 08 May 2026 05:37:20 +0000 Received: from mail-sh0chn02on2124.outbound.protection.partner.outlook.cn ([139.219.146.124] helo=CHN02-SH0-obe.outbound.protection.partner.outlook.cn) by bombadil.infradead.org with esmtps (Exim 4.99.1 #2 (Red Hat Linux)) id 1wLDtl-00000005cU7-3KZO for linux-riscv@lists.infradead.org; Fri, 08 May 2026 05:37:19 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=H19kePfHX/7vJw7WoDHAH6JdONKe13tGS2/b0+7GlFcwRp7P+cAMuTgHZHr7jkToluKWwIht6ePbWV4iTBOCKewCoN7K+ZXaG2ubuvZtEjVC9J1lJy0lwbOEWquvcAIK+UHQDwDFQosZ/eiqyJNEYoS6zlLWjuYZeZ8CtimePS/veb2R8glvjmA77Kii58zukBomsTt1WnOJdK95c7/4h2HiOl8FNPeTQPF4eahwO4ALKQN1lJ916OJKZ3ftd5uI5txLkdNlcT6+G9DyunltBBcrhf8ZfKNTaKvRrMiTOC4XKUcSxeQADIPYGmNHrXa+79kTk90um/nyaBDVoAq+rQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=UwI5pL2oFR1vNqG+G5abCqWUhOQYnZP8zdL331PSWms=; b=UoqOqG+D1iJQS7DvzW50Kg82NPq193MSPV+u63nadDXpjm0juX0mRXP2e0SOi9Z2C/mSD9RAmEpuXf7WWM5nR2tcq9fiNDkLjuHI+g4/kynCEeTY0QE3WXwm6WMJgpACF+UacuGmcjtOxbOwjhs0Qv4blkHLO9TAHyhxBE4CiGnfnPluP2e9+n3ANNd0tLfDI/JyyRibD0sRfivmyqaOh3Vp3fVhbqIlY3AClXEEWjlYYv0w+UC5DBMgl48zErm2A2xYnKHRvS3soiQDT7MrfFQZiI3Vrvxw8xcOZe0bESEnnfFmvvfDYdsB9qACgK/cNxVeIQZOP2sdjI2+rn1R5w== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=starfivetech.com; dmarc=pass action=none header.from=starfivetech.com; dkim=pass header.d=starfivetech.com; arc=none Authentication-Results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=starfivetech.com; Received: from ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:17::6) by ZQ4PR01MB1236.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:14::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.9891.17; Fri, 8 May 2026 05:36:44 +0000 Received: from ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn ([fe80::e7d4:256c:b066:850d]) by ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn ([fe80::e7d4:256c:b066:850d%5]) with mapi id 15.20.9891.019; Fri, 8 May 2026 05:36:44 +0000 From: Changhuang Liang To: Michael Turquette , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Stephen Boyd , Paul Walmsley , Palmer Dabbelt , Albert Ou , Alexandre Ghiti , Philipp Zabel , Emil Renner Berthing , Kees Cook , "Gustavo A . R . Silva" , Richard Cochran Cc: linux-clk@vger.kernel.org, linux-kernel@vger.kernel.org, devicetree@vger.kernel.org, linux-riscv@lists.infradead.org, linux-hardening@vger.kernel.org, netdev@vger.kernel.org, Sia Jee Heng , Hal Feng , Ley Foon Tan , Changhuang Liang Subject: [PATCH v2 02/22] reset: starfive: Convert the word "jh71x0" to "starfive" Date: Thu, 7 May 2026 22:36:12 -0700 Message-Id: <20260508053632.818548-3-changhuang.liang@starfivetech.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20260508053632.818548-1-changhuang.liang@starfivetech.com> References: <20260508053632.818548-1-changhuang.liang@starfivetech.com> X-ClientProxiedBy: NT0PR01CA0035.CHNPR01.prod.partner.outlook.cn (2406:e500:c510:c::12) To ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn (2406:e500:c550:17::6) MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: ZQ4PR01MB1202:EE_|ZQ4PR01MB1236:EE_ X-MS-Office365-Filtering-Correlation-Id: cb2b7024-2343-426a-d506-08deacc3ca09 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam: BCL:0;ARA:13230040|52116014|7416014|376014|366016|1800799024|38350700014|921020|22082099003|18002099003|56012099003; X-Microsoft-Antispam-Message-Info: guJsVaTqcgmMpTwO4y2wWU0ykuzcpa5Inhlf9fmFmYq7mt+VOTqhM9TjhHRCmt+7gIQbqlRFZSoUwhvtT0lQ0vZfLabqcHQxQ62SK2CL3MgPZ1XqWSr5+giVOguuL7sVoWuAU2p2zpiAK8+MTw1v0uN85mN/qIMwcMATWXtIykZYEtXhGWjw6Q2+XGRzJL7rCyzHWVcpaexeGe9weudzSYGxg5w/60qeVR3NLF4D+/H1GdFPymaTAYVJ159uLtvUYRk9QNgp4s1H5dU8GuyJrZjLcSBY5yY2bDYmlPrxojl9Atp25nuT2A+v/9t4w6HyG5Crv1/eJFIT2BjMX5KB91r/yOJLF/DWmxcNl+tf8DgFRnqEBkDmZ5hgkCbRHa8P6q//iTayLHNLSf8cAiaAnlz66o93knl7au+lyUyQF+L0hqcS/tbtnYmN/Lamy9Phiz3qKNG3VtQ8MB7OzPEsKM2npug/IWTumSf3dtLoFeHX9Ueg0f9MJJo7UTaDATn36NqBK6aw7y+Arekp5stLEHV+4pH0BYqG3R0P+hm0yX2OzgUX+Wqf2xu0KKspZ77CAMWwAKtMTCh/whEV5Jegxg== X-Forefront-Antispam-Report: CIP:255.255.255.255;CTRY:;LANG:en;SCL:1;SRV:;IPV:NLI;SFV:NSPM;H:ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn;PTR:;CAT:NONE;SFS:(13230040)(52116014)(7416014)(376014)(366016)(1800799024)(38350700014)(921020)(22082099003)(18002099003)(56012099003);DIR:OUT;SFP:1102; X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AXtWIj3UhfFU4PlkeM3UutGQDg5QMJ+9/L5xI0/rauKbK0b0h4fWiYEcj40T?= =?us-ascii?Q?b5O80aBZeZc1UgbJM6Z3W7mWkuq2MFrRucRfg2mHzedvGygeqZsxKOwKhvth?= =?us-ascii?Q?fEZywXCaTCycdtNrPPXWX5cZ2vSe8M86r1A+0TR/p1mPCmf5mrke/FHn9RxI?= =?us-ascii?Q?GrQ+1qz6ybCio30+aFLhDKh8foSrSnE5HIGlGLAYqPmUwDpiOozRporzoQ2u?= =?us-ascii?Q?cae/oVfy/P0A8Igdsf3ob+nfRY64qtXQHd6y49mKdz2+PObcP4ks9AlnIKfU?= =?us-ascii?Q?EXd0/zTTUY6Efw0Wt0BZBw/5AVhRXtAGDt9Hr2qH43F05CQMQUcCouRoFk+w?= =?us-ascii?Q?rl2t73mh/m9wC+Rsu7E+M6ufXG+b6IIN7zTIBms98d4dg8OHDo+dZi4vjMS+?= =?us-ascii?Q?uW9h2hK9sRnrfcjuWyaVqQ6SKpFZBBaCKqcxe0tnNeDTqncavBxl0Oj0dP2S?= =?us-ascii?Q?R+sfoiTMRg/AZFUxyjIwlKx8WgcHfh5VEB+SY46REERKr2PkvN5TkvVkZ1kg?= =?us-ascii?Q?gv1ewOvDfyUDzVGsc2oJqoot45N/M5HIC5Syu25WQoyEdQUU/A0tucsmSNCn?= =?us-ascii?Q?++kWk0db8zi6HhmTt3c8jGoxBS7B6qneG9ryfb1Ea0MpbZaQEnSXW3lViH5n?= =?us-ascii?Q?3pcOlOhSx5Ayy1fMQF5yBU7BeA9BQ2DU+tUwEyzwAG10Kzc7CvZsymvtE1rT?= =?us-ascii?Q?0ApJkGV745Vdun/V2p/nNosgggl7hKajdRixLva0svXQEhriabo3FYOqIzwB?= =?us-ascii?Q?KKE8/H7xdtPtogEH2byLqoB3L6PtoY17CShdtlTqKja1be/g3W2fTtKCClQv?= =?us-ascii?Q?uslqqoCIuOmKc2b1k2yAsU3QIxQtVOATfaucPxoWYusBnmoBb/wGhNpfH4fW?= =?us-ascii?Q?NrgPjq5o4DybtcbAi3jDQ8L86e5De9o6gdtWsc/vphnyLuUv4a0GGE7TRXRf?= =?us-ascii?Q?/FPD5QjboH0HzCi++slUB26CGO+YilY9qQN4nt2auhLbIy0l1ZTKot+Tjhx1?= =?us-ascii?Q?6OBgT3eu8JI0/5aM5EaLUVEWc+v+meWYjcIHHX1t3EPn3UW7Gpc0OyfBO96m?= =?us-ascii?Q?y94A1XVoYBoDtt1OUmroItPrtE/gOCKuSE8O03nSbJUM6KFJLpSyQUIJ3Xc9?= =?us-ascii?Q?qLgwEEs3aPIjghZ6cXtWTHD1rHfFoKjzX1Ugb641PdriDZm+941rM2W1E2Vy?= =?us-ascii?Q?ilZ7b3FRYo400A7w84/NEau0K0V0boJwqLypYgS5QL+Cdjv2w2Qydbcnqr6u?= =?us-ascii?Q?3rSpyNib6bKn6dTG4+vpZSqd7cYHHIFB9MF4YGmJr8iqF3gQNiN+OdIQIQwn?= =?us-ascii?Q?TDijAZb0lkgKa9oUPe+mI5Y+DZak2EoVOWygZceGOrQ7Oa8WI2cgiw+nGU/5?= =?us-ascii?Q?BJL+eCBjaYKdcVxvMyDq0ZbXGfUq6qaYEmimHmtgQauGL0QAbrr8pP8j1mMk?= =?us-ascii?Q?SDq0b9/9524ITweaNrhdVH9H5GkDKS1nrmsMJIWcav2o0rFfnfsxaH8x4Oft?= =?us-ascii?Q?O/KZgKrPxGjrJzGMZGsr3UvHTYMiZQdL5a6DsnA2gCmultq4R6+lssfzlplW?= =?us-ascii?Q?8i2Qy6ETWVVI9d7l7RZuKGsyIFH+5OalcekO3KRHa/EhW+m1holCNeBP3C8u?= =?us-ascii?Q?/1bXHry60XPCyjVPaVaTthYXYCxP4VkGGE7s6NvUzeWJVWO/NKcxFhz4MiJz?= =?us-ascii?Q?KungyUGITQBLbs0ROdGB42DoRm0XZGOHvAC33fiOnuZTX78npwLJkDrabe+w?= =?us-ascii?Q?8f1B4HIccQKneYzFwTl0rBtBRY7bycwlmjPZmiMwssUDwGDSreHk?= X-OriginatorOrg: starfivetech.com X-MS-Exchange-CrossTenant-Network-Message-Id: cb2b7024-2343-426a-d506-08deacc3ca09 X-MS-Exchange-CrossTenant-AuthSource: ZQ4PR01MB1202.CHNPR01.prod.partner.outlook.cn X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2026 05:36:44.2505 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 06fe3fa3-1221-43d3-861b-5a4ee687a85c X-MS-Exchange-CrossTenant-MailboxType: HOSTED X-MS-Exchange-CrossTenant-UserPrincipalName: PRRS8d1WthPH0SUcSOmymMtiPhn7swkCVaaoVPZ49aiOhvV5w0WfWMTrksTxKWqPgz8I0LCqdFZ8SDs8rJQOBxo+PeJUIO6FNsxbBVvZ5a/OeTaDtfrAVhbHYKCFQdJ8 X-MS-Exchange-Transport-CrossTenantHeadersStamped: ZQ4PR01MB1236 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.9.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20260507_223718_055844_BEAAF647 X-CRM114-Status: GOOD ( 15.93 ) 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: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-riscv" Errors-To: linux-riscv-bounces+linux-riscv=archiver.kernel.org@lists.infradead.org From: Sia Jee Heng Function names that consist of the 'jh71x0' naming convention are renamed to use the 'starfive' wording. Signed-off-by: Sia Jee Heng Reviewed-by: Ley Foon Tan Reviewed-by: Emil Renner Berthing Signed-off-by: Changhuang Liang --- .../clk/starfive/clk-starfive-jh7110-sys.c | 4 +- .../reset/starfive/reset-starfive-common.c | 64 +++++++++---------- .../reset/starfive/reset-starfive-common.h | 8 +-- .../reset/starfive/reset-starfive-jh7100.c | 2 +- .../reset/starfive/reset-starfive-jh7110.c | 4 +- include/soc/starfive/reset-starfive-common.h | 6 +- 6 files changed, 44 insertions(+), 44 deletions(-) diff --git a/drivers/clk/starfive/clk-starfive-jh7110-sys.c b/drivers/clk/starfive/clk-starfive-jh7110-sys.c index edf4c45e6ff0..17fd061ee196 100644 --- a/drivers/clk/starfive/clk-starfive-jh7110-sys.c +++ b/drivers/clk/starfive/clk-starfive-jh7110-sys.c @@ -334,7 +334,7 @@ static void jh7110_reset_unregister_adev(void *_adev) static void jh7110_reset_adev_release(struct device *dev) { struct auxiliary_device *adev = to_auxiliary_dev(dev); - struct jh71x0_reset_adev *rdev = to_jh71x0_reset_adev(adev); + struct starfive_reset_adev *rdev = to_starfive_reset_adev(adev); kfree(rdev); } @@ -343,7 +343,7 @@ int jh7110_reset_controller_register(struct jh71x0_clk_priv *priv, const char *adev_name, u32 adev_id) { - struct jh71x0_reset_adev *rdev; + struct starfive_reset_adev *rdev; struct auxiliary_device *adev; int ret; diff --git a/drivers/reset/starfive/reset-starfive-common.c b/drivers/reset/starfive/reset-starfive-common.c index d615c4a68cc0..772bdf6763d1 100644 --- a/drivers/reset/starfive/reset-starfive-common.c +++ b/drivers/reset/starfive/reset-starfive-common.c @@ -14,7 +14,7 @@ #include "reset-starfive-common.h" -struct jh71x0_reset { +struct starfive_reset { struct reset_controller_dev rcdev; /* protect registers against concurrent read-modify-write */ spinlock_t lock; @@ -23,16 +23,16 @@ struct jh71x0_reset { const u32 *asserted; }; -static inline struct jh71x0_reset * -jh71x0_reset_from(struct reset_controller_dev *rcdev) +static inline struct starfive_reset * +starfive_reset_from(struct reset_controller_dev *rcdev) { - return container_of(rcdev, struct jh71x0_reset, rcdev); + return container_of(rcdev, struct starfive_reset, rcdev); } -static int jh71x0_reset_update(struct reset_controller_dev *rcdev, - unsigned long id, bool assert) +static int starfive_reset_update(struct reset_controller_dev *rcdev, + unsigned long id, bool assert) { - struct jh71x0_reset *data = jh71x0_reset_from(rcdev); + struct starfive_reset *data = starfive_reset_from(rcdev); unsigned long offset = id / 32; u32 mask = BIT(id % 32); void __iomem *reg_assert = data->assert + offset * sizeof(u32); @@ -61,34 +61,34 @@ static int jh71x0_reset_update(struct reset_controller_dev *rcdev, return ret; } -static int jh71x0_reset_assert(struct reset_controller_dev *rcdev, - unsigned long id) +static int starfive_reset_assert(struct reset_controller_dev *rcdev, + unsigned long id) { - return jh71x0_reset_update(rcdev, id, true); + return starfive_reset_update(rcdev, id, true); } -static int jh71x0_reset_deassert(struct reset_controller_dev *rcdev, - unsigned long id) +static int starfive_reset_deassert(struct reset_controller_dev *rcdev, + unsigned long id) { - return jh71x0_reset_update(rcdev, id, false); + return starfive_reset_update(rcdev, id, false); } -static int jh71x0_reset_reset(struct reset_controller_dev *rcdev, - unsigned long id) +static int starfive_reset_reset(struct reset_controller_dev *rcdev, + unsigned long id) { int ret; - ret = jh71x0_reset_assert(rcdev, id); + ret = starfive_reset_assert(rcdev, id); if (ret) return ret; - return jh71x0_reset_deassert(rcdev, id); + return starfive_reset_deassert(rcdev, id); } -static int jh71x0_reset_status(struct reset_controller_dev *rcdev, - unsigned long id) +static int starfive_reset_status(struct reset_controller_dev *rcdev, + unsigned long id) { - struct jh71x0_reset *data = jh71x0_reset_from(rcdev); + struct starfive_reset *data = starfive_reset_from(rcdev); unsigned long offset = id / 32; u32 mask = BIT(id % 32); void __iomem *reg_status = data->status + offset * sizeof(u32); @@ -100,25 +100,25 @@ static int jh71x0_reset_status(struct reset_controller_dev *rcdev, return !((value ^ data->asserted[offset]) & mask); } -static const struct reset_control_ops jh71x0_reset_ops = { - .assert = jh71x0_reset_assert, - .deassert = jh71x0_reset_deassert, - .reset = jh71x0_reset_reset, - .status = jh71x0_reset_status, +static const struct reset_control_ops starfive_reset_ops = { + .assert = starfive_reset_assert, + .deassert = starfive_reset_deassert, + .reset = starfive_reset_reset, + .status = starfive_reset_status, }; -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) +int reset_starfive_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) { - struct jh71x0_reset *data; + struct starfive_reset *data; data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL); if (!data) return -ENOMEM; - data->rcdev.ops = &jh71x0_reset_ops; + data->rcdev.ops = &starfive_reset_ops; data->rcdev.owner = owner; data->rcdev.nr_resets = nr_resets; data->rcdev.dev = dev; @@ -131,4 +131,4 @@ int reset_starfive_jh71x0_register(struct device *dev, struct device_node *of_no return devm_reset_controller_register(dev, &data->rcdev); } -EXPORT_SYMBOL_GPL(reset_starfive_jh71x0_register); +EXPORT_SYMBOL_GPL(reset_starfive_register); diff --git a/drivers/reset/starfive/reset-starfive-common.h b/drivers/reset/starfive/reset-starfive-common.h index 266acc4b2caf..83461b22ee55 100644 --- a/drivers/reset/starfive/reset-starfive-common.h +++ b/drivers/reset/starfive/reset-starfive-common.h @@ -6,9 +6,9 @@ #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); +int reset_starfive_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_COMMON_H */ diff --git a/drivers/reset/starfive/reset-starfive-jh7100.c b/drivers/reset/starfive/reset-starfive-jh7100.c index 546dea2e5811..122ac6c3893b 100644 --- a/drivers/reset/starfive/reset-starfive-jh7100.c +++ b/drivers/reset/starfive/reset-starfive-jh7100.c @@ -51,7 +51,7 @@ static int __init jh7100_reset_probe(struct platform_device *pdev) if (IS_ERR(base)) return PTR_ERR(base); - return reset_starfive_jh71x0_register(&pdev->dev, pdev->dev.of_node, + return reset_starfive_register(&pdev->dev, pdev->dev.of_node, base + JH7100_RESET_ASSERT0, base + JH7100_RESET_STATUS0, jh7100_reset_asserted, diff --git a/drivers/reset/starfive/reset-starfive-jh7110.c b/drivers/reset/starfive/reset-starfive-jh7110.c index 87dba01491ae..c4dd21761e53 100644 --- a/drivers/reset/starfive/reset-starfive-jh7110.c +++ b/drivers/reset/starfive/reset-starfive-jh7110.c @@ -53,13 +53,13 @@ static int jh7110_reset_probe(struct auxiliary_device *adev, const struct auxiliary_device_id *id) { struct jh7110_reset_info *info = (struct jh7110_reset_info *)(id->driver_data); - struct jh71x0_reset_adev *rdev = to_jh71x0_reset_adev(adev); + struct starfive_reset_adev *rdev = to_starfive_reset_adev(adev); void __iomem *base = rdev->base; if (!info || !base) return -ENODEV; - return reset_starfive_jh71x0_register(&adev->dev, adev->dev.parent->of_node, + return reset_starfive_register(&adev->dev, adev->dev.parent->of_node, base + info->assert_offset, base + info->status_offset, NULL, diff --git a/include/soc/starfive/reset-starfive-common.h b/include/soc/starfive/reset-starfive-common.h index 56d8f413cf18..16df46a074bc 100644 --- a/include/soc/starfive/reset-starfive-common.h +++ b/include/soc/starfive/reset-starfive-common.h @@ -6,12 +6,12 @@ #include #include -struct jh71x0_reset_adev { +struct starfive_reset_adev { void __iomem *base; struct auxiliary_device adev; }; -#define to_jh71x0_reset_adev(_adev) \ - container_of((_adev), struct jh71x0_reset_adev, adev) +#define to_starfive_reset_adev(_adev) \ + container_of((_adev), struct starfive_reset_adev, adev) #endif -- 2.25.1 _______________________________________________ linux-riscv mailing list linux-riscv@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-riscv