Re: [PATCH 09/19] hw/arm/bcm2835_peripherals: Use the thermal sensor block

[Alistair Francis]

On Thu, Sep 26, 2019 at 10:42 AM Philippe Mathieu-Daudé <address@hidden> wrote:
>
> Map the thermal sensor in the BCM2835 block.
>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>

Reviewed-by: Alistair Francis <address@hidden>

Alistair

> ---
>  hw/arm/bcm2835_peripherals.c         | 13 +++++++++++++
>  include/hw/arm/bcm2835_peripherals.h |  2 ++
>  include/hw/arm/raspi_platform.h      |  1 +
>  3 files changed, 16 insertions(+)
>
> diff --git a/hw/arm/bcm2835_peripherals.c b/hw/arm/bcm2835_peripherals.c
> index fdcf616c56..70bf927a02 100644
> --- a/hw/arm/bcm2835_peripherals.c
> +++ b/hw/arm/bcm2835_peripherals.c
> @@ -111,6 +111,10 @@ static void bcm2835_peripherals_init(Object *obj)
>      object_property_add_const_link(OBJECT(&s->dma), "dma-mr",
>                                     OBJECT(&s->gpu_bus_mr), &error_abort);
>
> +    /* Thermal */
> +    sysbus_init_child_obj(obj, "thermal", &s->thermal, sizeof(s->thermal),
> +                          TYPE_BCM2835_THERMAL);
> +
>      /* GPIO */
>      sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
>                            TYPE_BCM2835_GPIO);
> @@ -321,6 +325,15 @@ static void bcm2835_peripherals_realize(DeviceState 
> *dev, Error **errp)
>                                                    INTERRUPT_DMA0 + n));
>      }
>
> +    /* THERMAL */
> +    object_property_set_bool(OBJECT(&s->thermal), true, "realized", &err);
> +    if (err) {
> +        error_propagate(errp, err);
> +        return;
> +    }
> +    memory_region_add_subregion(&s->peri_mr, THERMAL_OFFSET,
> +                sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->thermal), 0));
> +
>      /* GPIO */
>      object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
>      if (err) {
> diff --git a/include/hw/arm/bcm2835_peripherals.h 
> b/include/hw/arm/bcm2835_peripherals.h
> index 62a4c7b559..be7ad9b499 100644
> --- a/include/hw/arm/bcm2835_peripherals.h
> +++ b/include/hw/arm/bcm2835_peripherals.h
> @@ -20,6 +20,7 @@
>  #include "hw/misc/bcm2835_property.h"
>  #include "hw/misc/bcm2835_rng.h"
>  #include "hw/misc/bcm2835_mbox.h"
> +#include "hw/misc/bcm2835_thermal.h"
>  #include "hw/sd/sdhci.h"
>  #include "hw/sd/bcm2835_sdhost.h"
>  #include "hw/gpio/bcm2835_gpio.h"
> @@ -53,6 +54,7 @@ typedef struct BCM2835PeripheralState {
>      SDHCIState sdhci;
>      BCM2835SDHostState sdhost;
>      BCM2835GpioState gpio;
> +    Bcm2835ThermalState thermal;
>      UnimplementedDeviceState i2s;
>      UnimplementedDeviceState spi[1];
>      UnimplementedDeviceState i2c[3];
> diff --git a/include/hw/arm/raspi_platform.h b/include/hw/arm/raspi_platform.h
> index cdcbca943f..61b04a1bd4 100644
> --- a/include/hw/arm/raspi_platform.h
> +++ b/include/hw/arm/raspi_platform.h
> @@ -48,6 +48,7 @@
>  #define SPI0_OFFSET             0x204000
>  #define BSC0_OFFSET             0x205000 /* BSC0 I2C/TWI */
>  #define OTP_OFFSET              0x20f000
> +#define THERMAL_OFFSET          0x212000
>  #define BSC_SL_OFFSET           0x214000 /* SPI slave */
>  #define AUX_OFFSET              0x215000 /* AUX: UART1/SPI1/SPI2 */
>  #define EMMC1_OFFSET            0x300000
> --
> 2.20.1
>
>