mirror of
https://github.com/hardkernel/linux.git
synced 2026-06-06 02:50:49 +09:00
media: qcom: camss: Fix invalid clock enable bit disjunction
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: 4abb21309f ("media: camss: csiphy: Move to hardcode CSI Clock Lane number")
Cc: stable@vger.kernel.org
Signed-off-by: Bryan O'Donoghue <bryan.odonoghue@linaro.org>
Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
committed by
Greg Kroah-Hartman
parent
18a06f2eeb
commit
eeab07ddd0
@@ -476,7 +476,7 @@ static void csiphy_lanes_enable(struct csiphy_device *csiphy,
|
|||||||
|
|
||||||
settle_cnt = csiphy_settle_cnt_calc(link_freq, csiphy->timer_clk_rate);
|
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++)
|
for (i = 0; i < c->num_data; i++)
|
||||||
val |= BIT(c->data[i].pos * 2);
|
val |= BIT(c->data[i].pos * 2);
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user