Re: [PATCH 17/24] aspeed: Remove swift-bmc machine

[Adriana Kobylak]

"Cédric Le Goater" <clg@kaod.org> wrote on 04/07/2021 12:16:30 PM:

> From: "Cédric Le Goater" <clg@kaod.org>
> To: "Peter Maydell" <peter.maydell@linaro.org>
> Cc: "Andrew Jeffery" <andrew@aj.id.au>, "Joel Stanley"
> <joel@jms.id.au>, qemu-arm@nongnu.org, qemu-devel@nongnu.org,
> "Cédric Le Goater" <clg@kaod.org>, Adriana Kobylak/Austin/IBM@IBM
> Date: 04/07/2021 12:16 PM
> Subject: [PATCH 17/24] aspeed: Remove swift-bmc machine
>
> The SWIFT machine never came out of the lab and we already have enough
> AST2500 based OpenPower machines. Remove it.
>
> Cc: Adriana Kobylak <anoo@us.ibm.com>
> Signed-off-by: Cédric Le Goater <clg@kaod.org>

Reviewed-by: Adriana Kobylak <anoo@us.ibm.com>

> ---
>  hw/arm/aspeed.c | 61 -------------------------------------------------
>  1 file changed, 61 deletions(-)
>
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index 1cf5a15c8098..97dcca74feb4 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -110,17 +110,6 @@ struct AspeedMachineState {
>          SCU_HW_STRAP_VGA_SIZE_SET(VGA_16M_DRAM) |                       \
>          SCU_AST2500_HW_STRAP_RESERVED1)
>  
> -/* Swift hardware value: 0xF11AD206 */
> -#define SWIFT_BMC_HW_STRAP1 (                                           \
> -        AST2500_HW_STRAP1_DEFAULTS |                                    \
> -        SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE |                     \
> -        SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE |                        \
> -        SCU_AST2500_HW_STRAP_UART_DEBUG |                               \
> -        SCU_AST2500_HW_STRAP_DDR4_ENABLE |                              \
> -        SCU_H_PLL_BYPASS_EN |                                           \
> -        SCU_AST2500_HW_STRAP_ACPI_ENABLE |                              \
> -        SCU_HW_STRAP_SPI_MODE(SCU_HW_STRAP_SPI_MASTER))
> -
>  #define G220A_BMC_HW_STRAP1 (                                      \
>          SCU_AST2500_HW_STRAP_SPI_AUTOFETCH_ENABLE |                     \
>          SCU_AST2500_HW_STRAP_GPIO_STRAP_ENABLE |                        \
> @@ -465,35 +454,6 @@ static void romulus_bmc_i2c_init(AspeedMachineState *bmc)
>      i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 11),
> "ds1338", 0x32);
>  }
>  
> -static void swift_bmc_i2c_init(AspeedMachineState *bmc)
> -{
> -    AspeedSoCState *soc = &bmc->soc;
> -
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 3),
> "pca9552", 0x60);
> -
> -    /* The swift board expects a TMP275 but a TMP105 is compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7),
> "tmp105", 0x48);
> -    /* The swift board expects a pca9551 but a pca9552 is compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 7),
> "pca9552", 0x60);
> -
> -    /* The swift board expects an Epson RX8900 RTC but a ds1338 is
> compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8),
> "ds1338", 0x32);
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 8),
> "pca9552", 0x60);
> -
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9),
> "tmp423", 0x4c);
> -    /* The swift board expects a pca9539 but a pca9552 is compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 9),
> "pca9552", 0x74);
> -
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10),
> "tmp423", 0x4c);
> -    /* The swift board expects a pca9539 but a pca9552 is compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 10), "pca9552",
> -                     0x74);
> -
> -    /* The swift board expects a TMP275 but a TMP105 is compatible */
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12),
> "tmp105", 0x48);
> -    i2c_slave_create_simple(aspeed_i2c_get_bus(&soc->i2c, 12),
> "tmp105", 0x4a);
> -}
> -
>  static void sonorapass_bmc_i2c_init(AspeedMachineState *bmc)
>  {
>      AspeedSoCState *soc = &bmc->soc;
> @@ -796,23 +756,6 @@ static void
> aspeed_machine_sonorapass_class_init(ObjectClass *oc, void *data)
>          aspeed_soc_num_cpus(amc->soc_name);
>  };
>  
> -static void aspeed_machine_swift_class_init(ObjectClass *oc, void *data)
> -{
> -    MachineClass *mc = MACHINE_CLASS(oc);
> -    AspeedMachineClass *amc = ASPEED_MACHINE_CLASS(oc);
> -
> -    mc->desc       = "OpenPOWER Swift BMC (ARM1176)";
> -    amc->soc_name  = "ast2500-a1";
> -    amc->hw_strap1 = SWIFT_BMC_HW_STRAP1;
> -    amc->fmc_model = "mx66l1g45g";
> -    amc->spi_model = "mx66l1g45g";
> -    amc->num_cs    = 2;
> -    amc->i2c_init  = swift_bmc_i2c_init;
> -    mc->default_ram_size       = 512 * MiB;
> -    mc->default_cpus = mc->min_cpus = mc->max_cpus =
> -        aspeed_soc_num_cpus(amc->soc_name);
> -};
> -
>  static void aspeed_machine_witherspoon_class_init(ObjectClass *oc,
> void *data)
>  {
>      MachineClass *mc = MACHINE_CLASS(oc);
> @@ -903,10 +846,6 @@ static const TypeInfo aspeed_machine_types[] = {
>          .name          = MACHINE_TYPE_NAME("romulus-bmc"),
>          .parent        = TYPE_ASPEED_MACHINE,
>          .class_init    = aspeed_machine_romulus_class_init,
> -    }, {
> -        .name          = MACHINE_TYPE_NAME("swift-bmc"),
> -        .parent        = TYPE_ASPEED_MACHINE,
> -        .class_init    = aspeed_machine_swift_class_init,
>      }, {
>          .name          = MACHINE_TYPE_NAME("sonorapass-bmc"),
>          .parent        = TYPE_ASPEED_MACHINE,
> --
> 2.26.3
>