Преглед изворни кода

Merge "msm: camera: isp: Fix for wrong CPAS version selection in WM start" into camera-kernel.lnx.5.0

Savita Patted пре 4 година
родитељ
комит
69c1bef608
1 измењених фајлова са 3 додато и 2 уклоњено
  1. 3 2
      drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

+ 3 - 2
drivers/cam_isp/isp_hw_mgr/isp_hw/vfe_hw/vfe_bus/cam_vfe_bus_ver2.c

@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-only
 /*
- * Copyright (c) 2018-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2018-2021, The Linux Foundation. All rights reserved.
  */
 
 #include <linux/ratelimit.h>
@@ -1273,7 +1273,8 @@ static int cam_vfe_bus_start_wm(
 			return rc;
 		}
 		if ((camera_hw_version > CAM_CPAS_TITAN_NONE) &&
-			(camera_hw_version < CAM_CPAS_TITAN_175_V100)) {
+			(camera_hw_version < CAM_CPAS_TITAN_175_V100) &&
+			(camera_hw_version != CAM_CPAS_TITAN_165_V100)) {
 			struct cam_vfe_bus_ver2_reg_offset_ubwc_client
 				*ubwc_regs;