[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH 06/14] hw/arm/bcm2835: Rename some definitions
From: |
Esteban Bosse |
Subject: |
Re: [PATCH 06/14] hw/arm/bcm2835: Rename some definitions |
Date: |
Sun, 29 Sep 2019 16:27:39 +0200 |
User-agent: |
Evolution 3.30.5-1.1 |
El mié, 04-09-2019 a las 19:13 +0200, Philippe Mathieu-Daudé escribió:
> The UART1 is part of the AUX peripheral,
> the PCM_CLOCK (yet unimplemented) is part of the CPRMAN.
>
> Reviewed-by: Peter Maydell <address@hidden>
> Signed-off-by: Philippe Mathieu-Daudé <address@hidden>
> ---
> hw/arm/bcm2835_peripherals.c | 4 ++--
> include/hw/arm/raspi_platform.h | 8 ++++----
> 2 files changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/hw/arm/bcm2835_peripherals.c
> b/hw/arm/bcm2835_peripherals.c
> index 8984e2e91f..270357b5a8 100644
> --- a/hw/arm/bcm2835_peripherals.c
> +++ b/hw/arm/bcm2835_peripherals.c
> @@ -175,7 +175,7 @@ static void
> bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
> return;
> }
>
> - memory_region_add_subregion(&s->peri_mr, UART1_OFFSET,
> + memory_region_add_subregion(&s->peri_mr, AUX_OFFSET,
> sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->aux), 0));
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->aux), 0,
> qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
> @@ -268,7 +268,7 @@ static void
> bcm2835_peripherals_realize(DeviceState *dev, Error **errp)
> return;
> }
>
> - memory_region_add_subregion(&s->peri_mr, EMMC_OFFSET,
> + memory_region_add_subregion(&s->peri_mr, EMMC1_OFFSET,
> sysbus_mmio_get_region(SYS_BUS_DEVICE(&s->sdhci),
> 0));
> sysbus_connect_irq(SYS_BUS_DEVICE(&s->sdhci), 0,
> qdev_get_gpio_in_named(DEVICE(&s->ic), BCM2835_IC_GPU_IRQ,
> diff --git a/include/hw/arm/raspi_platform.h
> b/include/hw/arm/raspi_platform.h
> index 10083d33df..6f7db85bab 100644
> --- a/include/hw/arm/raspi_platform.h
> +++ b/include/hw/arm/raspi_platform.h
> @@ -39,7 +39,7 @@
> * Doorbells &
> Mailboxes */
> #define PM_OFFSET 0x100000 /* Power Management, Reset
> controller
> * and Watchdog registers
> */
> -#define PCM_CLOCK_OFFSET 0x101098
> +#define CPRMAN_OFFSET 0x101000 /* Clock Management */
> #define RNG_OFFSET 0x104000
> #define GPIO_OFFSET 0x200000
> #define UART0_OFFSET 0x201000
> @@ -47,11 +47,11 @@
> #define I2S_OFFSET 0x203000
> #define SPI0_OFFSET 0x204000
> #define BSC0_OFFSET 0x205000 /* BSC0 I2C/TWI */
> -#define UART1_OFFSET 0x215000
> -#define EMMC_OFFSET 0x300000
> +#define AUX_OFFSET 0x215000 /* AUX: UART1/SPI1/SPI2 */
> +#define EMMC1_OFFSET 0x300000
> #define SMI_OFFSET 0x600000
> #define BSC1_OFFSET 0x804000 /* BSC1 I2C/TWI */
> -#define USB_OFFSET 0x980000 /* DTC_OTG USB controller
> */
> +#define USB_OTG_OFFSET 0x980000 /* DTC_OTG USB controller
> */
> #define DMA15_OFFSET 0xE05000 /* DMA controller, channel
> 15 */
>
> /* GPU interrupts */
Reviewed-by: Esteban Bosse <address@hidden>
- Re: [PATCH 01/14] hw/arm/raspi: Use the IEC binary prefix definitions, (continued)
- [Qemu-devel] [PATCH 02/14] hw/misc/bcm2835_property: Add FIXME comment for uninitialized memory, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [RFC PATCH 03/14] hw/misc/bcm2835_property: Handle the 'domain state' property, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 04/14] hw/arm/bcm2835_peripherals: Improve logging, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 05/14] hw/arm/bcm2835_peripherals: Name various address spaces, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 06/14] hw/arm/bcm2835: Rename some definitions, Philippe Mathieu-Daudé, 2019/09/04
- Re: [PATCH 06/14] hw/arm/bcm2835: Rename some definitions,
Esteban Bosse <=
- [Qemu-devel] [PATCH 07/14] hw/arm/bcm2835: Add various unimplemented peripherals, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 08/14] hw/arm/bcm2836: Make the SoC code modular, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 09/14] hw/arm/raspi: Make the board code modular, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [PATCH 10/14] hw/arm/raspi: Define various blocks base addresses, Philippe Mathieu-Daudé, 2019/09/04
- [Qemu-devel] [RFC PATCH 14/14] hw/arm/raspi: Add the Raspberry Pi 4B board, Philippe Mathieu-Daudé, 2019/09/04