From nobody Thu May 8 16:40:32 2025
Received: from mail-0201.mail-europe.com (mail-0201.mail-europe.com
[51.77.79.158])
(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 8D8901EB1AA;
Tue, 1 Apr 2025 08:34:03 +0000 (UTC)
Authentication-Results: smtp.subspace.kernel.org;
arc=none smtp.client-ip=51.77.79.158
ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116;
t=1743496445; cv=none;
b=qTBv1ZPiaMdqw+AueOmGd3rEvDrYezB7mz0vU5bsTH00pQ2Ge4QxDrTjk9KDfdQgry34oyqake/ybIAngLNP9decDwbFV0ST0YaLDwVtMXVkSreLoLqg+aJnVpjUxt4TiyRR0UhRCLUZU5Oq2yNQ15cTVyUR+uqZW48/041S8Rk=
ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org;
s=arc-20240116; t=1743496445; c=relaxed/simple;
bh=JudEjUY8rc1H61a4v6IzTPt1VlGW7RLw3Rv2ephhw/E=;
h=Date:To:From:Cc:Subject:Message-ID:MIME-Version:Content-Type;
b=Jzdj8ja0PUugM/js6/Ugbs7era75OCMBgwdRbCzUnzcez/reGM6LCcYRkXutGWCaq8dCo4objRWYGC1eQEKBw1HsMMOkNGdEfgBhr3eIpdqPbZVR/yojrjmKq0blKoUQkI2qmPDwB41KIAORIbDlVh5P+a5p0JSG2snWf49G2n8=
ARC-Authentication-Results: i=1; smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=protonmail.com;
spf=pass smtp.mailfrom=protonmail.com;
dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com
header.b=wQxddQIn; arc=none smtp.client-ip=51.77.79.158
Authentication-Results: smtp.subspace.kernel.org;
dmarc=pass (p=quarantine dis=none) header.from=protonmail.com
Authentication-Results: smtp.subspace.kernel.org;
spf=pass smtp.mailfrom=protonmail.com
Authentication-Results: smtp.subspace.kernel.org;
dkim=pass (2048-bit key) header.d=protonmail.com header.i=@protonmail.com
header.b="wQxddQIn"
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=protonmail.com;
s=protonmail3; t=1743496432; x=1743755632;
bh=JudEjUY8rc1H61a4v6IzTPt1VlGW7RLw3Rv2ephhw/E=;
h=Date:To:From:Cc:Subject:Message-ID:Feedback-ID:From:To:Cc:Date:
Subject:Reply-To:Feedback-ID:Message-ID:BIMI-Selector:
List-Unsubscribe:List-Unsubscribe-Post;
b=wQxddQIn/+4/Z6MUgQlYu4IxxdAYN3PvsAWgMeKdAsSMIVcFyQlJfNX0KFWwcFDvN
mZYFrhJpthnV5XcV4V8n9YBUk72hmvK9vEXOXcTDIOLDTgdOFh42o2CcV+40TlXeiJ
M37O8RDvZJ8RWUF6gXVqzIJgkcwmC5dX+tkTw5tV0UF0Eqfi12wjsKfe9hItUWNFr4
9+Ahrri4Grl4HSGYOtQR87R0deaB+jXHLwNuKZ9MF/hZE0AG7+YfiCvszKyeDXZJOR
dvX0qdtOWlwL2JHEvrk8jUah1usHHCIQ5IIWvsyWETBqNVKNJyXPFLd7BEBYUVjHuG
ou2LeCqtXWP5w==
Date: Tue, 01 Apr 2025 08:33:48 +0000
To: Robert Foss <rfoss@kernel.org>, Todor Tomov <todor.too@gmail.com>,
Bryan O'Donoghue <bryan.odonoghue@linaro.org>,
Mauro Carvalho Chehab <mchehab@kernel.org>,
Hans Verkuil <hverkuil@xs4all.nl>,
Vladimir Zapolskiy <vladimir.zapolskiy@linaro.org>,
Depeng Shao <quic_depengs@quicinc.com>
From: Yassine Oudjana <y.oudjana@protonmail.com>
Cc: Yassine Oudjana <y.oudjana@protonmail.com>,
Yassine Oudjana <yassine.oudjana@gmail.com>, linux-media@vger.kernel.org,
linux-arm-msm@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] media: qcom: camss: csiphy-3ph: Make non-Gen2 PHY work again
Message-ID: <20250401083329.314863-1-y.oudjana@protonmail.com>
Feedback-ID: 6882736:user:proton
X-Pm-Message-ID: 5378a70212d1c53b7f789ff41c2d1f0330192de0
Precedence: bulk
X-Mailing-List: linux-kernel@vger.kernel.org
List-Id: <linux-kernel.vger.kernel.org>
List-Subscribe: <mailto:linux-kernel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-kernel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset="utf-8"
Commit fbce0ca24c3a ("media: qcom: camss: csiphy-3ph: Move CSIPHY variables
to data field inside csiphy struct") moved a version check that was
previously guarded by a check for Gen2 to csiphy_init without moving the
Gen2 check along with it. Since it was guarded by the Gen2 check, it was
only handling versions that were Gen2 and returned -ENODEV for others since
they shouldn't pass the Gen2 check to begin with.
Check if the CSIPHY is Gen2 before running this version check and assigning
Gen2 lane regs array.
Fixes: fbce0ca24c3a ("media: qcom: camss: csiphy-3ph: Move CSIPHY variables=
to data field inside csiphy struct")
Signed-off-by: Yassine Oudjana <y.oudjana@protonmail.com>
Reviewed-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
---
drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c b/dri=
vers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
index a6cc957b986e..17762aee6dba 100644
--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -700,6 +700,9 @@ static int csiphy_init(struct csiphy_device *csiphy)
csiphy->regs =3D regs;
regs->offset =3D 0x800;
=20
+ if (!csiphy_is_gen2(csiphy->camss->res->version))
+ return 0;
+
switch (csiphy->camss->res->version) {
case CAMSS_845:
regs->lane_regs =3D &lane_regs_sdm845[0];
--=20
2.49.0