diff mbox series

[23/25] arm: Don't set freq properties on CMSDK timer, dualtimer, watchdog, ARMSSE

Message ID 20210121190622.22000-24-peter.maydell@linaro.org
State Superseded
Headers show
Series Convert CMSDK timer, watchdog, dualtimer to Clock framework | expand

Commit Message

Peter Maydell Jan. 21, 2021, 7:06 p.m. UTC 
Remove all the code that sets frequency properties on the CMSDK
timer, dualtimer and watchdog devices and on the ARMSSE SoC device:
these properties are unused now that the devices rely on their Clock
inputs instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

---
 hw/arm/armsse.c    | 7 -------
 hw/arm/mps2-tz.c   | 1 -
 hw/arm/mps2.c      | 3 ---
 hw/arm/musca.c     | 1 -
 hw/arm/stellaris.c | 3 ---
 5 files changed, 15 deletions(-)

-- 
2.20.1

Comments

Philippe Mathieu-Daudé Jan. 21, 2021, 10:06 p.m. UTC | #1 
On 1/21/21 8:06 PM, Peter Maydell wrote:
> Remove all the code that sets frequency properties on the CMSDK

> timer, dualtimer and watchdog devices and on the ARMSSE SoC device:

> these properties are unused now that the devices rely on their Clock

> inputs instead.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> ---

>  hw/arm/armsse.c    | 7 -------

>  hw/arm/mps2-tz.c   | 1 -

>  hw/arm/mps2.c      | 3 ---

>  hw/arm/musca.c     | 1 -

>  hw/arm/stellaris.c | 3 ---

>  5 files changed, 15 deletions(-)


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Luc Michel Jan. 23, 2021, 8:32 p.m. UTC | #2 
On 19:06 Thu 21 Jan     , Peter Maydell wrote:
> Remove all the code that sets frequency properties on the CMSDK

> timer, dualtimer and watchdog devices and on the ARMSSE SoC device:

> these properties are unused now that the devices rely on their Clock

> inputs instead.

> 

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>


Reviewed-by: Luc Michel <luc@lmichel.fr>


> ---

>  hw/arm/armsse.c    | 7 -------

>  hw/arm/mps2-tz.c   | 1 -

>  hw/arm/mps2.c      | 3 ---

>  hw/arm/musca.c     | 1 -

>  hw/arm/stellaris.c | 3 ---

>  5 files changed, 15 deletions(-)

> 

> diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c

> index 1da0c1be4c7..7494afc630e 100644

> --- a/hw/arm/armsse.c

> +++ b/hw/arm/armsse.c

> @@ -726,7 +726,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>       * it to the appropriate PPC port; then we can realize the PPC and

>       * map its upstream ends to the right place in the container.

>       */

> -    qdev_prop_set_uint32(DEVICE(&s->timer0), "pclk-frq", s->mainclk_frq);

>      qdev_connect_clock_in(DEVICE(&s->timer0), "pclk", s->mainclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer0), errp)) {

>          return;

> @@ -737,7 +736,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>      object_property_set_link(OBJECT(&s->apb_ppc0), "port[0]", OBJECT(mr),

>                               &error_abort);

>  

> -    qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);

>      qdev_connect_clock_in(DEVICE(&s->timer1), "pclk", s->mainclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer1), errp)) {

>          return;

> @@ -748,7 +746,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>      object_property_set_link(OBJECT(&s->apb_ppc0), "port[1]", OBJECT(mr),

>                               &error_abort);

>  

> -    qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);

>      qdev_connect_clock_in(DEVICE(&s->dualtimer), "TIMCLK", s->mainclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), errp)) {

>          return;

> @@ -907,7 +904,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>      /* Devices behind APB PPC1:

>       *   0x4002f000: S32K timer

>       */

> -    qdev_prop_set_uint32(DEVICE(&s->s32ktimer), "pclk-frq", S32KCLK);

>      qdev_connect_clock_in(DEVICE(&s->s32ktimer), "pclk", s->s32kclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32ktimer), errp)) {

>          return;

> @@ -1001,7 +997,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>      qdev_connect_gpio_out(DEVICE(&s->nmi_orgate), 0,

>                            qdev_get_gpio_in_named(DEVICE(&s->armv7m), "NMI", 0));

>  

> -    qdev_prop_set_uint32(DEVICE(&s->s32kwatchdog), "wdogclk-frq", S32KCLK);

>      qdev_connect_clock_in(DEVICE(&s->s32kwatchdog), "WDOGCLK", s->s32kclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32kwatchdog), errp)) {

>          return;

> @@ -1012,7 +1007,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>  

>      /* 0x40080000 .. 0x4008ffff : ARMSSE second Base peripheral region */

>  

> -    qdev_prop_set_uint32(DEVICE(&s->nswatchdog), "wdogclk-frq", s->mainclk_frq);

>      qdev_connect_clock_in(DEVICE(&s->nswatchdog), "WDOGCLK", s->mainclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->nswatchdog), errp)) {

>          return;

> @@ -1021,7 +1015,6 @@ static void armsse_realize(DeviceState *dev, Error **errp)

>                         armsse_get_common_irq_in(s, 1));

