From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-lj1-f173.google.com (mail-lj1-f173.google.com [209.85.208.173]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD3F238C2B3 for ; Tue, 3 Mar 2026 08:43:01 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.208.173 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772527387; cv=none; b=hnuKt0ZTA+hpaL2Ezw0bqbk/SIz4ihrTgA44OucI153u/7l/uPlwI4yIjPyxJG3cNeTwXVYVubEPkEDKJ3KROX7DlVZ2bLc2S3HAkt6+ZBi/La4KFK3qZdo3FWnwXa48p6Dgqz5+4XbodEE1Tk/w3jqlsvQvbi0FbQBArFpOkcQ= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1772527387; c=relaxed/simple; bh=QID8cbxZ0p/kYB2KVrtFO1HT+HJnaLuoQsjTauVelmU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=dYrZcbeC0Mefp4+TgaAjnC9GUymRmluKZSrraioA3w4xdoYHuSbreOgH4TEzM4BBb2xNqDTJD034s18AM6+ZHR2hhupXKRJ2fEym9tGN3PCcGPOHDcEC4K3VQVuNBnEdw6LuNDuQ5OOY8KHzOcoRr9/1gGcEcbPKNL1egPQDbqs= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=csqszfjY; arc=none smtp.client-ip=209.85.208.173 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="csqszfjY" Received: by mail-lj1-f173.google.com with SMTP id 38308e7fff4ca-389f9895c81so26504471fa.2 for ; Tue, 03 Mar 2026 00:43:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1772527380; x=1773132180; darn=vger.kernel.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=bqEeaetpkKSpqDc/1afFvsBhHX5UV9awkVwQAYPdPEo=; b=csqszfjYXiv76MAdg71tIBcqJL4naq1ln6OCvgyjDKTL4+3HpFb7rkk2vNEBbUthxT 8ts8l/dMJ2QbZVq7bKCEdCP7LDGOo6+/Ql7f/kIl+JnuMV3sbtVqKyJL8lCxhzQHH9BU qJYMpl/UPcofMFWLp9Dg9IATNe5hVFkfZb1e/wyZoXAcmOt0R2ZiFhPbmP7eyIKvZYYc LFlTupH3wBTpJdto6sA9F1fsZqJDJV2XMtddmBleFCcphQLH0fN2VclC/Q0RX2bjDFlR xwjLz/lrBzuK+V456942RHW5tbk7LA5xefdkIl8CERhKdvxIpmmDiKt023GvOr9lYia7 INRw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1772527380; x=1773132180; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-gg:x-gm-message-state:from :to:cc:subject:date:message-id:reply-to; bh=bqEeaetpkKSpqDc/1afFvsBhHX5UV9awkVwQAYPdPEo=; b=jPgYb1EwQ2egFjlWEv5bnoz5SgdgT28Ux45BOhfzWIfXh/RYvSmI6VxfsQNa06oiKr NI7LJ0EvajCccdlPBfnlGBtGxCUzvYGHBBCvga31d5ihvi4CrPCD2qgOKZOpZpHsCf+Z k/Q9Cu8Si2nbanf+1n4hIkLsGIKnIbznpuazIGdj08ODB0KwqEHLAjfAAQrXANAj3aHv 7KZqSDrfxEYBJqECL9WAtJ0vfSrkxVcBdl8UBquWQCAxAW/FJGWQxC4+Bur14O6aMv6B cLNR3sJYKnn6ZDtNKJk60B7ClP8zZzazSZhGUV3d7tz1VciDcbYdesh2E1jtOBfa1U0r VL4g== X-Forwarded-Encrypted: i=1; AJvYcCU5SXogAvfAh6KTdFVHTKPJ1ZYewaiGzhq94DwzaTypjBffrJ1TkrDg5lQVt93rdVOviDs/3B4lZVY1uA==@vger.kernel.org X-Gm-Message-State: AOJu0Yw6Rl/iXZwp8QMfeSU2DEGLtTR8xABmiEQtwhT+MAw2rHdJ3q0s 6L/iH8R4nAHpW7Wxxsc67RGgYaTldU5zoX1SN9e7WAKQn39lSeITSZwqYbjlPQ== X-Gm-Gg: ATEYQzz9kbWtthOwd7H7+HrS0+tRZxAZ3bFWrdX2r7LxWoWtblrtZ0l/NiF4Yz0kxSb wQwHiPil2sdUCeBBuBTgDHfsbd89mma51yAHzm95yNDVr1qiLUn+9ypSpAHVUtiYsiLI7vgpmJY 2ydeN7Bf/VxPaAJ0HDYFb8iePO7IZIYz9+rarfqhu7KEhC1RDbuYXThaUGpCrECc845dRNzlr3k q25e3mY0KBAaTSWEBVElyVk41fRPvYTSWrPiPkvgpg36DkzUL6t4kYpBGDRe9MSJSRKOWp45TIq LcclKV3XqAfk211XjqK5oVaunvn49d7HOOUwhxJg3MSnCdVIg/mLSGN2TrwQcrKSJXAHWRuKOO0 2SvGLT2qDagLuEIqm8X+SHfr/Cf3PWtFf3tofJJIkry0GjYZdGUVCCQNF6bGx2Gpnsw9eOf4HPU 5jLX21ulSUKqKW X-Received: by 2002:a2e:9e95:0:b0:387:cdb:9b9a with SMTP id 38308e7fff4ca-389ff3580d6mr88804201fa.32.1772527379909; Tue, 03 Mar 2026 00:42:59 -0800 (PST) Received: from xeon ([188.163.112.72]) by smtp.gmail.com with ESMTPSA id 38308e7fff4ca-389f30227a9sm32599471fa.42.2026.03.03.00.42.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 03 Mar 2026 00:42:59 -0800 (PST) From: Svyatoslav Ryhel To: Thierry Reding , Thierry Reding , Mikko Perttunen , David Airlie , Simona Vetter , Jonathan Hunter , Sowjanya Komatineni , Luca Ceresoli , Mauro Carvalho Chehab , Greg Kroah-Hartman , Hans Verkuil , Svyatoslav Ryhel Cc: linux-kernel@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-tegra@vger.kernel.org, linux-media@vger.kernel.org, linux-staging@lists.linux.dev Subject: [PATCH v7 07/15] staging: media: tegra-video: csi: move avdd-dsi-csi-supply from VI to CSI Date: Tue, 3 Mar 2026 10:42:30 +0200 Message-ID: <20260303084239.15007-8-clamor95@gmail.com> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20260303084239.15007-1-clamor95@gmail.com> References: <20260303084239.15007-1-clamor95@gmail.com> Precedence: bulk X-Mailing-List: linux-media@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit The avdd-dsi-csi-supply is CSI power supply not VI, hence move it to proper place. Signed-off-by: Svyatoslav Ryhel Tested-by: Luca Ceresoli # Tegra20 VIP Reviewed-by: Luca Ceresoli Reviewed-by: Mikko Perttunen --- drivers/staging/media/tegra-video/csi.c | 19 ++++++++++++++++++- drivers/staging/media/tegra-video/csi.h | 2 ++ drivers/staging/media/tegra-video/vi.c | 23 ++--------------------- drivers/staging/media/tegra-video/vi.h | 2 -- 4 files changed, 22 insertions(+), 24 deletions(-) diff --git a/drivers/staging/media/tegra-video/csi.c b/drivers/staging/media/tegra-video/csi.c index 92078a1f9a4e..c4d3514f19b3 100644 --- a/drivers/staging/media/tegra-video/csi.c +++ b/drivers/staging/media/tegra-video/csi.c @@ -710,6 +710,8 @@ static int __maybe_unused csi_runtime_suspend(struct device *dev) clk_bulk_disable_unprepare(csi->soc->num_clks, csi->clks); + regulator_disable(csi->vdd); + return 0; } @@ -718,13 +720,23 @@ static int __maybe_unused csi_runtime_resume(struct device *dev) struct tegra_csi *csi = dev_get_drvdata(dev); int ret; + ret = regulator_enable(csi->vdd); + if (ret) { + dev_err(dev, "failed to enable VDD supply: %d\n", ret); + return ret; + } + ret = clk_bulk_prepare_enable(csi->soc->num_clks, csi->clks); if (ret < 0) { dev_err(csi->dev, "failed to enable clocks: %d\n", ret); - return ret; + goto disable_vdd; } return 0; + +disable_vdd: + regulator_disable(csi->vdd); + return ret; } static int tegra_csi_init(struct host1x_client *client) @@ -802,6 +814,11 @@ static int tegra_csi_probe(struct platform_device *pdev) return ret; } + csi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi"); + if (IS_ERR(csi->vdd)) + return dev_err_probe(&pdev->dev, PTR_ERR(csi->vdd), + "failed to get VDD supply"); + if (!pdev->dev.pm_domain) { ret = -ENOENT; dev_warn(&pdev->dev, "PM domain is not attached: %d\n", ret); diff --git a/drivers/staging/media/tegra-video/csi.h b/drivers/staging/media/tegra-video/csi.h index 2b4d586d3845..5344088aa022 100644 --- a/drivers/staging/media/tegra-video/csi.h +++ b/drivers/staging/media/tegra-video/csi.h @@ -141,6 +141,7 @@ extern const struct tegra_csi_soc tegra210_csi_soc; * @client: host1x_client struct * @iomem: register base * @clks: clock for CSI and CIL + * @vdd: vdd regulator for CSI hardware, usually avdd_dsi_csi * @soc: pointer to SoC data structure * @ops: csi operations * @csi_chans: list head for CSI channels @@ -150,6 +151,7 @@ struct tegra_csi { struct host1x_client client; void __iomem *iomem; struct clk_bulk_data *clks; + struct regulator *vdd; const struct tegra_csi_soc *soc; const struct tegra_csi_ops *ops; struct list_head csi_chans; diff --git a/drivers/staging/media/tegra-video/vi.c b/drivers/staging/media/tegra-video/vi.c index 7032c733577d..f14cdc7b5211 100644 --- a/drivers/staging/media/tegra-video/vi.c +++ b/drivers/staging/media/tegra-video/vi.c @@ -1418,29 +1418,19 @@ static int __maybe_unused vi_runtime_resume(struct device *dev) struct tegra_vi *vi = dev_get_drvdata(dev); int ret; - ret = regulator_enable(vi->vdd); - if (ret) { - dev_err(dev, "failed to enable VDD supply: %d\n", ret); - return ret; - } - ret = clk_set_rate(vi->clk, vi->soc->vi_max_clk_hz); if (ret) { dev_err(dev, "failed to set vi clock rate: %d\n", ret); - goto disable_vdd; + return ret; } ret = clk_prepare_enable(vi->clk); if (ret) { dev_err(dev, "failed to enable vi clock: %d\n", ret); - goto disable_vdd; + return ret; } return 0; - -disable_vdd: - regulator_disable(vi->vdd); - return ret; } static int __maybe_unused vi_runtime_suspend(struct device *dev) @@ -1449,8 +1439,6 @@ static int __maybe_unused vi_runtime_suspend(struct device *dev) clk_disable_unprepare(vi->clk); - regulator_disable(vi->vdd); - return 0; } @@ -1895,13 +1883,6 @@ static int tegra_vi_probe(struct platform_device *pdev) return ret; } - vi->vdd = devm_regulator_get(&pdev->dev, "avdd-dsi-csi"); - if (IS_ERR(vi->vdd)) { - ret = PTR_ERR(vi->vdd); - dev_err(&pdev->dev, "failed to get VDD supply: %d\n", ret); - return ret; - } - if (!pdev->dev.pm_domain) { ret = -ENOENT; dev_warn(&pdev->dev, "PM domain is not attached: %d\n", ret); diff --git a/drivers/staging/media/tegra-video/vi.h b/drivers/staging/media/tegra-video/vi.h index cac0c0d0e225..bfadde8858d4 100644 --- a/drivers/staging/media/tegra-video/vi.h +++ b/drivers/staging/media/tegra-video/vi.h @@ -94,7 +94,6 @@ struct tegra_vi_soc { * @client: host1x_client struct * @iomem: register base * @clk: main clock for VI block - * @vdd: vdd regulator for VI hardware, normally it is avdd_dsi_csi * @soc: pointer to SoC data structure * @ops: vi operations * @vi_chans: list head for VI channels @@ -104,7 +103,6 @@ struct tegra_vi { struct host1x_client client; void __iomem *iomem; struct clk *clk; - struct regulator *vdd; const struct tegra_vi_soc *soc; const struct tegra_vi_ops *ops; struct list_head vi_chans; -- 2.51.0