From patchwork Wed Feb 19 18:46:01 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Wu X-Patchwork-Id: 13982695 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 lists.gnu.org (lists.gnu.org [209.51.188.17]) (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 63D8FC021AA for ; Wed, 19 Feb 2025 18:50:24 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tkp6O-0003E4-6o; Wed, 19 Feb 2025 13:47:20 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from <3ECe2ZwgKCnsvtgZnsrgfnnfkd.bnlpdlt-cdudkmnmfmt.nqf@flex--wuhaotsh.bounces.google.com>) id 1tkp5p-00032o-Sm for qemu-devel@nongnu.org; Wed, 19 Feb 2025 13:46:46 -0500 Received: from mail-pl1-x649.google.com ([2607:f8b0:4864:20::649]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3ECe2ZwgKCnsvtgZnsrgfnnfkd.bnlpdlt-cdudkmnmfmt.nqf@flex--wuhaotsh.bounces.google.com>) id 1tkp5m-0004lz-J6 for qemu-devel@nongnu.org; Wed, 19 Feb 2025 13:46:45 -0500 Received: by mail-pl1-x649.google.com with SMTP id d9443c01a7336-21f6cb3097bso862895ad.3 for ; Wed, 19 Feb 2025 10:46:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1739990800; x=1740595600; darn=nongnu.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=E39oAQWyGXA+WES3rlqKQsK5aC0dpOzL/yrEOMkeMns=; b=QI7RsTaNsNlyIpriRDPP925gQ14giPvmwXuYkwirKtN0INAoDScrUaVJRQWkuMqHM8 iCF1s93PCWN9K1rXLSA1IymoGrZbUmEmmIxQqaUWElxCWjPBobDHORfbOUsGrXBHvIXG 9Q8fhneh6wKX5UItbgMjTTiKv7IlOTS++ajs7R6JTE4vG6mLTwjKbc24D404wf+HTv/s qIqg2fS7KWQgwoG9a1ENB2vGp4nznb5qZnOVeZ4d7nZxCzrzKEt81kC1s5R5B9RNKdcp j1D8H2vPuwzWcskSMbLmHqJ7cft48ztLymP/QXl89ciLA9lO6VWs5fBUckfGJwgUGvgN MxAw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739990800; x=1740595600; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=E39oAQWyGXA+WES3rlqKQsK5aC0dpOzL/yrEOMkeMns=; b=BVjcLKZFzykT0O3uPHA7139EqQxpvrjLnwAmEeErVnS87Dn5UmgiQ8h9xRACiaA1ZH NNS4LJD34kSyCFEz23Uk2418uyHhjmjMYApiYzSQWqCYwoTx25Y83m3/fOVC6OI/JkBL gjWsa3J+kS8uo5/DAys7YcYsuGXfCYlsAl82CzY9MDGVFDYkTrCvI69TCOCfpttLf0J3 NgEX4OHCpGU3l7bQsvpTzxKqP6d3TYhBQ6uq1PCAe8xkAQN/g/l472Yrd8w6RGlhJwsp FCXWxOaC+M6I4qLnD3IH+ngXURCwvTwzoXc8snaalViokbGuLGxUDiksSOJAYeoeeZ6t Xz8Q== X-Forwarded-Encrypted: i=1; AJvYcCX7pf/3/DHIkBZMvxaDIRgfFIrija3e1o5UKqe1H9i9dMOSiQK/7+dE07ETlyA49Oz5Y/vZSat3mxBs@nongnu.org X-Gm-Message-State: AOJu0Yz8w/vg3s54n68puYzXgHfJefX2szeQWL1NVTBAvADdL3ri+Vq5 Dtu4C+rF9CF4MEnLofsBcqgRN6JKAsrCircRubgPeZxWNqY3vKmxalYk9VGsjRglXcLEUO2+Ovz k4WvAXFK9Kg== X-Google-Smtp-Source: AGHT+IG+nuIakXmRBTeFlVKyp3WMh3UtvBsIC8FgVrMkE6F7Q1oF9uBsH2QFMIbJwPSEcRk0oOPXBNKaCtigJw== X-Received: from plqq12.prod.google.com ([2002:a17:902:c74c:b0:220:e7dc:350d]) (user=wuhaotsh job=prod-delivery.src-stubby-dispatcher) by 2002:a17:902:f78b:b0:220:e336:94e with SMTP id d9443c01a7336-22104013e19mr292267905ad.15.1739990800424; Wed, 19 Feb 2025 10:46:40 -0800 (PST) Date: Wed, 19 Feb 2025 10:46:01 -0800 In-Reply-To: <20250219184609.1839281-1-wuhaotsh@google.com> Mime-Version: 1.0 References: <20250219184609.1839281-1-wuhaotsh@google.com> X-Mailer: git-send-email 2.48.1.601.g30ceb7b040-goog Message-ID: <20250219184609.1839281-11-wuhaotsh@google.com> Subject: [PATCH v5 10/17] hw/misc: Rename npcm7xx_clk to npcm_clk From: Hao Wu To: peter.maydell@linaro.org Cc: qemu-arm@nongnu.org, qemu-devel@nongnu.org, wuhaotsh@google.com, venture@google.com, Avi.Fishman@nuvoton.com, kfting@nuvoton.com, hskinnemoen@google.com, titusr@google.com, chli30@nuvoton.corp-partner.google.com, pbonzini@redhat.com, jasowang@redhat.com, alistair@alistair23.me, philmd@linaro.org Received-SPF: pass client-ip=2607:f8b0:4864:20::649; envelope-from=3ECe2ZwgKCnsvtgZnsrgfnnfkd.bnlpdlt-cdudkmnmfmt.nqf@flex--wuhaotsh.bounces.google.com; helo=mail-pl1-x649.google.com X-Spam_score_int: -95 X-Spam_score: -9.6 X-Spam_bar: --------- X-Spam_report: (-9.6 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_MED=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, USER_IN_DEF_DKIM_WL=-7.5 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org NPCM7XX and NPCM8XX have a different set of CLK registers. This commit changes the name of the clk files to be used by both NPCM7XX and NPCM8XX CLK modules. Reviewed-by: Peter Maydell Signed-off-by: Hao Wu --- hw/misc/meson.build | 2 +- hw/misc/{npcm7xx_clk.c => npcm_clk.c} | 2 +- include/hw/arm/npcm7xx.h | 2 +- include/hw/misc/{npcm7xx_clk.h => npcm_clk.h} | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename hw/misc/{npcm7xx_clk.c => npcm_clk.c} (99%) rename include/hw/misc/{npcm7xx_clk.h => npcm_clk.h} (98%) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 554eb8df5b..edd36a334d 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -69,7 +69,7 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( 'imx_rngc.c', )) system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files( - 'npcm7xx_clk.c', + 'npcm_clk.c', 'npcm_gcr.c', 'npcm7xx_mft.c', 'npcm7xx_pwm.c', diff --git a/hw/misc/npcm7xx_clk.c b/hw/misc/npcm_clk.c similarity index 99% rename from hw/misc/npcm7xx_clk.c rename to hw/misc/npcm_clk.c index 46f907b61c..2bcb731099 100644 --- a/hw/misc/npcm7xx_clk.c +++ b/hw/misc/npcm_clk.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" -#include "hw/misc/npcm7xx_clk.h" +#include "hw/misc/npcm_clk.h" #include "hw/timer/npcm7xx_timer.h" #include "hw/qdev-clock.h" #include "migration/vmstate.h" diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h index 2e708471ec..e80fd91f20 100644 --- a/include/hw/arm/npcm7xx.h +++ b/include/hw/arm/npcm7xx.h @@ -23,7 +23,7 @@ #include "hw/gpio/npcm7xx_gpio.h" #include "hw/i2c/npcm7xx_smbus.h" #include "hw/mem/npcm7xx_mc.h" -#include "hw/misc/npcm7xx_clk.h" +#include "hw/misc/npcm_clk.h" #include "hw/misc/npcm_gcr.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" diff --git a/include/hw/misc/npcm7xx_clk.h b/include/hw/misc/npcm_clk.h similarity index 98% rename from include/hw/misc/npcm7xx_clk.h rename to include/hw/misc/npcm_clk.h index 5ed4a4672b..0aef81e10c 100644 --- a/include/hw/misc/npcm7xx_clk.h +++ b/include/hw/misc/npcm_clk.h @@ -13,8 +13,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#ifndef NPCM7XX_CLK_H -#define NPCM7XX_CLK_H +#ifndef NPCM_CLK_H +#define NPCM_CLK_H #include "exec/memory.h" #include "hw/clock.h" @@ -177,4 +177,4 @@ struct NPCM7xxCLKState { #define TYPE_NPCM7XX_CLK "npcm7xx-clk" OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxCLKState, NPCM7XX_CLK) -#endif /* NPCM7XX_CLK_H */ +#endif /* NPCM_CLK_H */