From: "Cédric Le Goater" <clg@kaod.org>
To: Peter Maydell <peter.maydell@linaro.org>
Cc: "Philippe Mathieu-Daudé" <f4bug@amsat.org>,
qemu-arm@nongnu.org, qemu-devel@nongnu.org,
"Cédric Le Goater" <clg@kaod.org>
Subject: [PULL 02/18] aspeed/smc: Remove unused "sdram-base" property
Date: Mon, 3 May 2021 07:25:44 +0200 [thread overview]
Message-ID: <20210503052600.290483-3-clg@kaod.org> (raw)
In-Reply-To: <20210503052600.290483-1-clg@kaod.org>
Cc: Philippe Mathieu-Daudé <f4bug@amsat.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Message-Id: <20210407171637.777743-3-clg@kaod.org>
Signed-off-by: Cédric Le Goater <clg@kaod.org>
---
include/hw/ssi/aspeed_smc.h | 3 ---
hw/arm/aspeed_ast2600.c | 4 ----
hw/arm/aspeed_soc.c | 4 ----
hw/ssi/aspeed_smc.c | 1 -
4 files changed, 12 deletions(-)
diff --git a/include/hw/ssi/aspeed_smc.h b/include/hw/ssi/aspeed_smc.h
index 16c03fe64f3b..ccd71d9b534e 100644
--- a/include/hw/ssi/aspeed_smc.h
+++ b/include/hw/ssi/aspeed_smc.h
@@ -103,9 +103,6 @@ struct AspeedSMCState {
uint8_t r_timings;
uint8_t conf_enable_w0;
- /* for DMA support */
- uint64_t sdram_base;
-
AddressSpace flash_as;
MemoryRegion *dram_mr;
AddressSpace dram_as;
diff --git a/hw/arm/aspeed_ast2600.c b/hw/arm/aspeed_ast2600.c
index bc87e754a3cc..2a1255b6a042 100644
--- a/hw/arm/aspeed_ast2600.c
+++ b/hw/arm/aspeed_ast2600.c
@@ -344,10 +344,6 @@ static void aspeed_soc_ast2600_realize(DeviceState *dev, Error **errp)
/* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr),
&error_abort);
- if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base",
- sc->memmap[ASPEED_DEV_SDRAM], errp)) {
- return;
- }
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) {
return;
}
diff --git a/hw/arm/aspeed_soc.c b/hw/arm/aspeed_soc.c
index 057d053c8478..817f3ba63dfd 100644
--- a/hw/arm/aspeed_soc.c
+++ b/hw/arm/aspeed_soc.c
@@ -301,10 +301,6 @@ static void aspeed_soc_realize(DeviceState *dev, Error **errp)
/* FMC, The number of CS is set at the board level */
object_property_set_link(OBJECT(&s->fmc), "dram", OBJECT(s->dram_mr),
&error_abort);
- if (!object_property_set_int(OBJECT(&s->fmc), "sdram-base",
- sc->memmap[ASPEED_DEV_SDRAM], errp)) {
- return;
- }
if (!sysbus_realize(SYS_BUS_DEVICE(&s->fmc), errp)) {
return;
}
diff --git a/hw/ssi/aspeed_smc.c b/hw/ssi/aspeed_smc.c
index 6f72fb028e59..884e08aca4e2 100644
--- a/hw/ssi/aspeed_smc.c
+++ b/hw/ssi/aspeed_smc.c
@@ -1431,7 +1431,6 @@ static const VMStateDescription vmstate_aspeed_smc = {
static Property aspeed_smc_properties[] = {
DEFINE_PROP_UINT32("num-cs", AspeedSMCState, num_cs, 1),
DEFINE_PROP_BOOL("inject-failure", AspeedSMCState, inject_failure, false),
- DEFINE_PROP_UINT64("sdram-base", AspeedSMCState, sdram_base, 0),
DEFINE_PROP_LINK("dram", AspeedSMCState, dram_mr,
TYPE_MEMORY_REGION, MemoryRegion *),
DEFINE_PROP_END_OF_LIST(),
--
2.26.3
next prev parent reply other threads:[~2021-05-03 5:37 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-03 5:25 [PULL 00/18] aspeed queue (v2) Cédric Le Goater
2021-05-03 5:25 ` [PULL 01/18] aspeed/smc: Use the RAM memory region for DMAs Cédric Le Goater
2021-05-03 5:25 ` Cédric Le Goater [this message]
2021-05-03 5:25 ` [PULL 03/18] aspeed/i2c: Fix DMA address mask Cédric Le Goater
2021-05-03 5:25 ` [PULL 04/18] aspeed/i2c: Rename DMA address space Cédric Le Goater
2021-05-03 5:25 ` [PULL 05/18] hw/arm/aspeed: Do not sysbus-map mmio flash region directly, use alias Cédric Le Goater
2021-05-03 5:25 ` [PULL 06/18] hw: Model ASPEED's Hash and Crypto Engine Cédric Le Goater
2021-05-03 5:25 ` [PULL 07/18] aspeed: Integrate HACE Cédric Le Goater
2021-05-03 5:25 ` [PULL 08/18] tests/qtest: Add test for Aspeed HACE Cédric Le Goater
2021-05-03 5:25 ` [PULL 09/18] tests/acceptance: Test ast2400 and ast2500 machines Cédric Le Goater
2021-05-03 5:25 ` [PULL 10/18] tests/acceptance: Test ast2600 machine Cédric Le Goater
2021-05-03 5:25 ` [PULL 11/18] hw/misc/aspeed_xdma: Add AST2600 support Cédric Le Goater
2021-05-03 5:25 ` [PULL 12/18] aspeed/smc: Add a 'features' attribute to the object class Cédric Le Goater
2021-05-03 5:25 ` [PULL 13/18] aspeed/smc: Add extra controls to request DMA Cédric Le Goater
2021-05-03 5:25 ` [PULL 14/18] tests/qtest: Rename m25p80 test in aspeed_smc test Cédric Le Goater
2021-05-03 5:25 ` [PULL 15/18] aspeed: Deprecate the swift-bmc machine Cédric Le Goater
2021-05-03 5:25 ` [PULL 16/18] aspeed: Add support for the rainier-bmc board Cédric Le Goater
2021-05-03 5:25 ` [PULL 17/18] hw/block: m25p80: Add support for mt25ql02g and mt25qu02g Cédric Le Goater
2021-05-03 5:26 ` [PULL 18/18] aspeed: Add support for the quanta-q7l1-bmc board Cédric Le Goater
2021-05-05 12:50 ` [PULL 00/18] aspeed queue (v2) Peter Maydell
-- strict thread matches above, loose matches on Subject: below --
2021-04-30 16:33 [PULL 00/18] aspeed queue Cédric Le Goater
2021-04-30 16:33 ` [PULL 02/18] aspeed/smc: Remove unused "sdram-base" property Cédric Le Goater
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210503052600.290483-3-clg@kaod.org \
--to=clg@kaod.org \
--cc=f4bug@amsat.org \
--cc=peter.maydell@linaro.org \
--cc=qemu-arm@nongnu.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).