Browse Source

hw/misc: Rename npcm7xx_clk to npcm_clk

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 <peter.maydell@linaro.org>
Signed-off-by: Hao Wu <wuhaotsh@google.com>
Message-id: 20250219184609.1839281-11-wuhaotsh@google.com
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Hao Wu 6 months ago
parent
commit
c8283b0f4a
4 changed files with 6 additions and 6 deletions
  1. 1 1
      hw/misc/meson.build
  2. 1 1
      hw/misc/npcm_clk.c
  3. 1 1
      include/hw/arm/npcm7xx.h
  4. 3 3
      include/hw/misc/npcm_clk.h

+ 1 - 1
hw/misc/meson.build

@@ -69,7 +69,7 @@ system_ss.add(when: 'CONFIG_IMX', if_true: files(
   'imx_rngc.c',
   'imx_rngc.c',
 ))
 ))
 system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
 system_ss.add(when: 'CONFIG_NPCM7XX', if_true: files(
-  'npcm7xx_clk.c',
+  'npcm_clk.c',
   'npcm_gcr.c',
   'npcm_gcr.c',
   'npcm7xx_mft.c',
   'npcm7xx_mft.c',
   'npcm7xx_pwm.c',
   'npcm7xx_pwm.c',

+ 1 - 1
hw/misc/npcm7xx_clk.c → hw/misc/npcm_clk.c

@@ -16,7 +16,7 @@
 
 
 #include "qemu/osdep.h"
 #include "qemu/osdep.h"
 
 
-#include "hw/misc/npcm7xx_clk.h"
+#include "hw/misc/npcm_clk.h"
 #include "hw/timer/npcm7xx_timer.h"
 #include "hw/timer/npcm7xx_timer.h"
 #include "hw/qdev-clock.h"
 #include "hw/qdev-clock.h"
 #include "migration/vmstate.h"
 #include "migration/vmstate.h"

+ 1 - 1
include/hw/arm/npcm7xx.h

@@ -23,7 +23,7 @@
 #include "hw/gpio/npcm7xx_gpio.h"
 #include "hw/gpio/npcm7xx_gpio.h"
 #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/npcm_clk.h"
 #include "hw/misc/npcm_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"

+ 3 - 3
include/hw/misc/npcm7xx_clk.h → include/hw/misc/npcm_clk.h

@@ -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_CLK_H
-#define NPCM7XX_CLK_H
+#ifndef NPCM_CLK_H
+#define NPCM_CLK_H
 
 
 #include "exec/memory.h"
 #include "exec/memory.h"
 #include "hw/clock.h"
 #include "hw/clock.h"
@@ -177,4 +177,4 @@ struct NPCM7xxCLKState {
 #define TYPE_NPCM7XX_CLK "npcm7xx-clk"
 #define TYPE_NPCM7XX_CLK "npcm7xx-clk"
 OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxCLKState, NPCM7XX_CLK)
 OBJECT_DECLARE_SIMPLE_TYPE(NPCM7xxCLKState, NPCM7XX_CLK)
 
 
-#endif /* NPCM7XX_CLK_H */
+#endif /* NPCM_CLK_H */