This is a note to let you know that I've just added the patch titled
media: qcom: camss: Fix missing vfe_lite clocks check
to the 6.5-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
media-qcom-camss-fix-missing-vfe_lite-clocks-check.patch
and it can be found in the queue-6.5 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From b6e1bdca463a932c1ac02caa7d3e14bf39288e0c Mon Sep 17 00:00:00 2001
From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Date: Wed, 30 Aug 2023 16:16:12 +0100
Subject: media: qcom: camss: Fix missing vfe_lite clocks check
From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
commit b6e1bdca463a932c1ac02caa7d3e14bf39288e0c upstream.
check_clock doesn't account for vfe_lite which means that vfe_lite will
never get validated by this routine. Add the clock name to the expected set
to remediate.
Fixes: 7319cdf189bb ("media: camss: Add support for VFE hardware version Titan 170")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Reviewed-by: Laurent Pinchart <laurent.pinchart@xxxxxxxxxxxxxxxx>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/media/platform/qcom/camss/camss-vfe.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
--- a/drivers/media/platform/qcom/camss/camss-vfe.c
+++ b/drivers/media/platform/qcom/camss/camss-vfe.c
@@ -535,7 +535,8 @@ static int vfe_check_clock_rates(struct
struct camss_clock *clock = &vfe->clock[i];
if (!strcmp(clock->name, "vfe0") ||
- !strcmp(clock->name, "vfe1")) {
+ !strcmp(clock->name, "vfe1") ||
+ !strcmp(clock->name, "vfe_lite")) {
u64 min_rate = 0;
unsigned long rate;
Patches currently in stable-queue which might be from bryan.odonoghue@xxxxxxxxxx are
queue-6.5/media-qcom-camss-fix-vfe-480-vfe_disable_output.patch
queue-6.5/media-qcom-camss-fix-missing-vfe_lite-clocks-check.patch
queue-6.5/media-qcom-camss-fix-vfe-17x-vfe_disable_output.patch
queue-6.5/media-qcom-camss-fix-set-csi2_rx_cfg1_vc_mode-when-vc-is-greater-than-3.patch
queue-6.5/media-qcom-camss-fix-vfe_get-error-jump.patch
queue-6.5/media-qcom-camss-fix-csid-gen2-for-test-pattern-generator.patch
queue-6.5/media-qcom-camss-fix-pm_domain_on-sequence-in-probe.patch
queue-6.5/media-qcom-camss-fix-invalid-clock-enable-bit-disjunction.patch
