Merge "msm: camera: csiphy: Add support for SM8750" into camera-kernel.lnx.7.0

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.c

@@ -11,6 +11,7 @@
 #include "include/cam_csiphy_2_1_2_hwreg.h"
 #include "include/cam_csiphy_2_1_3_hwreg.h"
 #include "include/cam_csiphy_2_2_0_hwreg.h"
+#include "include/cam_csiphy_2_3_0_hwreg.h"
 
 /* Clock divide factor for CPHY spec v1.0 */
 #define CSIPHY_DIVISOR_16                    16
@@ -151,7 +152,7 @@ enum cam_vote_level get_clk_voting_dynamic(
 		do_div(phy_data_rate, CSIPHY_DIVISOR_8);
 	}
 
-	 /* round off to next integer */
+	/* round off to next integer */
 	phy_data_rate += 1;
 	csiphy_dev->current_data_rate = phy_data_rate;
 
@@ -331,10 +332,15 @@ int32_t cam_csiphy_parse_dt_info(struct platform_device *pdev,
 		csiphy_dev->hw_version = CSIPHY_VERSION_V220;
 		csiphy_dev->is_divisor_32_comp = true;
 		csiphy_dev->clk_lane = 0;
+	} else if (of_device_is_compatible(soc_info->dev->of_node, "qcom,csiphy-v2.3.0")) {
+		csiphy_dev->ctrl_reg = &ctrl_reg_2_3_0;
+		csiphy_dev->hw_version = CSIPHY_VERSION_V230;
+		csiphy_dev->is_divisor_32_comp = true;
+		csiphy_dev->clk_lane = 0;
 	} else {
 		CAM_ERR(CAM_CSIPHY, "invalid hw version : 0x%x",
 			csiphy_dev->hw_version);
-		rc =  -EINVAL;
+		rc = -EINVAL;
 		return rc;
 	}
 

drivers/cam_sensor_module/cam_csiphy/cam_csiphy_soc.h

@@ -1,7 +1,7 @@
 /* SPDX-License-Identifier: GPL-2.0-only */
 /*
  * Copyright (c) 2017-2021, The Linux Foundation. All rights reserved.
- * Copyright (c) 2021-2022 Qualcomm Innovation Center, Inc. All rights reserved.
+ * Copyright (c) 2021-2023 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
 #ifndef _CAM_CSIPHY_SOC_H_
@@ -36,6 +36,7 @@
 #define CSIPHY_VERSION_V212                       0x212
 #define CSIPHY_VERSION_V213                       0x213
 #define CSIPHY_VERSION_V220                       0x220
+#define CSIPHY_VERSION_V230                       0x230
 
 /**
  * @csiphy_dev: CSIPhy device structure