|
@@ -71,39 +71,6 @@ static int cam_fd_hw_soc_util_setup_regbase_indices(
|
|
|
return 0;
|
|
|
}
|
|
|
|
|
|
-static int cam_fd_soc_set_clk_flags(struct cam_hw_soc_info *soc_info)
|
|
|
-{
|
|
|
- int i, rc = 0;
|
|
|
-
|
|
|
- if (soc_info->num_clk > CAM_SOC_MAX_CLK) {
|
|
|
- CAM_ERR(CAM_FD, "Invalid num clk %d", soc_info->num_clk);
|
|
|
- return -EINVAL;
|
|
|
- }
|
|
|
-
|
|
|
- /* set memcore and mem periphery logic flags to 0 */
|
|
|
- for (i = 0; i < soc_info->num_clk; i++) {
|
|
|
- if ((strcmp(soc_info->clk_name[i], "fd_core_clk") == 0) ||
|
|
|
- (strcmp(soc_info->clk_name[i], "fd_core_uar_clk") ==
|
|
|
- 0)) {
|
|
|
- rc = cam_soc_util_set_clk_flags(soc_info, i,
|
|
|
- CLKFLAG_NORETAIN_MEM);
|
|
|
- if (rc)
|
|
|
- CAM_ERR(CAM_FD,
|
|
|
- "Failed in NORETAIN_MEM i=%d, rc=%d",
|
|
|
- i, rc);
|
|
|
-
|
|
|
- cam_soc_util_set_clk_flags(soc_info, i,
|
|
|
- CLKFLAG_NORETAIN_PERIPH);
|
|
|
- if (rc)
|
|
|
- CAM_ERR(CAM_FD,
|
|
|
- "Failed in NORETAIN_PERIPH i=%d, rc=%d",
|
|
|
- i, rc);
|
|
|
- }
|
|
|
- }
|
|
|
-
|
|
|
- return rc;
|
|
|
-}
|
|
|
-
|
|
|
void cam_fd_soc_register_write(struct cam_hw_soc_info *soc_info,
|
|
|
enum cam_fd_reg_base reg_base, uint32_t reg_offset, uint32_t reg_value)
|
|
|
{
|
|
@@ -228,12 +195,6 @@ int cam_fd_soc_init_resources(struct cam_hw_soc_info *soc_info,
|
|
|
return rc;
|
|
|
}
|
|
|
|
|
|
- rc = cam_fd_soc_set_clk_flags(soc_info);
|
|
|
- if (rc) {
|
|
|
- CAM_ERR(CAM_FD, "failed in set_clk_flags rc=%d", rc);
|
|
|
- goto release_res;
|
|
|
- }
|
|
|
-
|
|
|
soc_private = kzalloc(sizeof(struct cam_fd_soc_private), GFP_KERNEL);
|
|
|
if (!soc_private) {
|
|
|
rc = -ENOMEM;
|