Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ee118c58 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "msm: camera: isp: removing CGC overide bits"

parents 235e3d78 68cc245c

drivers/media/platform/msm/camera_v2/isp/msm_isp46.c

+0 −5
Original line number Diff line number Diff line
@@ -267,11 +267,6 @@ static void msm_vfe46_init_hardware_reg(struct vfe_device *vfe_dev) 
	msm_vfe46_init_dt_parms(vfe_dev, &ds_parms);

	msm_vfe46_init_dt_parms(vfe_dev, &vbif_parms);



	/* CGC_OVERRIDE */

	/* MODULE_LENS_CGC_OVERRIDE */

	msm_camera_io_w(0x00000182, vfe_dev->vfe_base + 0x2C);

	/* MODULE_COLOR_CGC_OVERRIDE */

	msm_camera_io_w(0x00000018, vfe_dev->vfe_base + 0x34);

	/* BUS_CFG */

	msm_camera_io_w(0x00000001, vfe_dev->vfe_base + 0x84);

	/* IRQ_MASK/CLEAR */

drivers/media/platform/msm/camera_v2/isp/msm_isp47.c

+1 −4
Original line number Diff line number Diff line
@@ -281,10 +281,7 @@ static void msm_vfe47_init_hardware_reg(struct vfe_device *vfe_dev) 
	msm_vfe47_init_qos_parms(vfe_dev);

	msm_vfe47_init_vbif_parms(vfe_dev);

	msm_vfe47_init_danger_safe_parms(vfe_dev);

	/* MODULE_LENS_CGC_OVERRIDE */

	msm_camera_io_w(0x00000383, vfe_dev->vfe_base + 0x2C);

	/* MODULE_COLOR_CGC_OVERRIDE */

	msm_camera_io_w(0x0000001C, vfe_dev->vfe_base + 0x34);



	/* BUS_CFG */

	msm_camera_io_w(0x00000001, vfe_dev->vfe_base + 0x84);

	/* IRQ_MASK/CLEAR */