From: andy.hu <andy.hu@starfivetech.com>
Date: Fri, 26 Aug 2022 02:24:31 +0000 (+0000)
Subject: Merge branch 'CR_1874_v4l2_515_changhuang.liang' into 'jh7110-5.15.y-devel'
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=47a892af4279dd068a190ee690e297713027e86a;hp=914778b801ddab95268787dd504660f7a4807720;p=platform%2Fkernel%2Flinux-starfive.git

Merge branch 'CR_1874_v4l2_515_changhuang.liang' into 'jh7110-5.15.y-devel'

CR_1874_v4l2_515_changhuang.liang

See merge request sdk/linux!406
---

diff --git a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
index 19b5412..d5201f0 100644
--- a/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
+++ b/drivers/media/platform/starfive/v4l2_driver/stf_csi_hw_ops.c
@@ -59,7 +59,8 @@ static int stf_csi_power_on(struct stf_csi_dev *csi_dev, u8 on)
 		regulator_disable(csi_dev->mipirx_0p9);
 	}
 
-	regmap_write(stfcamss->stf_aon_syscon, stfcamss->aon_gp_reg, 0x80000000);
+	regmap_update_bits(stfcamss->stf_aon_syscon, stfcamss->aon_gp_reg,
+				BIT(31), BIT(31));
 
 	return 0;