strcpy(state_str,"isp_dvp8bit0");
} else if (extdev->phy.info.cif.cifio == CamSys_SensorBit0_CifBit2) {
strcpy(state_str,"isp_dvp8bit2");
- } else {
+ } else if (extdev->phy.info.cif.cifio == CamSys_SensorBit0_CifBit4) {
+ strcpy(state_str,"isp_dvp8bit4");
+ }else {
camsys_err("extdev->phy.info.cif.cifio: 0x%x is invalidate!", extdev->phy.info.cif.cifio);
goto fail;
}
if (camsys_dev->soc) {
soc = (camsys_soc_priv_t*)camsys_dev->soc;
if (soc->soc_cfg) {
- (soc->soc_cfg)(Isp_SoftRst,(void*)on);
+ (soc->soc_cfg)(Isp_SoftRst,(void*)(unsigned long)on);
} else {
camsys_err("camsys_dev->soc->soc_cfg is NULL!");
}
clk_prepare_enable(clk->cif_clk_out);
clk_prepare_enable(clk->pclk_dphyrx);
+ clk_prepare_enable(clk->clk_vio0_noc);
}else{
clk_prepare_enable(clk->clk_mipi_24m);
}
if(CHIP_TYPE == 3368){
clk_disable_unprepare(clk->cif_clk_out);
clk_disable_unprepare(clk->pclk_dphyrx);
+ clk_disable_unprepare(clk->clk_vio0_noc);
}else{
clk_disable_unprepare(clk->clk_mipi_24m);
if (!IS_ERR_OR_NULL(mrv_clk->cif_clk_out)) {
devm_clk_put(&pdev->dev,mrv_clk->cif_clk_out);
}
+ if (!IS_ERR_OR_NULL(mrv_clk->clk_vio0_noc)) {
+ devm_clk_put(&pdev->dev,mrv_clk->clk_vio0_noc);
+ }
kfree(mrv_clk);
mrv_clk = NULL;
mrv_clk->cif_clk_out = devm_clk_get(&pdev->dev, "clk_cif_out");
mrv_clk->cif_clk_pll = devm_clk_get(&pdev->dev, "clk_cif_pll");
mrv_clk->pclk_dphyrx = devm_clk_get(&pdev->dev, "pclk_dphyrx");
-
+ mrv_clk->clk_vio0_noc = devm_clk_get(&pdev->dev, "clk_vio0_noc");
+
if (IS_ERR_OR_NULL(mrv_clk->aclk_isp) || IS_ERR_OR_NULL(mrv_clk->hclk_isp) ||
IS_ERR_OR_NULL(mrv_clk->isp) || IS_ERR_OR_NULL(mrv_clk->isp_jpe) || IS_ERR_OR_NULL(mrv_clk->pclkin_isp) ||
IS_ERR_OR_NULL(mrv_clk->cif_clk_out) || IS_ERR_OR_NULL(mrv_clk->pclk_dphyrx)||
- IS_ERR_OR_NULL(mrv_clk->pd_isp)) {
+ IS_ERR_OR_NULL(mrv_clk->pd_isp) || IS_ERR_OR_NULL(mrv_clk->clk_vio0_noc)) {
camsys_err("Get %s clock resouce failed!\n",miscdev_name);
err = -EINVAL;
goto clk_failed;
if (!IS_ERR_OR_NULL(mrv_clk->pclk_dphyrx)) {
clk_put(mrv_clk->pclk_dphyrx);
}
+ if (!IS_ERR_OR_NULL(mrv_clk->clk_vio0_noc)) {
+ clk_put(mrv_clk->clk_vio0_noc);
+ }
}
kfree(mrv_clk);