From nobody Mon Jan 23 12:37:45 2023 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4P0qPj6pJtz3bT8L; Mon, 23 Jan 2023 12:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4P0qPj3vjqz3Ccx; Mon, 23 Jan 2023 12:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xp1fW/ncXdbp42o1FyJjHBhA6/MMfV1V52yFu05V7ew=; b=PV+Yf3bApwHyfk3mw80FGMzPImGZfSvRrq12ZA58BdYEy/nXlgv/YLDyRzCRqQEGOnmQLW od5uLxgAeMDYWr3HzjqPajvvnfn5E3o6TWiaNsqIKgh+tQfDgqcvOo9VWSwsruvLaXfRXW iaQkgVXDl0folfyH99nYlePdZief7iWdM5Cw/95NTYdPBRRMMlSaVNHRp4SLGVVhpiFiuy uxFsIhp6nudqnOH6gCO14ijZZaCWzVZjdSutZkfilloKucxp5xzfUAiw07OMyJXiQxyvKg rgnCM6YrNafnaHd4JtHNC15GjbmIE4WKb8zx+CC1H3GDGDsjm0yoSSsxBEtmNA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1674477465; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=xp1fW/ncXdbp42o1FyJjHBhA6/MMfV1V52yFu05V7ew=; b=G6rRcNbbcmYG22eeWgkrx8frv5GQwMUUolng74nSVTn7RqbpXEGD/uG1DPvyvG+UrhX38v /jKioGQGc7pK6cP/moTt3cIzA1RlUTkvrLTkHUGsGg6wKiO0oxUCuwXxBoLyvi39etLSTM I4gvjtGO/5ZSyfOpwHOeqGNAfR38z9pWAuIJjiALXzwLRqpaz7UM/KHLOSLmvQVtmp4r4X b4JpU2O+GnFfBkHl38+DeYQcVYzfhRNULzWLAm3rjo7QJpE19vnSWBfmVWAQUd2xuFEDRA mqLJnnF1+zRroqs4iZXqQdyS9GxvAmavvy/XisIrY9CbG+aX5eCFOxVTaaWvaw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1674477465; a=rsa-sha256; cv=none; b=inRqZbgEq5waCK3X/hB4/bCCXKNpcd0khUcm5iWWcoo/aFCQZ8rkPQXAaN9QKHDQNM4GPh Cgi4OZZIJ5m08yLQsn3ZXG9eTzQ/cKHPulL6AOxkLNo6tkO3jfqVhykEg2qY1B28Kk+Gg3 4Vh8Iq0L6hKnPzMCw8JyawHzIbcsikZqbX1Q3K+wTA49X44GK/iO73tIMcvPks66cOSW5v lHjuSpWCNV0JRiJLNpnhJlzjG7ZGGfnHXlRBztVkXTmGnqpTK/b+kbD9ST+c5nh/OhCGiC Bkc6RmJJVana86KdNh4AYV6IEX6g3lW4/7ltUYHcMtVXU5NT34GlsniBUfizjg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4P0qPj2zGPzVMH; Mon, 23 Jan 2023 12:37:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 30NCbj3k085523; Mon, 23 Jan 2023 12:37:45 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 30NCbjlU085522; Mon, 23 Jan 2023 12:37:45 GMT (envelope-from git) Date: Mon, 23 Jan 2023 12:37:45 GMT Message-Id: <202301231237.30NCbjlU085522@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: db310bb70725 - stable/13 - Use hwreset_array in the Rockchip tsadc driver List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: andrew X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: db310bb7072579b4d48f0abc05b3567b9bf5aa19 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=db310bb7072579b4d48f0abc05b3567b9bf5aa19 commit db310bb7072579b4d48f0abc05b3567b9bf5aa19 Author: Andrew Turner AuthorDate: 2022-11-11 08:58:34 +0000 Commit: Andrew Turner CommitDate: 2023-01-23 12:36:28 +0000 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) --- sys/arm64/rockchip/rk_tsadc.c | 14 +++++++------- 1 file 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)