Browse Source

msm: camera: cpas: Do not program flag out set0

Writing this register was a workaround for icp priority
on older chipsets. No need to write this anymore as the
icp priotiy now comes from ICP itself. Though writing
this currently is functionally no-op, better to remove to
avoid any future conflicts with this register.

CRs-Fixed: 2722486
Change-Id: I06bf9f9706fd49145bad501dc4406cdfdf603392
Signed-off-by: Pavan Kumar Chilamkurthi <[email protected]>
Pavan Kumar Chilamkurthi 4 years ago
parent
commit
5f0f2e90ed

+ 2 - 2
drivers/cam_cpas/cpas_top/cpastop_v480_100.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
- * Copyright (c) 2019, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019, 2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #ifndef _CPASTOP_V480_100_H_
 #ifndef _CPASTOP_V480_100_H_
@@ -664,7 +664,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x2088,
 			.offset = 0x2088,

+ 2 - 2
drivers/cam_cpas/cpas_top/cpastop_v480_custom.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
- * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #ifndef _CPASTOP_V480_CUSTOM_H_
 #ifndef _CPASTOP_V480_CUSTOM_H_
@@ -664,7 +664,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x2088,
 			.offset = 0x2088,

+ 2 - 2
drivers/cam_cpas/cpas_top/cpastop_v570_200.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
- * Copyright (c) 2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2020-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #ifndef _CPASTOP_V570_200_H_
 #ifndef _CPASTOP_V570_200_H_
@@ -816,7 +816,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x3888,
 			.offset = 0x3888,

+ 2 - 2
drivers/cam_cpas/cpas_top/cpastop_v580_100.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
- * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #ifndef _CPASTOP_V580_100_H_
 #ifndef _CPASTOP_V580_100_H_
@@ -978,7 +978,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x3888,
 			.offset = 0x3888,

+ 2 - 2
drivers/cam_cpas/cpas_top/cpastop_v580_custom.h

@@ -1,6 +1,6 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
 /*
- * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
+ * Copyright (c) 2019-2021, The Linux Foundation. All rights reserved.
  */
  */
 
 
 #ifndef _CPASTOP_V580_CUSTOM_H_
 #ifndef _CPASTOP_V580_CUSTOM_H_
@@ -978,7 +978,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x3888,
 			.offset = 0x3888,

+ 1 - 1
drivers/cam_cpas/cpas_top/cpastop_v680_100.h

@@ -1144,7 +1144,7 @@ static struct cam_camnoc_specific
 		.port_type = CAM_CAMNOC_ICP,
 		.port_type = CAM_CAMNOC_ICP,
 		.enable = true,
 		.enable = true,
 		.flag_out_set0_low = {
 		.flag_out_set0_low = {
-			.enable = true,
+			.enable = false,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.access_type = CAM_REG_TYPE_WRITE,
 			.masked_value = 0,
 			.masked_value = 0,
 			.offset = 0x2288,
 			.offset = 0x2288,