Commit 514bcf6f authored by Joel Stanley's avatar Joel Stanley Committed by Peter Maydell
Browse files

aspeed/soc: Add ASPEED Video stub 



Signed-off-by: default avatarJoel Stanley <joel@jms.id.au>
Signed-off-by: default avatarCédric Le Goater <clg@kaod.org>
Message-id: 20190925143248.10000-24-clg@kaod.org
Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parent 289251b0

hw/arm/aspeed_ast2600.c

+5 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ static const hwaddr aspeed_soc_ast2600_memmap[] = { 
    [ASPEED_SCU]       = 0x1E6E2000,

    [ASPEED_XDMA]      = 0x1E6E7000,

    [ASPEED_ADC]       = 0x1E6E9000,

    [ASPEED_VIDEO]     = 0x1E700000,

    [ASPEED_SDHCI]     = 0x1E740000,

    [ASPEED_GPIO]      = 0x1E780000,

    [ASPEED_GPIO_1_8V] = 0x1E780800,
@@ -236,6 +237,10 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp) 
    create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM],

                                ASPEED_SOC_IOMEM_SIZE);



    /* Video engine stub */

    create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO],

                                0x1000);



    if (s->num_cpus > sc->num_cpus) {

        warn_report("%s: invalid number of CPUs %d, using default %d",

                    sc->name, s->num_cpus, sc->num_cpus);

hw/arm/aspeed_soc.c

+6 −0
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ static const hwaddr aspeed_soc_ast2400_memmap[] = { 
    [ASPEED_SDMC]   = 0x1E6E0000,

    [ASPEED_SCU]    = 0x1E6E2000,

    [ASPEED_XDMA]   = 0x1E6E7000,

    [ASPEED_VIDEO]  = 0x1E700000,

    [ASPEED_ADC]    = 0x1E6E9000,

    [ASPEED_SRAM]   = 0x1E720000,

    [ASPEED_SDHCI]  = 0x1E740000,
@@ -63,6 +64,7 @@ static const hwaddr aspeed_soc_ast2500_memmap[] = { 
    [ASPEED_SCU]    = 0x1E6E2000,

    [ASPEED_XDMA]   = 0x1E6E7000,

    [ASPEED_ADC]    = 0x1E6E9000,

    [ASPEED_VIDEO]  = 0x1E700000,

    [ASPEED_SRAM]   = 0x1E720000,

    [ASPEED_SDHCI]  = 0x1E740000,

    [ASPEED_GPIO]   = 0x1E780000,
@@ -231,6 +233,10 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp) 
    create_unimplemented_device("aspeed_soc.io", sc->memmap[ASPEED_IOMEM],

                                ASPEED_SOC_IOMEM_SIZE);



    /* Video engine stub */

    create_unimplemented_device("aspeed.video", sc->memmap[ASPEED_VIDEO],

                                0x1000);



    if (s->num_cpus > sc->num_cpus) {

        warn_report("%s: invalid number of CPUs %d, using default %d",

                    sc->name, s->num_cpus, sc->num_cpus);

include/hw/arm/aspeed_soc.h

+1 −0
Original line number Diff line number Diff line
@@ -96,6 +96,7 @@ enum { 
    ASPEED_SDMC,

    ASPEED_SCU,

    ASPEED_ADC,

    ASPEED_VIDEO,

    ASPEED_SRAM,

    ASPEED_SDHCI,

    ASPEED_GPIO,