Merge "video: driver: remove non-standard header file of_common.h"

driver/platform/common/inc/msm_vidc_platform.h

@@ -159,7 +159,5 @@ int msm_vidc_init_platform(struct platform_device *pdev);
 int msm_vidc_deinit_platform(struct platform_device *pdev);
 int msm_vidc_read_efuse(struct msm_vidc_core *core);
 void msm_vidc_sort_table(struct msm_vidc_core *core);
-void msm_vidc_ddr_ubwc_config(
-	struct msm_vidc_platform_data *platform_data, u32 hbb_override_val);
 
 #endif // _MSM_VIDC_PLATFORM_H_

driver/platform/common/src/msm_vidc_platform.c

@@ -4,7 +4,6 @@
  * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
-#include <soc/qcom/of_common.h>
 #include <linux/io.h>
 #include <linux/sort.h>
 
@@ -496,30 +495,6 @@ int msm_vidc_read_efuse(struct msm_vidc_core *core)
 	return rc;
 }
 
-void msm_vidc_ddr_ubwc_config(
-	struct msm_vidc_platform_data *platform_data, u32 hbb_override_val)
-{
-	uint32_t ddr_type = DDR_TYPE_LPDDR5;
-
-	if (!platform_data || !platform_data->ubwc_config) {
-		d_vpr_e("%s: invalid params\n", __func__);
-		return;
-	}
-
-	ddr_type = of_fdt_get_ddrtype();
-	if (ddr_type == -ENOENT)
-		d_vpr_e("Failed to get ddr type, use LPDDR5\n");
-
-	if (platform_data->ubwc_config &&
-		(ddr_type == DDR_TYPE_LPDDR4 ||
-		 ddr_type == DDR_TYPE_LPDDR4X))
-		platform_data->ubwc_config->highest_bank_bit = hbb_override_val;
-
-	d_vpr_h("DDR Type 0x%x hbb 0x%x\n",
-		ddr_type, platform_data->ubwc_config ?
-		platform_data->ubwc_config->highest_bank_bit : -1);
-}
-
 void msm_vidc_sort_table(struct msm_vidc_core *core)
 {
 	u32 i = 0;

driver/platform/kalama/src/kalama.c

@@ -3,8 +3,6 @@
  * Copyright (c) 2022 Qualcomm Innovation Center, Inc. All rights reserved.
  */
 
-#include <soc/qcom/of_common.h>
-
 #include "msm_vidc_control.h"
 #include "msm_vidc_kalama.h"
 #include "msm_vidc_platform.h"
@@ -1762,21 +1760,6 @@ static const struct msm_vidc_platform_data kalama_data = {
 	.format_data = &format_data_kalama,
 };
 
-int msm_vidc_kalama_check_ddr_type(void)
-{
-	u32 ddr_type;
-
-	ddr_type = of_fdt_get_ddrtype();
-	if (ddr_type != DDR_TYPE_LPDDR5 &&
-		ddr_type != DDR_TYPE_LPDDR5X) {
-		d_vpr_e("%s: wrong ddr type %d\n", __func__, ddr_type);
-		return -EINVAL;
-	} else {
-		d_vpr_h("%s: ddr type %d\n", __func__, ddr_type);
-	}
-	return 0;
-}
-
 static int msm_vidc_init_data(struct msm_vidc_core *core)
 {
 	int rc = 0;
@@ -1788,9 +1771,6 @@ static int msm_vidc_init_data(struct msm_vidc_core *core)
 	d_vpr_h("%s: initialize kalama data\n", __func__);
 
 	core->platform->data = kalama_data;
-	rc = msm_vidc_kalama_check_ddr_type();
-	if (rc)
-		return rc;
 
 	return rc;
 }

driver/vidc/inc/msm_vidc_dt.h

@@ -8,8 +8,9 @@
 
 #include <linux/platform_device.h>
 #include <linux/soc/qcom/llcc-qcom.h>
+#ifdef CONFIG_MSM_MMRM
 #include <linux/soc/qcom/msm_mmrm.h>
-
+#endif
 #include "msm_vidc_internal.h"
 
 /*