>      sysbus_mmio_map(SYS_BUS_DEVICE(&s->nswatchdog), 0, 0x40081000);

>  

> -    qdev_prop_set_uint32(DEVICE(&s->swatchdog), "wdogclk-frq", s->mainclk_frq);

>      qdev_connect_clock_in(DEVICE(&s->swatchdog), "WDOGCLK", s->mainclk);

>      if (!sysbus_realize(SYS_BUS_DEVICE(&s->swatchdog), errp)) {

>          return;

> diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c

> index 7acdf490f28..90caa914934 100644

> --- a/hw/arm/mps2-tz.c

> +++ b/hw/arm/mps2-tz.c

> @@ -413,7 +413,6 @@ static void mps2tz_common_init(MachineState *machine)

>      object_property_set_link(OBJECT(&mms->iotkit), "memory",

>                               OBJECT(system_memory), &error_abort);

>      qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", MPS2TZ_NUMIRQ);

> -    qdev_prop_set_uint32(iotkitdev, "MAINCLK_FRQ", SYSCLK_FRQ);

>      qdev_connect_clock_in(iotkitdev, "MAINCLK", mms->sysclk);

>      qdev_connect_clock_in(iotkitdev, "S32KCLK", mms->s32kclk);

>      sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);

> diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c

> index cd1c215f941..39add416db5 100644

> --- a/hw/arm/mps2.c

> +++ b/hw/arm/mps2.c

> @@ -346,7 +346,6 @@ static void mps2_common_init(MachineState *machine)

>          object_initialize_child(OBJECT(mms), name, &mms->timer[i],

>                                  TYPE_CMSDK_APB_TIMER);

>          sbd = SYS_BUS_DEVICE(&mms->timer[i]);

> -        qdev_prop_set_uint32(DEVICE(&mms->timer[i]), "pclk-frq", SYSCLK_FRQ);

>          qdev_connect_clock_in(DEVICE(&mms->timer[i]), "pclk", mms->sysclk);

>          sysbus_realize_and_unref(sbd, &error_fatal);

>          sysbus_mmio_map(sbd, 0, base);

> @@ -355,7 +354,6 @@ static void mps2_common_init(MachineState *machine)

>  

>      object_initialize_child(OBJECT(mms), "dualtimer", &mms->dualtimer,

>                              TYPE_CMSDK_APB_DUALTIMER);

> -    qdev_prop_set_uint32(DEVICE(&mms->dualtimer), "pclk-frq", SYSCLK_FRQ);

>      qdev_connect_clock_in(DEVICE(&mms->dualtimer), "TIMCLK", mms->sysclk);

>      sysbus_realize(SYS_BUS_DEVICE(&mms->dualtimer), &error_fatal);

