From mboxrd@z Thu Jan 1 00:00:00 1970 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 1BC6718DB2A; Wed, 25 Feb 2026 01:31:47 +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=1771983107; cv=none; b=Bmn6FDq2Tj3o5lFwhWFhc0KCH4k2xvkbpYMbITI93PAaELo6Y2BxROOHN6I3bRT9YrEw01wsc4z+Efs0cFoFJqJHTc7wDuKmlnH7MfmHoPg2IV3s6ISdTFUBgk9FYAArI52wtHY9p4nEvmeFbJ2qEtPKr/LQAfVtVxibx+T/zsg= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771983107; c=relaxed/simple; bh=qYJbVQgoAgizaod3EaooO1XqrWYPJbdaHW5W6PsCh4U=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Gb1gXkxNBwLgdWVlCGK1WP+oYug8TVGyXelPpTQ2IlEDyki4P8aEUxxSBQfs1uokbq99DrnKNtIYdvwgrJ91iBJ/enZEfW1agFn/cDy5nB1R4UofVo6qCLOv5R3kFROFDnpkp/CaFI6Rj/sZH496zQRl7QwbZDTDK1IX/4C3QJo= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=yjOOFUZP; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="yjOOFUZP" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C3EFBC116D0; Wed, 25 Feb 2026 01:31:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1771983107; bh=qYJbVQgoAgizaod3EaooO1XqrWYPJbdaHW5W6PsCh4U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=yjOOFUZPZrfuqkrYfyI8u4YWkQGCkCQ/mesGvNh5zO+RMtFDhCx2tk4yCZkEoY1tm 4ux1GSxsX7yX5/YYCxC1W+heOeWOcn3iWgXnSRy8VZdoPJCcj26FatIEal0UNnrnzu NBzQK/LcwD8dICPvHn+DOq+NtPJeAXK2O1KkVncI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Mehdi Djait , David Heidelberg , Sakari Ailus , Hans Verkuil , Sasha Levin Subject: [PATCH 6.19 268/781] media: ccs: Accommodate C-PHY into the calculation Date: Tue, 24 Feb 2026 17:16:17 -0800 Message-ID: <20260225012406.272877166@linuxfoundation.org> X-Mailer: git-send-email 2.53.0 In-Reply-To: <20260225012359.695468795@linuxfoundation.org> References: <20260225012359.695468795@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.19-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Heidelberg [ Upstream commit 3085977e734dab74adebb1dda195befce25addff ] We need to set correct mode for PLL to calculate correct frequency. Signalling mode is known at this point, so use it for that. Fixes: 47b6eaf36eba ("media: ccs-pll: Differentiate between CSI-2 D-PHY and C-PHY") Reviewed-by: Mehdi Djait Signed-off-by: David Heidelberg [Sakari Ailus: Drop extra newline.] Signed-off-by: Sakari Ailus Signed-off-by: Hans Verkuil Signed-off-by: Sasha Levin --- drivers/media/i2c/ccs/ccs-core.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/drivers/media/i2c/ccs/ccs-core.c b/drivers/media/i2c/ccs/ccs-core.c index f8523140784c7..43f7d515bab67 100644 --- a/drivers/media/i2c/ccs/ccs-core.c +++ b/drivers/media/i2c/ccs/ccs-core.c @@ -3425,7 +3425,21 @@ static int ccs_probe(struct i2c_client *client) sensor->scale_m = CCS_LIM(sensor, SCALER_N_MIN); /* prepare PLL configuration input values */ - sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_DPHY; + switch (sensor->hwcfg.csi_signalling_mode) { + case CCS_CSI_SIGNALING_MODE_CSI_2_CPHY: + sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_CPHY; + break; + case CCS_CSI_SIGNALING_MODE_CSI_2_DPHY: + case SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_CLOCK: + case SMIAPP_CSI_SIGNALLING_MODE_CCP2_DATA_STROBE: + sensor->pll.bus_type = CCS_PLL_BUS_TYPE_CSI2_DPHY; + break; + default: + dev_err(&client->dev, "unsupported signalling mode %u\n", + sensor->hwcfg.csi_signalling_mode); + rval = -EINVAL; + goto out_cleanup; + } sensor->pll.csi2.lanes = sensor->hwcfg.lanes; if (CCS_LIM(sensor, CLOCK_CALCULATION) & CCS_CLOCK_CALCULATION_LANE_SPEED) { -- 2.51.0