From nobody Mon Feb 9 07:09:38 2026 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id B2EEF14AD32; Sun, 24 Mar 2024 23:16:59 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322220; cv=none; b=u34LNjKeKIN8aNIKOhcoU5CoDQl8eaIeofsuhF/UtiefIOAHtm0mVd3h7sCXM5MMZo6ehPAKbWld7J58a0CJlGez+sUugvTsklqzX1gTXhhaLl7HcxyudWY3qf9g8Mar23JNZifXz1imKV0zeRPtvAEqur1yrAlx0HkC2qIGYJA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1711322220; c=relaxed/simple; bh=n9RmBDkTknXlF+1oBI7LpD65+Xvb2cgfpRelD4wFYjY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=iJLwQU0DPdE+qpqvsfeAIUTKjsLvFYTuUseKBKN3+s0MSHsMrAsp50AwA9nWE7IcXfZjuI8McZLf4Yhykl5XIlrqrp9CBK+KG8SYU9Y1aHTPS/xJ1nYcI3EL+GlRJvP9F8tqJEBCFfO1QOkxlni31TRa6iiioROsWaT3W3hCx3w= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=BW6WYAG1; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="BW6WYAG1" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 96D30C433C7; Sun, 24 Mar 2024 23:16:58 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1711322219; bh=n9RmBDkTknXlF+1oBI7LpD65+Xvb2cgfpRelD4wFYjY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BW6WYAG1+WDkpayrnxytR9sRSgabvlFrwJyW6cPjG5SPcwq7lnGCHKbmbjYnQ1l2q f5e7KDliuO/E+rcl6JGYdm57pUvJ5rbIHWhtI4enLifaNgTGZ7od69TNasmAQ5qPaC oiMudjeL0Qel7i2zpE5xGc6FAYZUeinRUsqFKJUH8uiXOVC0hqvJ5lgvnb/t+WamQ5 iYCQUmYTqjUx61i3xysJZC25hatwemj3a+Pbj7qYzvHjF4ZCnwA3JNAuQ0eP4NmpH2 4GAKbYbAmkG+i6IsYCg24mpV86134PUPbV+HyzaJPuimQaEolSdZWi3gqpJfqilhUO dROQ98msNssPw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jernej Skrabec , Hans Verkuil , Sasha Levin Subject: [PATCH 6.1 299/451] media: sun8i-di: Fix power on/off sequences Date: Sun, 24 Mar 2024 19:09:35 -0400 Message-ID: <20240324231207.1351418-300-sashal@kernel.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240324231207.1351418-1-sashal@kernel.org> References: <20240324231207.1351418-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" From: Jernej Skrabec [ Upstream commit cff104e33bad38f4b2c8d58816a7accfaa2879f9 ] According to user manual, reset line should be deasserted before clocks are enabled. Also fix power down sequence to be reverse of that. Fixes: a4260ea49547 ("media: sun4i: Add H3 deinterlace driver") Signed-off-by: Jernej Skrabec Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- .../media/platform/sunxi/sun8i-di/sun8i-di.c | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c b/drivers/med= ia/platform/sunxi/sun8i-di/sun8i-di.c index 3e58de58cd89d..01b44dd708bd3 100644 --- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c @@ -931,11 +931,18 @@ static int deinterlace_runtime_resume(struct device *= device) return ret; } =20 + ret =3D reset_control_deassert(dev->rstc); + if (ret) { + dev_err(dev->dev, "Failed to apply reset\n"); + + goto err_exclusive_rate; + } + ret =3D clk_prepare_enable(dev->bus_clk); if (ret) { dev_err(dev->dev, "Failed to enable bus clock\n"); =20 - goto err_exclusive_rate; + goto err_rst; } =20 ret =3D clk_prepare_enable(dev->mod_clk); @@ -952,23 +959,16 @@ static int deinterlace_runtime_resume(struct device *= device) goto err_mod_clk; } =20 - ret =3D reset_control_deassert(dev->rstc); - if (ret) { - dev_err(dev->dev, "Failed to apply reset\n"); - - goto err_ram_clk; - } - deinterlace_init(dev); =20 return 0; =20 -err_ram_clk: - clk_disable_unprepare(dev->ram_clk); err_mod_clk: clk_disable_unprepare(dev->mod_clk); err_bus_clk: clk_disable_unprepare(dev->bus_clk); +err_rst: + reset_control_assert(dev->rstc); err_exclusive_rate: clk_rate_exclusive_put(dev->mod_clk); =20 @@ -979,11 +979,12 @@ static int deinterlace_runtime_suspend(struct device = *device) { struct deinterlace_dev *dev =3D dev_get_drvdata(device); =20 - reset_control_assert(dev->rstc); - clk_disable_unprepare(dev->ram_clk); clk_disable_unprepare(dev->mod_clk); clk_disable_unprepare(dev->bus_clk); + + reset_control_assert(dev->rstc); + clk_rate_exclusive_put(dev->mod_clk); =20 return 0; --=20 2.43.0