>      sysbus_connect_irq(SYS_BUS_DEVICE(&mms->dualtimer), 0,

> @@ -363,7 +361,6 @@ static void mps2_common_init(MachineState *machine)

>      sysbus_mmio_map(SYS_BUS_DEVICE(&mms->dualtimer), 0, 0x40002000);

>      object_initialize_child(OBJECT(mms), "watchdog", &mms->watchdog,

>                              TYPE_CMSDK_APB_WATCHDOG);

> -    qdev_prop_set_uint32(DEVICE(&mms->watchdog), "wdogclk-frq", SYSCLK_FRQ);

>      qdev_connect_clock_in(DEVICE(&mms->watchdog), "WDOGCLK", mms->sysclk);

>      sysbus_realize(SYS_BUS_DEVICE(&mms->watchdog), &error_fatal);

>      sysbus_connect_irq(SYS_BUS_DEVICE(&mms->watchdog), 0,

> diff --git a/hw/arm/musca.c b/hw/arm/musca.c

> index a9292482a06..945643c3cd7 100644

> --- a/hw/arm/musca.c

> +++ b/hw/arm/musca.c

> @@ -385,7 +385,6 @@ static void musca_init(MachineState *machine)

>      qdev_prop_set_uint32(ssedev, "EXP_NUMIRQ", mmc->num_irqs);

>      qdev_prop_set_uint32(ssedev, "init-svtor", mmc->init_svtor);

>      qdev_prop_set_uint32(ssedev, "SRAM_ADDR_WIDTH", mmc->sram_addr_width);

> -    qdev_prop_set_uint32(ssedev, "MAINCLK_FRQ", SYSCLK_FRQ);

>      qdev_connect_clock_in(ssedev, "MAINCLK", mms->sysclk);

>      qdev_connect_clock_in(ssedev, "S32KCLK", mms->s32kclk);

>      /*

> diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c

> index 9b67c739ef2..5acb043a07e 100644

> --- a/hw/arm/stellaris.c

> +++ b/hw/arm/stellaris.c

> @@ -1415,9 +1415,6 @@ static void stellaris_init(MachineState *ms, stellaris_board_info *board)

>      if (board->dc1 & (1 << 3)) { /* watchdog present */

>          dev = qdev_new(TYPE_LUMINARY_WATCHDOG);

>  

> -        /* system_clock_scale is valid now */

> -        uint32_t mainclk = NANOSECONDS_PER_SECOND / system_clock_scale;

> -        qdev_prop_set_uint32(dev, "wdogclk-frq", mainclk);

>          qdev_connect_clock_in(dev, "WDOGCLK",

>                                qdev_get_clock_out(ssys_dev, "SYSCLK"));

>  

> -- 

> 2.20.1

> 


--
diff mbox series

Patch

diff --git a/hw/arm/armsse.c b/hw/arm/armsse.c
index 1da0c1be4c7..7494afc630e 100644
--- a/hw/arm/armsse.c
+++ b/hw/arm/armsse.c
@@ -726,7 +726,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
      * it to the appropriate PPC port; then we can realize the PPC and
      * map its upstream ends to the right place in the container.
      */
-    qdev_prop_set_uint32(DEVICE(&s->timer0), "pclk-frq", s->mainclk_frq);
     qdev_connect_clock_in(DEVICE(&s->timer0), "pclk", s->mainclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer0), errp)) {
         return;
@@ -737,7 +736,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
     object_property_set_link(OBJECT(&s->apb_ppc0), "port[0]", OBJECT(mr),
                              &error_abort);
 
-    qdev_prop_set_uint32(DEVICE(&s->timer1), "pclk-frq", s->mainclk_frq);
     qdev_connect_clock_in(DEVICE(&s->timer1), "pclk", s->mainclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->timer1), errp)) {
         return;
@@ -748,7 +746,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
     object_property_set_link(OBJECT(&s->apb_ppc0), "port[1]", OBJECT(mr),
                              &error_abort);
 
-    qdev_prop_set_uint32(DEVICE(&s->dualtimer), "pclk-frq", s->mainclk_frq);
     qdev_connect_clock_in(DEVICE(&s->dualtimer), "TIMCLK", s->mainclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->dualtimer), errp)) {
         return;
@@ -907,7 +904,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
     /* Devices behind APB PPC1:
      *   0x4002f000: S32K timer
      */
-    qdev_prop_set_uint32(DEVICE(&s->s32ktimer), "pclk-frq", S32KCLK);
     qdev_connect_clock_in(DEVICE(&s->s32ktimer), "pclk", s->s32kclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32ktimer), errp)) {
         return;
@@ -1001,7 +997,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
     qdev_connect_gpio_out(DEVICE(&s->nmi_orgate), 0,
                           qdev_get_gpio_in_named(DEVICE(&s->armv7m), "NMI", 0));
 
-    qdev_prop_set_uint32(DEVICE(&s->s32kwatchdog), "wdogclk-frq", S32KCLK);
     qdev_connect_clock_in(DEVICE(&s->s32kwatchdog), "WDOGCLK", s->s32kclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->s32kwatchdog), errp)) {
         return;
@@ -1012,7 +1007,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
 
     /* 0x40080000 .. 0x4008ffff : ARMSSE second Base peripheral region */
 
-    qdev_prop_set_uint32(DEVICE(&s->nswatchdog), "wdogclk-frq", s->mainclk_frq);
     qdev_connect_clock_in(DEVICE(&s->nswatchdog), "WDOGCLK", s->mainclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->nswatchdog), errp)) {
         return;
@@ -1021,7 +1015,6 @@  static void armsse_realize(DeviceState *dev, Error **errp)
                        armsse_get_common_irq_in(s, 1));
     sysbus_mmio_map(SYS_BUS_DEVICE(&s->nswatchdog), 0, 0x40081000);
 
