Patch "media: qcom: camss: Fix invalid clock enable bit disjunction" has been added to the 6.1-stable tree

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



This is a note to let you know that I've just added the patch titled

    media: qcom: camss: Fix invalid clock enable bit disjunction

to the 6.1-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-invalid-clock-enable-bit-disjunction.patch
and it can be found in the queue-6.1 subdirectory.

If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.


>From d8f7e1a60d01739a1d78db2b08603089c6cf7c8e Mon Sep 17 00:00:00 2001
From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Date: Wed, 30 Aug 2023 16:16:13 +0100
Subject: media: qcom: camss: Fix invalid clock enable bit disjunction

From: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>

commit d8f7e1a60d01739a1d78db2b08603089c6cf7c8e upstream.

define CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE BIT(7)

disjunction for gen2 ? BIT(7) : is a nop we are setting the same bit
either way.

Fixes: 4abb21309fda ("media: camss: csiphy: Move to hardcode CSI Clock Lane number")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@xxxxxxxxxx>
Reviewed-by: Konrad Dybcio <konrad.dybcio@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-csiphy-3ph-1-0.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

--- a/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
+++ b/drivers/media/platform/qcom/camss/camss-csiphy-3ph-1-0.c
@@ -476,7 +476,7 @@ static void csiphy_lanes_enable(struct c
 
 	settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate);
 
-	val = is_gen2 ? BIT(7) : CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE;
+	val = CSIPHY_3PH_CMN_CSI_COMMON_CTRL5_CLK_ENABLE;
 	for (i = 0; i < c->num_data; i++)
 		val |= BIT(c->data[i].pos * 2);
 


Patches currently in stable-queue which might be from bryan.odonoghue@xxxxxxxxxx are

queue-6.1/media-qcom-camss-fix-vfe-480-vfe_disable_output.patch
queue-6.1/media-qcom-camss-fix-missing-vfe_lite-clocks-check.patch
queue-6.1/media-qcom-camss-fix-vfe-17x-vfe_disable_output.patch
queue-6.1/media-qcom-camss-fix-set-csi2_rx_cfg1_vc_mode-when-vc-is-greater-than-3.patch
queue-6.1/media-qcom-camss-fix-vfe_get-error-jump.patch
queue-6.1/media-qcom-camss-fix-csid-gen2-for-test-pattern-generator.patch
queue-6.1/media-qcom-camss-fix-pm_domain_on-sequence-in-probe.patch
queue-6.1/media-qcom-camss-fix-invalid-clock-enable-bit-disjunction.patch



[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Index of Archives]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite News]     [Linux Kernel]     [Linux SCSI]

  Powered by Linux