[uboot] Upgrade the MMF SDK from V4.0.0 to V4.1.0
1. add cv181x functions 2. Delete some useless files and add .gitignore Change-Id: Iea2b2fa43b5a1152e5e99fb32b88f8d2c249251a
This commit is contained in:
committed by
sam.xiang
parent
aa1b345a00
commit
607778300c
@ -9,11 +9,11 @@
|
||||
#include <dm.h>
|
||||
#include <regmap.h>
|
||||
#include <video.h>
|
||||
#include <asm/hardware.h>
|
||||
//#include <asm/hardware.h>
|
||||
#include <asm/io.h>
|
||||
#include <dt-structs.h>
|
||||
#include <asm/gpio.h>
|
||||
|
||||
//#include <asm-generic/gpio.h>
|
||||
#include "vip_common.h"
|
||||
#include "scaler.h"
|
||||
#include "dsi_phy.h"
|
||||
@ -29,10 +29,9 @@ struct cvi_vo_priv {
|
||||
|
||||
static int cvi_vo_bind(struct udevice *dev)
|
||||
{
|
||||
struct video_uc_platdata *plat = dev_get_uclass_platdata(dev);
|
||||
|
||||
plat->size = 4 * (CONFIG_VIDEO_CVITEK_MAX_XRES *
|
||||
CONFIG_VIDEO_CVITEK_MAX_YRES);
|
||||
//struct video_uc_plat *plat = dev_get_uclass_plat(dev);
|
||||
//plat->size = 4 * (CONFIG_VIDEO_CVITEK_MAX_XRES *
|
||||
//CONFIG_VIDEO_CVITEK_MAX_YRES);
|
||||
|
||||
return 0;
|
||||
}
|
||||
@ -43,17 +42,17 @@ static int cvi_vo_ofdata_to_platdata(struct udevice *dev)
|
||||
|
||||
priv->regs_sc = devfdt_get_addr_name(dev, "sc");
|
||||
if (priv->regs_sc == FDT_ADDR_T_NONE) {
|
||||
debug("%s: Get VO sc address failed (ret=%llu)\n", __func__, (u64)priv->regs_sc);
|
||||
printf("%s: Get VO sc address failed (ret=%llu)\n", __func__, (u64)priv->regs_sc);
|
||||
return -ENXIO;
|
||||
}
|
||||
priv->regs_vip = devfdt_get_addr_name(dev, "vip_sys");
|
||||
if (priv->regs_vip == FDT_ADDR_T_NONE) {
|
||||
debug("%s: Get dsi address failed (ret=%llu)\n", __func__, (u64)priv->regs_vip);
|
||||
printf("%s: Get dsi address failed (ret=%llu)\n", __func__, (u64)priv->regs_vip);
|
||||
return -ENXIO;
|
||||
}
|
||||
priv->regs_dphy = devfdt_get_addr_name(dev, "dphy");
|
||||
if (priv->regs_dphy == FDT_ADDR_T_NONE) {
|
||||
debug("%s: Get MIPI dsi address failed (ret=%llu)\n", __func__, (u64)priv->regs_dphy);
|
||||
printf("%s: Get MIPI dsi address failed (ret=%llu)\n", __func__, (u64)priv->regs_dphy);
|
||||
return -ENXIO;
|
||||
}
|
||||
debug("%s: base(sc)=%#llx base(vip)=%#llx base(dphy)=%#llx\n", __func__
|
||||
@ -68,8 +67,6 @@ static int cvi_vo_probe(struct udevice *dev)
|
||||
struct cvi_vo_priv *priv = dev_get_priv(dev);
|
||||
int ret = 0;
|
||||
|
||||
debug("%s: start\n", __func__);
|
||||
|
||||
/* Before relocation we don't need to do anything */
|
||||
if (!(gd->flags & GD_FLG_RELOC))
|
||||
return 0;
|
||||
@ -81,27 +78,28 @@ static int cvi_vo_probe(struct udevice *dev)
|
||||
#ifdef BOOTLOGO_ISP_RESET
|
||||
vip_isp_clk_reset();
|
||||
#endif
|
||||
|
||||
sclr_ctrl_init();
|
||||
sclr_ctrl_set_disp_src(false);
|
||||
|
||||
ret = gpio_request_by_name(dev, "reset-gpio", 0, &priv->ctrl_gpios.disp_reset_gpio,
|
||||
GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
|
||||
if (ret) {
|
||||
debug("%s: Warning: cannot get enable GPIO: ret=%d\n", __func__, ret);
|
||||
printf("%s: Warning: cannot get reset GPIO: ret=%d\n", __func__, ret);
|
||||
if (ret != -ENOENT)
|
||||
return ret;
|
||||
}
|
||||
ret = gpio_request_by_name(dev, "pwm-gpio", 0, &priv->ctrl_gpios.disp_pwm_gpio,
|
||||
GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
|
||||
if (ret) {
|
||||
debug("%s: Warning: cannot get enable GPIO: ret=%d\n", __func__, ret);
|
||||
printf("%s: Warning: cannot get pwm GPIO: ret=%d\n", __func__, ret);
|
||||
if (ret != -ENOENT)
|
||||
return ret;
|
||||
}
|
||||
ret = gpio_request_by_name(dev, "power-ct-gpio", 0, &priv->ctrl_gpios.disp_power_ct_gpio,
|
||||
GPIOD_IS_OUT | GPIOD_IS_OUT_ACTIVE);
|
||||
if (ret) {
|
||||
debug("%s: Warning: cannot get enable GPIO: ret=%d\n", __func__, ret);
|
||||
printf("%s: Warning: cannot get power GPIO: ret=%d\n", __func__, ret);
|
||||
if (ret != -ENOENT)
|
||||
return ret;
|
||||
}
|
||||
@ -121,12 +119,12 @@ static const struct video_ops cvi_vo_ops = {
|
||||
};
|
||||
|
||||
U_BOOT_DRIVER(cvi_vo) = {
|
||||
.name = "cvi_vo",
|
||||
.name = "vo",
|
||||
.id = UCLASS_VIDEO,
|
||||
.of_match = cvi_vo_ids,
|
||||
.ops = &cvi_vo_ops,
|
||||
.bind = cvi_vo_bind,
|
||||
.probe = cvi_vo_probe,
|
||||
.ofdata_to_platdata = cvi_vo_ofdata_to_platdata,
|
||||
.priv_auto_alloc_size = sizeof(struct cvi_vo_priv),
|
||||
.of_to_plat = cvi_vo_ofdata_to_platdata,
|
||||
.priv_auto = sizeof(struct cvi_vo_priv),
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user