-----Original Message----- From: joel.stan@gmail.com joel.stan@gmail.com On Behalf Of Joel Stanley Sent: Monday, June 20, 2022 3:25 PM To: Ryan Chen ryan_chen@aspeedtech.com; BMC-SW BMC-SW@aspeedtech.com; Heiko Schocher hs@denx.de Cc: u-boot@lists.denx.de; Cédric Le Goater clg@kaod.org Subject: [PATCH 06/10] reset/aspeed: Implement status callback
The I2C driver shares a reset line between buses, so allow it to test the state of the reset line before resetting it.
Signed-off-by: Joel Stanley joel@jms.id.au
Reviewed-by: Ryan Chen ryan_chen@aspeedtech.com
drivers/reset/reset-ast2500.c | 19 +++++++++++++++++++ drivers/reset/reset-ast2600.c | 17 +++++++++++++++++ 2 files changed, 36 insertions(+)
diff --git a/drivers/reset/reset-ast2500.c b/drivers/reset/reset-ast2500.c index 0a1dd236aff3..d9cecf3a72e8 100644 --- a/drivers/reset/reset-ast2500.c +++ b/drivers/reset/reset-ast2500.c @@ -48,6 +48,24 @@ static int ast2500_reset_deassert(struct reset_ctl *reset_ctl) return 0; }
+static int ast2500_reset_status(struct reset_ctl *reset_ctl) {
- struct ast2500_reset_priv *priv = dev_get_priv(reset_ctl->dev);
- struct ast2500_scu *scu = priv->scu;
- int status;
- debug("%s: reset_ctl->id: %lu\n", __func__, reset_ctl->id);
- if (reset_ctl->id < 32)
status = BIT(reset_ctl->id) & readl(&scu->sysreset_ctrl1);- else
status = BIT(reset_ctl->id - 32) & readl(&scu->sysreset_ctrl2);- return !!status;
+}
static int ast2500_reset_probe(struct udevice *dev) { int rc; @@ -79,6 +97,7 @@ static const struct udevice_id ast2500_reset_ids[] = { struct reset_ops ast2500_reset_ops = { .rst_assert = ast2500_reset_assert, .rst_deassert = ast2500_reset_deassert,
- .rst_status = ast2500_reset_status,
};
U_BOOT_DRIVER(ast2500_reset) = { diff --git a/drivers/reset/reset-ast2600.c b/drivers/reset/reset-ast2600.c index 985235a3ac46..1732a450efc0 100644 --- a/drivers/reset/reset-ast2600.c +++ b/drivers/reset/reset-ast2600.c @@ -47,6 +47,22 @@ static int ast2600_reset_deassert(struct reset_ctl *reset_ctl) return 0; }
+static int ast2600_reset_status(struct reset_ctl *reset_ctl) {
- struct ast2600_reset_priv *priv = dev_get_priv(reset_ctl->dev);
- struct ast2600_scu *scu = priv->scu;
- int status;
- debug("%s: reset_ctl->id: %lu\n", __func__, reset_ctl->id);
- if (reset_ctl->id < 32)
status = BIT(reset_ctl->id) & readl(&scu->modrst_ctrl1);- else
status = BIT(reset_ctl->id - 32) & readl(&scu->modrst_ctrl2);- return !!status;
+}
static int ast2600_reset_probe(struct udevice *dev) { int rc; @@ -78,6 +94,7 @@ static const struct udevice_id ast2600_reset_ids[] = { struct reset_ops ast2600_reset_ops = { .rst_assert = ast2600_reset_assert, .rst_deassert = ast2600_reset_deassert,
- .rst_status = ast2600_reset_status,
};
U_BOOT_DRIVER(ast2600_reset) = {
2.35.1