From patchwork Sat Dec 16 13:34:21 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Jernej_=C5=A0krabec?= X-Patchwork-Id: 13495573 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id B1BEFC46CA2 for ; Sat, 16 Dec 2023 13:35:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:Cc:To:From:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=2XXoyb+fOylBSBIyptpiXhZoz4wvPfoJ1xbw8EyhzEA=; b=juGOgEofns1p3O AY7DSa0O9ZfY9QfbYuRzFNEJlpetv+E4NzMaWeMGZOmAw4C/QWTK1p9XAfid7nKDaf+Gh2m3JlbZl 5eTirDd891GdhpoWvSo/m3cDM6uO7zJ4TFf2NzzNGjyo1sPX78kJl5L3/uDHP8aMnGhkA3bHKPRpK uVDdh1Mcd+iCEbCTJfmckNvRfRuc0Zxd0D2eNPWb5iPbuQq3Fq0u8kjDN90877+sLzbJOaHRz/JHL /3hMhdsWz4+sRzwPNzmfKFH/WoJBZjjo/pSpF3RnmP5hjKQg+tPv+/QAdTarZxtS/iGBxjWpT3AZT MWv/p+N1DaWvPDGzu0Qg==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.96 #2 (Red Hat Linux)) id 1rEUoR-0067Sb-1D; Sat, 16 Dec 2023 13:34:39 +0000 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by bombadil.infradead.org with esmtps (Exim 4.96 #2 (Red Hat Linux)) id 1rEUoJ-0067PU-1v for linux-arm-kernel@lists.infradead.org; Sat, 16 Dec 2023 13:34:32 +0000 Received: by mail-wm1-x32f.google.com with SMTP id 5b1f17b1804b1-40c6ea99429so11158015e9.3 for ; Sat, 16 Dec 2023 05:34:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1702733670; x=1703338470; darn=lists.infradead.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=MQ54a7sGebhpJsxp9YTsGDagOVgcaEiKJBAxSRg25CE=; b=Q36tahKK1w0yeU5tBw75sZeUUAzGxCpMyovmRHgpyZmVtwgCvR/Kx63Dut4w22acTC Lel6P7Sf5uagsBNLguYv1x/KXA3H+YtCBTZXEzV8M4Fa9uXNMOMKG9Qp+6me8a0JFsZv XMG8cCtVU1Q3zkY0czZXNV3qozz+34GiV35nk54p4You/ORIwX8ZZ0cf2yjzxLJp3Tx8 FyBJOJVUXEyk6pDl+9z0qzlFvBzVTzTqpTfvf947rnV7hVyXO/umaAryzcOzrAegF4Fk c3SwJG/ktyYG6IRAJHejff39o1SMqoapcigBLs0QkMjrneapqAFVfh0l5X8ZynS2uil4 Kzww== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1702733670; x=1703338470; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=MQ54a7sGebhpJsxp9YTsGDagOVgcaEiKJBAxSRg25CE=; b=ODB+r9zejsKpXuzxDppJAWrgrKoifLvC4vCrGHDnGt9f6Kx/OMlE8T44lBfRFpxPPG S+V+zX1MGsdtRCLEtbHLXkhfDMR6i3OFea8Ise+lU0BkDOWouZiJ99sBsgB63/c6DMm3 YDj8neE0+apdOnLVAEvWeXQvJwm69IhVUyG/hG4VrVBd5U+L7MW7MwLKtnUiyDRVSJE9 uLn3REfQoShCxRShVOZxx8W+SYs+zvK+bApZjfBAzqwvx6LGtLvOa3HPJXJQHnm7A0SQ ROKc7PdgHqF5Z5z9ZclT2h78RR568vzT57KVjQ/mHWA9iTrxIBEPlsgXH5gIvmCfNPvF 3eAA== X-Gm-Message-State: AOJu0YyuowXZtU7NayCzwdZo+y6y4Rwrtku4E86OIl/ENuOYzxI3zVcp jp/WCJ+xOZ4QtRL2O6QGKzQ9vXy3jl4= X-Google-Smtp-Source: AGHT+IGu8efrSlq+GuBq/ObkC9OhhHEBe/IbQv7ZHkDgjyi9R8rIZVgzPJfTHhK03kt9IfWoxR5u+Q== X-Received: by 2002:a05:600c:244:b0:40c:2b4c:623f with SMTP id 4-20020a05600c024400b0040c2b4c623fmr4435388wmj.82.1702733669609; Sat, 16 Dec 2023 05:34:29 -0800 (PST) Received: from localhost.localdomain (82-149-12-148.dynamic.telemach.net. [82.149.12.148]) by smtp.gmail.com with ESMTPSA id l16-20020a170906415000b00a232bf6045csm423629ejk.63.2023.12.16.05.34.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Dec 2023 05:34:29 -0800 (PST) From: Jernej Skrabec To: wens@csie.org, samuel@sholland.org Cc: mchehab@kernel.org, hverkuil-cisco@xs4all.nl, linux-media@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-sunxi@lists.linux.dev, linux-kernel@vger.kernel.org, Jernej Skrabec Subject: [PATCH 2/3] media: sun8i-di: Fix power on/off sequences Date: Sat, 16 Dec 2023 14:34:21 +0100 Message-ID: <20231216133422.2534674-3-jernej.skrabec@gmail.com> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20231216133422.2534674-1-jernej.skrabec@gmail.com> References: <20231216133422.2534674-1-jernej.skrabec@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20231216_053431_631268_5FCD5380 X-CRM114-Status: GOOD ( 12.59 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org 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 --- .../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/media/platform/sunxi/sun8i-di/sun8i-di.c index 34e099939284..f253a40cc04f 100644 --- a/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c +++ b/drivers/media/platform/sunxi/sun8i-di/sun8i-di.c @@ -929,11 +929,18 @@ static int deinterlace_runtime_resume(struct device *device) return ret; } + ret = reset_control_deassert(dev->rstc); + if (ret) { + dev_err(dev->dev, "Failed to apply reset\n"); + + goto err_exclusive_rate; + } + ret = clk_prepare_enable(dev->bus_clk); if (ret) { dev_err(dev->dev, "Failed to enable bus clock\n"); - goto err_exclusive_rate; + goto err_rst; } ret = clk_prepare_enable(dev->mod_clk); @@ -950,23 +957,16 @@ static int deinterlace_runtime_resume(struct device *device) goto err_mod_clk; } - ret = reset_control_deassert(dev->rstc); - if (ret) { - dev_err(dev->dev, "Failed to apply reset\n"); - - goto err_ram_clk; - } - deinterlace_init(dev); return 0; -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); @@ -977,11 +977,12 @@ static int deinterlace_runtime_suspend(struct device *device) { struct deinterlace_dev *dev = dev_get_drvdata(device); - 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); return 0;