From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 24074C433F5 for ; Tue, 30 Nov 2021 12:15:48 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S241446AbhK3MTG (ORCPT ); Tue, 30 Nov 2021 07:19:06 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:52480 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240965AbhK3MTF (ORCPT ); Tue, 30 Nov 2021 07:19:05 -0500 Received: from mail-ua1-x92c.google.com (mail-ua1-x92c.google.com [IPv6:2607:f8b0:4864:20::92c]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 6CA39C06174A for ; Tue, 30 Nov 2021 04:15:46 -0800 (PST) Received: by mail-ua1-x92c.google.com with SMTP id w23so40874985uao.5 for ; Tue, 30 Nov 2021 04:15:46 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=vanguardiasur-com-ar.20210112.gappssmtp.com; s=20210112; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=D0mw93VUXSvv9PrYmrUAaGd/pqXhij6XVGDbV+g6WIU=; b=wogE/Z0DZ4jA4YAj/X92JyIrHC+m1SB6igDc4ElmWJrRmGbeZB78fUwjuxI/vf8zW2 SyCVIqcrZhVSmybJvuSnkKKjwsbiJsQ0iISbs9RpA0EdhSc926sSMLcWW0AxUADxJkdh 9ci2MsRyNZn5wxbOh5uUyV6sYOKZRrOKhUgRQICcHoLZUyqQPhm82vSSVznUV6lv+Qfj xYqUhtN3pDbuMetySDbqQPSS3A+qO5XRBCAZ5noUdVzIkfkeg6eFtprA6aSwmcM9XyAu z0JWuSvQJWULvDr63w/RzEzMAukf4QHxBgnulG13eg5X+avdeU6YAQsuuX9IugGoNnLr Krmw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=D0mw93VUXSvv9PrYmrUAaGd/pqXhij6XVGDbV+g6WIU=; b=QdqUGuYWXX1Tzxms+NI8DTnK6ZwWj0SkBvnBzrQji3oi5bhN6rqC1FMBDZsZClMTVC 2gbMxV2b6ZeHBBN02MMwa9xCUZ4Uen0wI90/TWkQZLpP/W1L4+RYPr7+hsGb1OliLx1s amEoCsKHRK3IZ3CUwDuyPHXGI6j6X9NPsIpEnj6tlvyq+SzIL9C5qp0uM5qZDqe5LGNE VyZoYgQjTjGyP8o2atTmkKgHy/DYGMPPfgEHr5boevHx37LyL0KaPr7HJqTslE7qCnq3 BSxTxM1lHJEIjly6nK9yNlpy6lIL3J3TlQLalJq673npWi+sq/2lJA6a7O2StHvu2lLI Ws7A== X-Gm-Message-State: AOAM532pxBa+/GBxsw5OvWNnsxEe+p8jb0EJ3V8M7iGEGD5yo+6djft4 edZeLqE/Z/T2WBKiR18eqvlyzw== X-Google-Smtp-Source: ABdhPJyCNxQdSY3YZruzyVJnb1BCD/Sq40KKRtki81VwF4tplQMFk7VK2k8mJuh9ajNFgAKFx10ARg== X-Received: by 2002:a05:6102:2c6:: with SMTP id h6mr31346929vsh.13.1638274545465; Tue, 30 Nov 2021 04:15:45 -0800 (PST) Received: from eze-laptop (host208.201-253-22.telecom.net.ar. [201.253.22.208]) by smtp.gmail.com with ESMTPSA id l190sm9955863vsc.26.2021.11.30.04.15.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Nov 2021 04:15:44 -0800 (PST) Date: Tue, 30 Nov 2021 09:15:39 -0300 From: Ezequiel Garcia To: Jernej Skrabec Cc: linux-media@vger.kernel.org, nicolas.dufresne@collabora.com, mchehab@kernel.org, robh+dt@kernel.org, mripard@kernel.org, wens@csie.org, p.zabel@pengutronix.de, andrzej.p@collabora.com, gregkh@linuxfoundation.org, devicetree@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: Re: [PATCH v2 2/9] media: hantro: add support for reset lines Message-ID: References: <20211129182633.480021-1-jernej.skrabec@gmail.com> <20211129182633.480021-3-jernej.skrabec@gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211129182633.480021-3-jernej.skrabec@gmail.com> Precedence: bulk List-ID: X-Mailing-List: linux-media@vger.kernel.org On Mon, Nov 29, 2021 at 07:26:26PM +0100, Jernej Skrabec wrote: > Some SoCs like Allwinner H6 use reset lines for resetting Hantro G2. Add > support for them. > > Signed-off-by: Jernej Skrabec Reviewed-by: Ezequiel Garcia Thanks! > --- > drivers/staging/media/hantro/hantro.h | 3 +++ > drivers/staging/media/hantro/hantro_drv.c | 15 ++++++++++++++- > 2 files changed, 17 insertions(+), 1 deletion(-) > > diff --git a/drivers/staging/media/hantro/hantro.h b/drivers/staging/media/hantro/hantro.h > index 7da23f7f207a..33eb3e092cc1 100644 > --- a/drivers/staging/media/hantro/hantro.h > +++ b/drivers/staging/media/hantro/hantro.h > @@ -16,6 +16,7 @@ > #include > #include > #include > +#include > > #include > #include > @@ -171,6 +172,7 @@ hantro_vdev_to_func(struct video_device *vdev) > * @dev: Pointer to device for convenient logging using > * dev_ macros. > * @clocks: Array of clock handles. > + * @resets: Array of reset handles. > * @reg_bases: Mapped addresses of VPU registers. > * @enc_base: Mapped address of VPU encoder register for convenience. > * @dec_base: Mapped address of VPU decoder register for convenience. > @@ -190,6 +192,7 @@ struct hantro_dev { > struct platform_device *pdev; > struct device *dev; > struct clk_bulk_data *clocks; > + struct reset_control *resets; > void __iomem **reg_bases; > void __iomem *enc_base; > void __iomem *dec_base; > diff --git a/drivers/staging/media/hantro/hantro_drv.c b/drivers/staging/media/hantro/hantro_drv.c > index 3d3107a39dae..770f4ce71d29 100644 > --- a/drivers/staging/media/hantro/hantro_drv.c > +++ b/drivers/staging/media/hantro/hantro_drv.c > @@ -905,6 +905,10 @@ static int hantro_probe(struct platform_device *pdev) > return PTR_ERR(vpu->clocks[0].clk); > } > > + vpu->resets = devm_reset_control_array_get(&pdev->dev, false, true); > + if (IS_ERR(vpu->resets)) > + return PTR_ERR(vpu->resets); > + > num_bases = vpu->variant->num_regs ?: 1; > vpu->reg_bases = devm_kcalloc(&pdev->dev, num_bases, > sizeof(*vpu->reg_bases), GFP_KERNEL); > @@ -978,10 +982,16 @@ static int hantro_probe(struct platform_device *pdev) > pm_runtime_use_autosuspend(vpu->dev); > pm_runtime_enable(vpu->dev); > > + ret = reset_control_deassert(vpu->resets); > + if (ret) { > + dev_err(&pdev->dev, "Failed to deassert resets\n"); > + goto err_pm_disable; > + } > + > ret = clk_bulk_prepare(vpu->variant->num_clocks, vpu->clocks); > if (ret) { > dev_err(&pdev->dev, "Failed to prepare clocks\n"); > - goto err_pm_disable; > + goto err_rst_assert; > } > > ret = v4l2_device_register(&pdev->dev, &vpu->v4l2_dev); > @@ -1037,6 +1047,8 @@ static int hantro_probe(struct platform_device *pdev) > v4l2_device_unregister(&vpu->v4l2_dev); > err_clk_unprepare: > clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); > +err_rst_assert: > + reset_control_assert(vpu->resets); > err_pm_disable: > pm_runtime_dont_use_autosuspend(vpu->dev); > pm_runtime_disable(vpu->dev); > @@ -1056,6 +1068,7 @@ static int hantro_remove(struct platform_device *pdev) > v4l2_m2m_release(vpu->m2m_dev); > v4l2_device_unregister(&vpu->v4l2_dev); > clk_bulk_unprepare(vpu->variant->num_clocks, vpu->clocks); > + reset_control_assert(vpu->resets); > pm_runtime_dont_use_autosuspend(vpu->dev); > pm_runtime_disable(vpu->dev); > return 0; > -- > 2.34.1 >