-    qdev_prop_set_uint32(DEVICE(&s->swatchdog), "wdogclk-frq", s->mainclk_frq);
     qdev_connect_clock_in(DEVICE(&s->swatchdog), "WDOGCLK", s->mainclk);
     if (!sysbus_realize(SYS_BUS_DEVICE(&s->swatchdog), errp)) {
         return;
diff --git a/hw/arm/mps2-tz.c b/hw/arm/mps2-tz.c
index 7acdf490f28..90caa914934 100644
--- a/hw/arm/mps2-tz.c
+++ b/hw/arm/mps2-tz.c
@@ -413,7 +413,6 @@  static void mps2tz_common_init(MachineState *machine)
     object_property_set_link(OBJECT(&mms->iotkit), "memory",
                              OBJECT(system_memory), &error_abort);
     qdev_prop_set_uint32(iotkitdev, "EXP_NUMIRQ", MPS2TZ_NUMIRQ);
-    qdev_prop_set_uint32(iotkitdev, "MAINCLK_FRQ", SYSCLK_FRQ);
     qdev_connect_clock_in(iotkitdev, "MAINCLK", mms->sysclk);
     qdev_connect_clock_in(iotkitdev, "S32KCLK", mms->s32kclk);
     sysbus_realize(SYS_BUS_DEVICE(&mms->iotkit), &error_fatal);
diff --git a/hw/arm/mps2.c b/hw/arm/mps2.c
index cd1c215f941..39add416db5 100644
--- a/hw/arm/mps2.c
+++ b/hw/arm/mps2.c
@@ -346,7 +346,6 @@  static void mps2_common_init(MachineState *machine)
         object_initialize_child(OBJECT(mms), name, &mms->timer[i],
                                 TYPE_CMSDK_APB_TIMER);
         sbd = SYS_BUS_DEVICE(&mms->timer[i]);
-        qdev_prop_set_uint32(DEVICE(&mms->timer[i]), "pclk-frq", SYSCLK_FRQ);
         qdev_connect_clock_in(DEVICE(&mms->timer[i]), "pclk", mms->sysclk);
         sysbus_realize_and_unref(sbd, &error_fatal);
         sysbus_mmio_map(sbd, 0, base);
@@ -355,7 +354,6 @@  static void mps2_common_init(MachineState *machine)
 
     object_initialize_child(OBJECT(mms), "dualtimer", &mms->dualtimer,
                             TYPE_CMSDK_APB_DUALTIMER);
-    qdev_prop_set_uint32(DEVICE(&mms->dualtimer), "pclk-frq", SYSCLK_FRQ);
     qdev_connect_clock_in(DEVICE(&mms->dualtimer), "TIMCLK", mms->sysclk);
     sysbus_realize(SYS_BUS_DEVICE(&mms->dualtimer), &error_fatal);
     sysbus_connect_irq(SYS_BUS_DEVICE(&mms->dualtimer), 0,
@@ -363,7 +361,6 @@  static void mps2_common_init(MachineState *machine)
     sysbus_mmio_map(SYS_BUS_DEVICE(&mms->dualtimer), 0, 0x40002000);
     object_initialize_child(OBJECT(mms), "watchdog", &mms->watchdog,
                             TYPE_CMSDK_APB_WATCHDOG);
-    qdev_prop_set_uint32(DEVICE(&mms->watchdog), "wdogclk-frq", SYSCLK_FRQ);
     qdev_connect_clock_in(DEVICE(&mms->watchdog), "WDOGCLK", mms->sysclk);
     sysbus_realize(SYS_BUS_DEVICE(&mms->watchdog), &error_fatal);
     sysbus_connect_irq(SYS_BUS_DEVICE(&mms->watchdog), 0,
diff --git a/hw/arm/musca.c b/hw/arm/musca.c
index a9292482a06..945643c3cd7 100644
--- a/hw/arm/musca.c
+++ b/hw/arm/musca.c
@@ -385,7 +385,6 @@  static void musca_init(MachineState *machine)
     qdev_prop_set_uint32(ssedev, "EXP_NUMIRQ", mmc->num_irqs);
     qdev_prop_set_uint32(ssedev, "init-svtor", mmc->init_svtor);
     qdev_prop_set_uint32(ssedev, "SRAM_ADDR_WIDTH", mmc->sram_addr_width);
-    qdev_prop_set_uint32(ssedev, "MAINCLK_FRQ", SYSCLK_FRQ);
     qdev_connect_clock_in(ssedev, "MAINCLK", mms->sysclk);
     qdev_connect_clock_in(ssedev, "S32KCLK", mms->s32kclk);
     /*
diff --git a/hw/arm/stellaris.c b/hw/arm/stellaris.c
index 9b67c739ef2..5acb043a07e 100644
--- a/hw/arm/stellaris.c
+++ b/hw/arm/stellaris.c
@@ -1415,9 +1415,6 @@  static void stellaris_init(MachineState *ms, stellaris_board_info *board)
     if (board->dc1 & (1 << 3)) { /* watchdog present */
         dev = qdev_new(TYPE_LUMINARY_WATCHDOG);
 
-        /* system_clock_scale is valid now */
-        uint32_t mainclk = NANOSECONDS_PER_SECOND / system_clock_scale;
-        qdev_prop_set_uint32(dev, "wdogclk-frq", mainclk);
         qdev_connect_clock_in(dev, "WDOGCLK",
                               qdev_get_clock_out(ssys_dev, "SYSCLK"));