Page MenuHomeFreeBSD
Files F102875971

D37358.diff
No OneTemporary
Actions

D37358.diff
View Options

diff --git a/sys/arm64/rockchip/rk_tsadc.c b/sys/arm64/rockchip/rk_tsadc.c
--- a/sys/arm64/rockchip/rk_tsadc.c
+++ b/sys/arm64/rockchip/rk_tsadc.c
@@ -139,7 +139,7 @@
clk_t tsadc_clk;
clk_t apb_pclk_clk;
- hwreset_t hwreset;
+ hwreset_array_t hwreset;
struct syscon *grf;
struct tsadc_conf *conf;
@@ -736,9 +736,9 @@
}
/* 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);
@@ -775,7 +775,7 @@
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;
@@ -798,7 +798,7 @@
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;
@@ -832,7 +832,7 @@
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)
@@ -855,7 +855,7 @@
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)

File Metadata

Mime Type
text/plain
Expires
Tue, Nov 19, 7:52 AM (21 h, 15 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
14712780
Default Alt Text
D37358.diff (1 KB)

Event Timeline