motorhead/qemu
1
0
Fork 0
mirror of https://github.com/Motorhead1991/qemu.git synced 2025-09-09 08:17:53 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions

hw/misc: Rename npcm7xx_gcr to npcm_gcr

Browse source 
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 <peter.maydell@linaro.org>
Signed-off-by: Hao Wu <wuhaotsh@google.com>
Message-id: 20250219184609.1839281-5-wuhaotsh@google.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Hao Wu 2025-02-19 10:45:55 -08:00 • committed by Peter Maydell
parent e9be8467b4
commit 506af2330c
4 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

2
hw/misc/meson.build
View file

@ -70,7 +70,7 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files(
)) ))
system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files( system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
'npcm7xx_clk.c', 'npcm7xx_clk.c',
'npcm7xx_gcr.c', 'npcm_gcr.c',
'npcm7xx_mft.c', 'npcm7xx_mft.c',
'npcm7xx_pwm.c', 'npcm7xx_pwm.c',
'npcm7xx_rng.c', 'npcm7xx_rng.c',

2
hw/misc/npcm7xx_gcr.c → hw/misc/npcm_gcr.c
View file

@ -16,7 +16,7 @@
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "hw/misc/npcm7xx_gcr.h" #include "hw/misc/npcm_gcr.h"
#include "hw/qdev-properties.h" #include "hw/qdev-properties.h"
#include "migration/vmstate.h" #include "migration/vmstate.h"
#include "qapi/error.h" #include "qapi/error.h"

2
include/hw/arm/npcm7xx.h
View file

@ -24,7 +24,7 @@
#include "hw/i2c/npcm7xx_smbus.h" #include "hw/i2c/npcm7xx_smbus.h"
#include "hw/mem/npcm7xx_mc.h" #include "hw/mem/npcm7xx_mc.h"
#include "hw/misc/npcm7xx_clk.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_mft.h"
#include "hw/misc/npcm7xx_pwm.h" #include "hw/misc/npcm7xx_pwm.h"
#include "hw/misc/npcm7xx_rng.h" #include "hw/misc/npcm7xx_rng.h"

6
include/hw/misc/npcm7xx_gcr.h → include/hw/misc/npcm_gcr.h
View file

@ -13,8 +13,8 @@
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
* for more details. * for more details.
*/ */
#ifndef NPCM7XX_GCR_H #ifndef NPCM_GCR_H
#define NPCM7XX_GCR_H #define NPCM_GCR_H
#include "exec/memory.h" #include "exec/memory.h"
#include "hw/sysbus.h" #include "hw/sysbus.h"
@ -70,4 +70,4 @@ struct NPCM7xxGCRState {
#define TYPE_NPCM7XX_GCR "npcm7xx-gcr" #define TYPE_NPCM7XX_GCR "npcm7xx-gcr"
OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxGCRState, NPCM7XX_GCR) OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxGCRState, NPCM7XX_GCR)
#endif /* NPCM7XX_GCR_H */ #endif /* NPCM_GCR_H */