aspeed_soc: Rename memmap/irqmap enum constants
commit347df6f87616fbc496a1fef597dda2ab7b73be36
authorEduardo Habkost <ehabkost@redhat.com>
Tue, 25 Aug 2020 19:20:02 +0000 (25 15:20 -0400)
committerEduardo Habkost <ehabkost@redhat.com>
Thu, 27 Aug 2020 18:04:54 +0000 (27 14:04 -0400)
tree76a2af6947b6fbd75a784ef63dd159c31d33cd2a
parent4af44e1eca3a36cd7a1c68d73692bdd76fb8f7e4
aspeed_soc: Rename memmap/irqmap enum constants

Some of the enum constant names conflict with the QOM type check
macros:

ASPEED_GPIO
ASPEED_I2C
ASPEED_RTC
ASPEED_SCU
ASPEED_SDHCI
ASPEED_SDMC
ASPEED_VIC
ASPEED_WDT
ASPEED_XDMA

This needs to be addressed to allow us to transform the QOM type
check macros into functions generated by OBJECT_DECLARE_TYPE().

Rename all the constants to ASPEED_DEV_*, to avoid conflicts.

Reviewed-by: CĂ©dric Le Goater <clg@kaod.org>
Reviewed-by: Daniel P. Berrangé <berrange@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
Tested-By: Roman Bolshakov <r.bolshakov@yadro.com>
Message-Id: <20200825192110.3528606-7-ehabkost@redhat.com>
Signed-off-by: Eduardo Habkost <ehabkost@redhat.com>
hw/arm/aspeed.c
hw/arm/aspeed_ast2600.c
hw/arm/aspeed_soc.c
include/hw/arm/aspeed_soc.h