Commit 79a9f323 authored by Cédric Le Goater's avatar Cédric Le Goater Committed by Peter Maydell
Browse files

ast2400: externalize revision numbers 



AST2400_A0_SILICON_REV is defined twice. Fix this by including the
definition in the header file as well as the routine to check if a
silicon revision is supported. It will useful to reuse in other
controllers.

Let's add also AST2500_A0_SILICON_REV for future use.

Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 1467994016-11678-5-git-send-email-clg@kaod.org
Reviewed-by: default avatarPeter Maydell <peter.maydell@linaro.org>
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 2e1f0502

hw/arm/ast2400.c

+0 −2
Original line number Diff line number Diff line
@@ -34,8 +34,6 @@ 
#define AST2400_FMC_FLASH_BASE   0x20000000

#define AST2400_SPI_FLASH_BASE   0x30000000



#define AST2400_A0_SILICON_REV   0x02000303



static const int uart_irqs[] = { 9, 32, 33, 34, 10 };

static const int timer_irqs[] = { 16, 17, 18, 35, 36, 37, 38, 39, };

hw/misc/aspeed_scu.c

+1 −3
Original line number Diff line number Diff line
@@ -88,8 +88,6 @@ 
#define PROT_KEY_UNLOCK 0x1688A8A8

#define SCU_IO_REGION_SIZE 0x20000



#define AST2400_A0_SILICON_REV     0x02000303U



static const uint32_t ast2400_a0_resets[ASPEED_SCU_NR_REGS] = {

     [SYS_RST_CTRL]    = 0xFFCFFEDCU,

     [CLK_SEL]         = 0xF3F40000U,
@@ -212,7 +210,7 @@ static void aspeed_scu_reset(DeviceState *dev) 


static uint32_t aspeed_silicon_revs[] = { AST2400_A0_SILICON_REV, };



static bool is_supported_silicon_rev(uint32_t silicon_rev)

bool is_supported_silicon_rev(uint32_t silicon_rev)

{

    int i;

include/hw/misc/aspeed_scu.h

+5 −0
Original line number Diff line number Diff line
@@ -31,4 +31,9 @@ typedef struct AspeedSCUState { 
    uint32_t hw_strap2;

} AspeedSCUState;



#define AST2400_A0_SILICON_REV   0x02000303U

#define AST2500_A0_SILICON_REV   0x04000303U



extern bool is_supported_silicon_rev(uint32_t silicon_rev);



#endif /* ASPEED_SCU_H */