diff options
| author | Andrew Turner <andrew@FreeBSD.org> | 2022-11-11 08:58:34 +0000 |
|---|---|---|
| committer | Andrew Turner <andrew@FreeBSD.org> | 2023-01-23 12:36:28 +0000 |
| commit | db310bb7072579b4d48f0abc05b3567b9bf5aa19 (patch) | |
| tree | 857512ce08a073d048af9d1be2a6b9f3c0ee468e | |
| parent | 5930ae92913b86642727720518f8fd3144426e39 (diff) | |
| download | src-db310bb7072579b4d48f0abc05b3567b9bf5aa19.tar.gz src-db310bb7072579b4d48f0abc05b3567b9bf5aa19.zip | |
Use hwreset_array in the Rockchip tsadc driver
The order of asserting/deasserting the resets doesn't matter so use
the new hwreset_array to manage them all.
Reviewed by: manu
Sponsored by: The FreeBSD Foundation
Differential Revision: https://reviews.freebsd.org/D37358
(cherry picked from commit 7ebc4c9bf76d1ea62e2ccd3020ff8e6e293b499c)
| -rw-r--r-- | sys/arm64/rockchip/rk_tsadc.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c index 54e6dabdfb8c..344ac6bc7d5e 100644 --- a/sys/arm64/rockchip/rk_tsadc.c +++ b/sys/arm64/rockchip/rk_tsadc.c @@ -127,7 +127,7 @@ struct tsadc_softc { clk_t tsadc_clk; clk_t apb_pclk_clk; - hwreset_t hwreset; + hwreset_array_t hwreset; struct syscon *grf; struct tsadc_conf *conf; @@ -646,9 +646,9 @@ tsadc_attach(device_t dev) } /* FDT resources */ - rv = hwreset_get_by_ofw_name(dev, 0, "tsadc-apb", &sc->hwreset); + rv = hwreset_array_get_ofw(dev, 0, &sc->hwreset); if (rv != 0) { - device_printf(dev, "Cannot get 'tsadc-apb' reset\n"); + device_printf(dev, "Cannot get resets\n"); goto fail; } rv = clk_get_by_ofw_name(dev, 0, "tsadc", &sc->tsadc_clk); @@ -685,7 +685,7 @@ tsadc_attach(device_t dev) sc->shutdown_pol = sc->conf->shutdown_pol; /* Wakeup controller */ - rv = hwreset_assert(sc->hwreset); + rv = hwreset_array_assert(sc->hwreset); if (rv != 0) { device_printf(dev, "Cannot assert reset\n"); goto fail; @@ -708,7 +708,7 @@ tsadc_attach(device_t dev) device_printf(dev, "Cannot enable 'apb_pclk' clock: %d\n", rv); goto fail; } - rv = hwreset_deassert(sc->hwreset); + rv = hwreset_array_deassert(sc->hwreset); if (rv != 0) { device_printf(dev, "Cannot deassert reset\n"); goto fail; @@ -742,7 +742,7 @@ fail: if (sc->apb_pclk_clk != NULL) clk_release(sc->apb_pclk_clk); if (sc->hwreset != NULL) - hwreset_release(sc->hwreset); + hwreset_array_release(sc->hwreset); if (sc->irq_res != NULL) bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); if (sc->mem_res != NULL) @@ -765,7 +765,7 @@ tsadc_detach(device_t dev) if (sc->apb_pclk_clk != NULL) clk_release(sc->apb_pclk_clk); if (sc->hwreset != NULL) - hwreset_release(sc->hwreset); + hwreset_array_release(sc->hwreset); if (sc->irq_res != NULL) bus_release_resource(dev, SYS_RES_IRQ, 0, sc->irq_res); if (sc->mem_res != NULL) |