veyron: fievel/tiger: congiure usb and hdmi

Enable 5v_drv for usb and hdmi.

For tiger(chromebase with eDP), set the vop mode to
VOP_MODE_AUTO_DECTECT so it would fall through
to hdmi if there is not edp(or edp initialized failed).
For fievel(chromebox without eDP), set vop mode to VOP_MODE_HDMI.

BRANCH=veyron
BUG=none
TEST=check usb/hdmi function

Change-Id: I4bce8fb35a108a590608b3f7084e6be7b200aa5c
Signed-off-by: ZhengShunQian <zhengsq@rock-chips.com>
Reviewed-on: https://chromium-review.googlesource.com/345747
Commit-Queue: Ren Kuo <ren.kuo@quantatw.com>
Reviewed-by: Julius Werner <jwerner@chromium.org>
This commit is contained in:
ZhengShunQian 2016-05-19 20:41:08 +08:00 committed by ChromeOS Commit Bot
commit 5614c23925
4 changed files with 36 additions and 2 deletions

View file

@ -21,6 +21,6 @@
chip soc/rockchip/rk3288
device cpu_cluster 0 on end
register "vop_id" = "1"
register "vop_mode" = "VOP_MODE_EDP"
register "vop_mode" = "VOP_MODE_HDMI"
register "framebuffer_bits_per_pixel" = "16"
end

View file

@ -41,6 +41,12 @@
#include "board.h"
static void enable_5v_drv(void)
{
/* EN pin of NB679 for USB, Speaker, HDMI, TouchScreen*/
gpio_output(GPIO(7, C, 5), 1);
}
static void configure_usb(void)
{
gpio_output(GPIO(0, B, 4), 1); /* USB_OTG_PWR_EN */
@ -92,14 +98,25 @@ static void configure_vop(void)
writel(IOMUX_EDP_HOTPLUG, &rk3288_grf->iomux_edp_hotplug);
}
static void configure_hdmi(void)
{
/* HDMI I2C */
writel(IOMUX_HDMI_EDP_I2C_SDA, &rk3288_grf->iomux_i2c5sda);
writel(IOMUX_HDMI_EDP_I2C_SCL, &rk3288_grf->iomux_i2c5scl);
gpio_output(GPIO(5, C, 3), 1); /* VCC50_HDMI_EN */
}
static void mainboard_init(device_t dev)
{
gpio_output(GPIO_RESET, 0);
enable_5v_drv();
configure_usb();
configure_emmc();
configure_codec();
configure_vop();
configure_hdmi();
elog_init();
elog_add_watchdog_reset();

View file

@ -21,6 +21,6 @@
chip soc/rockchip/rk3288
device cpu_cluster 0 on end
register "vop_id" = "1"
register "vop_mode" = "VOP_MODE_EDP"
register "vop_mode" = "VOP_MODE_AUTO_DETECT"
register "framebuffer_bits_per_pixel" = "16"
end

View file

@ -41,6 +41,12 @@
#include "board.h"
static void enable_5v_drv(void)
{
/* EN pin of NB679 for USB, Speaker, HDMI, TouchScreen*/
gpio_output(GPIO(7, C, 5), 1);
}
static void configure_usb(void)
{
gpio_output(GPIO(0, B, 4), 1); /* USB_OTG_PWR_EN */
@ -92,14 +98,25 @@ static void configure_vop(void)
writel(IOMUX_EDP_HOTPLUG, &rk3288_grf->iomux_edp_hotplug);
}
static void configure_hdmi(void)
{
/* HDMI I2C */
writel(IOMUX_HDMI_EDP_I2C_SDA, &rk3288_grf->iomux_i2c5sda);
writel(IOMUX_HDMI_EDP_I2C_SCL, &rk3288_grf->iomux_i2c5scl);
gpio_output(GPIO(5, C, 3), 1); /* VCC50_HDMI_EN */
}
static void mainboard_init(device_t dev)
{
gpio_output(GPIO_RESET, 0);
enable_5v_drv();
configure_usb();
configure_emmc();
configure_codec();
configure_vop();
configure_hdmi();
elog_init();
elog_add_watchdog_reset();