[PATCH] hw/arm/aspeed: fix AST2500/AST2600 EVB fmc model

Jae Hyun Yoo posted 1 patch 3 years, 10 months ago
Test checkpatch passed
Patches applied successfully (tree, apply log)
git fetch https://github.com/patchew-project/qemu tags/patchew/20220402184427.4010304-1-quic_jaehyoo@quicinc.com
Maintainers: "Cédric Le Goater" <clg@kaod.org>, Peter Maydell <peter.maydell@linaro.org>, Andrew Jeffery <andrew@aj.id.au>, Joel Stanley <joel@jms.id.au>
hw/arm/aspeed.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
[PATCH] hw/arm/aspeed: fix AST2500/AST2600 EVB fmc model
Posted by Jae Hyun Yoo 3 years, 10 months ago
Current fmc model of AST2500 EVB and AST2600 EVB can't emulate quad
mode properly so fix them using equivalent mx25l25635e and mx66u51235f
respectively.

These default settings still can be overridden using the 'fmc-model'
command line option.

Reported-by: Graeme Gregory <quic_ggregory@quicinc.com>
Signed-off-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
---
 hw/arm/aspeed.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
index d205384d986f..b94a56e10093 100644
--- a/hw/arm/aspeed.c
+++ b/hw/arm/aspeed.c
@@ -1092,7 +1092,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data)
     mc->desc       = "Aspeed AST2500 EVB (ARM1176)";
     amc->soc_name  = "ast2500-a1";
     amc->hw_strap1 = AST2500_EVB_HW_STRAP1;
-    amc->fmc_model = "w25q256";
+    amc->fmc_model = "mx25l25635e";
     amc->spi_model = "mx25l25635e";
     amc->num_cs    = 1;
     amc->i2c_init  = ast2500_evb_i2c_init;
@@ -1161,7 +1161,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
     amc->soc_name  = "ast2600-a3";
     amc->hw_strap1 = AST2600_EVB_HW_STRAP1;
     amc->hw_strap2 = AST2600_EVB_HW_STRAP2;
-    amc->fmc_model = "w25q512jv";
+    amc->fmc_model = "mx66u51235f";
     amc->spi_model = "mx66u51235f";
     amc->num_cs    = 1;
     amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON |
-- 
2.25.1
Re: [PATCH] hw/arm/aspeed: fix AST2500/AST2600 EVB fmc model
Posted by Cédric Le Goater 3 years, 10 months ago
On 4/2/22 20:44, Jae Hyun Yoo wrote:
> Current fmc model of AST2500 EVB and AST2600 EVB can't emulate quad
> mode properly so fix them using equivalent mx25l25635e and mx66u51235f
> respectively.
> 
> These default settings still can be overridden using the 'fmc-model'
> command line option.
> 
> Reported-by: Graeme Gregory <quic_ggregory@quicinc.com>
> Signed-off-by: Jae Hyun Yoo <quic_jaehyoo@quicinc.com>
> ---

Reviewed-by: Cédric Le Goater <clg@kaod.org>

Thanks,

C.


>   hw/arm/aspeed.c | 4 ++--
>   1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/hw/arm/aspeed.c b/hw/arm/aspeed.c
> index d205384d986f..b94a56e10093 100644
> --- a/hw/arm/aspeed.c
> +++ b/hw/arm/aspeed.c
> @@ -1092,7 +1092,7 @@ static void aspeed_machine_ast2500_evb_class_init(ObjectClass *oc, void *data)
>       mc->desc       = "Aspeed AST2500 EVB (ARM1176)";
>       amc->soc_name  = "ast2500-a1";
>       amc->hw_strap1 = AST2500_EVB_HW_STRAP1;
> -    amc->fmc_model = "w25q256";
> +    amc->fmc_model = "mx25l25635e";
>       amc->spi_model = "mx25l25635e";
>       amc->num_cs    = 1;
>       amc->i2c_init  = ast2500_evb_i2c_init;
> @@ -1161,7 +1161,7 @@ static void aspeed_machine_ast2600_evb_class_init(ObjectClass *oc, void *data)
>       amc->soc_name  = "ast2600-a3";
>       amc->hw_strap1 = AST2600_EVB_HW_STRAP1;
>       amc->hw_strap2 = AST2600_EVB_HW_STRAP2;
> -    amc->fmc_model = "w25q512jv";
> +    amc->fmc_model = "mx66u51235f";
>       amc->spi_model = "mx66u51235f";
>       amc->num_cs    = 1;
>       amc->macs_mask = ASPEED_MAC0_ON | ASPEED_MAC1_ON | ASPEED_MAC2_ON |