hw/arm/bcm2835_peripherals: Use the thermal sensor block
Map the thermal sensor in the BCM2835 block. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Philippe Mathieu-Daudé <f4bug@amsat.org> Message-id: 20191019234715.25750-3-f4bug@amsat.org Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
parent
99c641370b
commit
d442d95f2f
|
@ -111,6 +111,10 @@ static void bcm2835_peripherals_init(Object *obj)
|
||||||
object_property_add_const_link(OBJECT(&s->dma), "dma-mr",
|
object_property_add_const_link(OBJECT(&s->dma), "dma-mr",
|
||||||
OBJECT(&s->gpu_bus_mr), &error_abort);
|
OBJECT(&s->gpu_bus_mr), &error_abort);
|
||||||
|
|
||||||
|
/* Thermal */
|
||||||
|
sysbus_init_child_obj(obj, "thermal", &s->thermal, sizeof(s->thermal),
|
||||||
|
TYPE_BCM2835_THERMAL);
|
||||||
|
|
||||||
/* GPIO */
|
/* GPIO */
|
||||||
sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
|
sysbus_init_child_obj(obj, "gpio", &s->gpio, sizeof(s->gpio),
|
||||||
TYPE_BCM2835_GPIO);
|
TYPE_BCM2835_GPIO);
|
||||||
|
@ -321,6 +325,15 @@ static void bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
|
||||||
INTERRUPT_DMA0 + n));
|
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 */
|
/* GPIO */
|
||||||
object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
|
object_property_set_bool(OBJECT(&s->gpio), true, "realized", &err);
|
||||||
if (err) {
|
if (err) {
|
||||||
|
|
|
@ -20,6 +20,7 @@
|
||||||
#include "hw/misc/bcm2835_property.h"
|
#include "hw/misc/bcm2835_property.h"
|
||||||
#include "hw/misc/bcm2835_rng.h"
|
#include "hw/misc/bcm2835_rng.h"
|
||||||
#include "hw/misc/bcm2835_mbox.h"
|
#include "hw/misc/bcm2835_mbox.h"
|
||||||
|
#include "hw/misc/bcm2835_thermal.h"
|
||||||
#include "hw/sd/sdhci.h"
|
#include "hw/sd/sdhci.h"
|
||||||
#include "hw/sd/bcm2835_sdhost.h"
|
#include "hw/sd/bcm2835_sdhost.h"
|
||||||
#include "hw/gpio/bcm2835_gpio.h"
|
#include "hw/gpio/bcm2835_gpio.h"
|
||||||
|
@ -53,6 +54,7 @@ typedef struct BCM2835PeripheralState {
|
||||||
SDHCIState sdhci;
|
SDHCIState sdhci;
|
||||||
BCM2835SDHostState sdhost;
|
BCM2835SDHostState sdhost;
|
||||||
BCM2835GpioState gpio;
|
BCM2835GpioState gpio;
|
||||||
|
Bcm2835ThermalState thermal;
|
||||||
UnimplementedDeviceState i2s;
|
UnimplementedDeviceState i2s;
|
||||||
UnimplementedDeviceState spi[1];
|
UnimplementedDeviceState spi[1];
|
||||||
UnimplementedDeviceState i2c[3];
|
UnimplementedDeviceState i2c[3];
|
||||||
|
|
|
@ -48,6 +48,7 @@
|
||||||
#define SPI0_OFFSET 0x204000
|
#define SPI0_OFFSET 0x204000
|
||||||
#define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */
|
#define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */
|
||||||
#define OTP_OFFSET 0x20f000
|
#define OTP_OFFSET 0x20f000
|
||||||
|
#define THERMAL_OFFSET 0x212000
|
||||||
#define BSC_SL_OFFSET 0x214000 /* SPI slave */
|
#define BSC_SL_OFFSET 0x214000 /* SPI slave */
|
||||||
#define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */
|
#define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */
|
||||||
#define EMMC1_OFFSET 0x300000
|
#define EMMC1_OFFSET 0x300000
|
||||||
|
|
Loading…
Reference in a new issue