From patchwork Thu Feb 6 22:11:50 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hao Wu X-Patchwork-Id: 13963852 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 A3B39C02194 for ; Thu, 6 Feb 2025 22:13:05 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1tgA6n-0005hm-Ls; Thu, 06 Feb 2025 17:12:29 -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 <3vjOlZwgKCv01zmftyxmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--wuhaotsh.bounces.google.com>) id 1tgA6c-0005bb-Jv for qemu-devel@nongnu.org; Thu, 06 Feb 2025 17:12:19 -0500 Received: from mail-pj1-x104a.google.com ([2607:f8b0:4864:20::104a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from <3vjOlZwgKCv01zmftyxmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--wuhaotsh.bounces.google.com>) id 1tgA6a-0001QH-7h for qemu-devel@nongnu.org; Thu, 06 Feb 2025 17:12:17 -0500 Received: by mail-pj1-x104a.google.com with SMTP id 98e67ed59e1d1-2f9fdc4dc84so2856981a91.2 for ; Thu, 06 Feb 2025 14:12:14 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1738879934; x=1739484734; 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=YGB3Wz1lhXJZgFE3yJDLH0YHrZy/Ctj0hcun0JpjWOE=; b=zatg8nsBe0nTWcQXoS9WJfpYhBEe4R+8woSZuTyiQHZ55avrxvc1IjDOsjstgoFNSz fPPE78AL5sbT9AytDh/fFBMFz82/h0q3gSpFGLV30rY0GCdJBQ2YPJg/JpYpw9AACGhZ VGECa2tl3Q6OdSHY4VISi2j5rSo5Sq/Y/nsQoD1zPtUXq2dDjbAvzchxdGqVR5iQC2FK 7ijQrhmtABYrxmEAN/EL8RAxhZOzl3fXmRm81Wx1Y//+RXz0sEOMUdzG5ashpAZAvHqC aoU/XHf3CPZmnHg5ZAytkuvvUa8DVpqFT9m3OzLZv9k7Vpua+4nniE2REcSY2W/5njks o9vA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1738879934; x=1739484734; 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=YGB3Wz1lhXJZgFE3yJDLH0YHrZy/Ctj0hcun0JpjWOE=; b=ML1Ii0Q/vMa00yAJ3heWaw1ywYmIqHcPhj8FcIq9jo5+z+J+sjfcjHLyvv8WYNtF5p HmgjGOxZJracvcJ1ENof7QEKLKKLlEpscJgMbs9HSdb+b49+ObGR9J6r0IAUBweEWnSN 0WySRbZIH+jVnweBJpUCxCRfID2itASsojnzm9L6XImllrlTmeIJ7uImfviYQvy6fHCJ bSagxNDzuYERY17TmQYd9YGwv/s8VgEp0oIqQq7c6lydkp5WNcBefyA4tFAvTzvSO/Io YfnIaqx5bUmiCi6oKdPHaTiMhDEUl0tYAweCFsb2ZhTr09vWWP4jAoV/8LmnDikiCV3h 2n+g== X-Forwarded-Encrypted: i=1; AJvYcCXK8FdPrH6ERb4CqgSF4OaCdWjjaOr3AxxrQoBV1fuibMBX24MwjjdujycgfMDSnPd1W4ZPzeR11EMQ@nongnu.org X-Gm-Message-State: AOJu0YyIVQqZUHsREJl9X258dmwjQDNds2Qbn3TkkC7uNQ3pLl3C4pJU KINGXY62PrzfNNicOavRUd38pWcEcYs7OO4TZriC918PH1Knvg+Mq1/1m7023a1GdjVXqucz146 Hc35fhTwuIg== X-Google-Smtp-Source: AGHT+IHb/hoS2NtAN2SEowyC+/QqIi5dDIS2u25xQ8COjgsmW5EMN75JkFcP+Yd4NQVPhPHxueqnh23YjZ5E4Q== X-Received: from pjbsp6.prod.google.com ([2002:a17:90b:52c6:b0:2ef:82a8:7171]) (user=wuhaotsh job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:2309:b0:2ee:ead6:6213 with SMTP id 98e67ed59e1d1-2fa242766b0mr1117685a91.19.1738879934091; Thu, 06 Feb 2025 14:12:14 -0800 (PST) Date: Thu, 6 Feb 2025 14:11:50 -0800 In-Reply-To: <20250206221203.4187217-1-wuhaotsh@google.com> Mime-Version: 1.0 References: <20250206221203.4187217-1-wuhaotsh@google.com> X-Mailer: git-send-email 2.48.1.502.g6dc24dfdaf-goog Message-ID: <20250206221203.4187217-5-wuhaotsh@google.com> Subject: [PATCH v4 04/17] hw/misc: Rename npcm7xx_gcr to npcm_gcr 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::104a; envelope-from=3vjOlZwgKCv01zmftyxmlttlqj.htrvjrz-ij0jqstslsz.twl@flex--wuhaotsh.bounces.google.com; helo=mail-pj1-x104a.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 GCRs and the GCR module needs to fit both. This commit changes the name of the GCR module. Future commits will add the support for NPCM8XX GCRs. Reviewed-by: Peter Maydell Signed-off-by: Hao Wu --- hw/misc/meson.build | 2 +- hw/misc/{npcm7xx_gcr.c => npcm_gcr.c} | 2 +- include/hw/arm/npcm7xx.h | 2 +- include/hw/misc/{npcm7xx_gcr.h => npcm_gcr.h} | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) rename hw/misc/{npcm7xx_gcr.c => npcm_gcr.c} (99%) rename include/hw/misc/{npcm7xx_gcr.h => npcm_gcr.h} (96%) diff --git a/hw/misc/meson.build b/hw/misc/meson.build index 55f493521b..554eb8df5b 100644 --- a/hw/misc/meson.build +++ b/hw/misc/meson.build @@ -70,7 +70,7 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files( )) system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files( 'npcm7xx_clk.c', - 'npcm7xx_gcr.c', + 'npcm_gcr.c', 'npcm7xx_mft.c', 'npcm7xx_pwm.c', 'npcm7xx_rng.c', diff --git a/hw/misc/npcm7xx_gcr.c b/hw/misc/npcm_gcr.c similarity index 99% rename from hw/misc/npcm7xx_gcr.c rename to hw/misc/npcm_gcr.c index 07464a4dc9..826fd41123 100644 --- a/hw/misc/npcm7xx_gcr.c +++ b/hw/misc/npcm_gcr.c @@ -16,7 +16,7 @@ #include "qemu/osdep.h" -#include "hw/misc/npcm7xx_gcr.h" +#include "hw/misc/npcm_gcr.h" #include "hw/qdev-properties.h" #include "migration/vmstate.h" #include "qapi/error.h" diff --git a/include/hw/arm/npcm7xx.h b/include/hw/arm/npcm7xx.h index 4e0d210188..510170471e 100644 --- a/include/hw/arm/npcm7xx.h +++ b/include/hw/arm/npcm7xx.h @@ -24,7 +24,7 @@ #include "hw/i2c/npcm7xx_smbus.h" #include "hw/mem/npcm7xx_mc.h" #include "hw/misc/npcm7xx_clk.h" -#include "hw/misc/npcm7xx_gcr.h" +#include "hw/misc/npcm_gcr.h" #include "hw/misc/npcm7xx_mft.h" #include "hw/misc/npcm7xx_pwm.h" #include "hw/misc/npcm7xx_rng.h" diff --git a/include/hw/misc/npcm7xx_gcr.h b/include/hw/misc/npcm_gcr.h similarity index 96% rename from include/hw/misc/npcm7xx_gcr.h rename to include/hw/misc/npcm_gcr.h index c0bbdda77e..9b4998950c 100644 --- a/include/hw/misc/npcm7xx_gcr.h +++ b/include/hw/misc/npcm_gcr.h @@ -13,8 +13,8 @@ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * for more details. */ -#ifndef NPCM7XX_GCR_H -#define NPCM7XX_GCR_H +#ifndef NPCM_GCR_H +#define NPCM_GCR_H #include "exec/memory.h" #include "hw/sysbus.h" @@ -70,4 +70,4 @@ struct NPCM7xxGCRState { #define TYPE_NPCM7XX_GCR "npcm7xx-gcr" OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxGCRState, NPCM7XX_GCR) -#endif /* NPCM7XX_GCR_H */ +#endif /* NPCM_GCR_H */