From 41f7cffafabe46febb3832a56828c8494af83cf6 Mon Sep 17 00:00:00 2001 From: zwl Date: Tue, 11 Mar 2014 17:15:15 +0800 Subject: [PATCH] HDMI: fix rk3288 hdmi driver code compile error --- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c | 4 ++-- drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c index a8ea1871a1bd..30f843829368 100644 --- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c +++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c @@ -17,6 +17,8 @@ #include #include #include +#include +#include #if defined(CONFIG_OF) #include #include @@ -27,8 +29,6 @@ #include #endif -#include "../../../../../../arch/arm/mach-rockchip/grf.h" -#include "../../../../../../arch/arm/mach-rockchip/iomap.h" #include "rk3288_hdmi_hw.h" #include "rk3288_hdmi.h" diff --git a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c index 3cb08a18230a..5d2aabaa3657 100644 --- a/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c +++ b/drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c @@ -31,6 +31,7 @@ const struct phy_mpll_config_tab* get_phy_mpll_tab(int pixClock, char pixRepet, static void rk3288_hdmi_set_pwr_mode(struct hdmi *hdmi_drv, int mode) { + struct rk3288_hdmi_device *hdmi_dev = container_of(hdmi_drv, struct rk3288_hdmi_device, driver); if(hdmi_drv->pwr_mode == mode) return; @@ -379,7 +380,7 @@ int rk3288_hdmi_config_video(struct hdmi *hdmi_drv, struct hdmi_video_para *vpar struct rk3288_hdmi_device *hdmi_dev = container_of(hdmi_drv, struct rk3288_hdmi_device, driver); if(hdmi_drv->pwr_mode == LOWER_PWR) - rk3288_hdmi_set_pwr_mode(NORMAL); + rk3288_hdmi_set_pwr_mode(hdmi_drv, NORMAL); switch(vpara->input_color) { @@ -615,7 +616,7 @@ void rk3288_hdmi_control_output(struct hdmi *hdmi_drv, int enable) } else { if(hdmi_drv->pwr_mode == LOWER_PWR) - rk3288_hdmi_set_pwr_mode(NORMAL); + rk3288_hdmi_set_pwr_mode(hdmi_drv, NORMAL); hdmi_msk_reg(hdmi_dev, FC_GCP, m_FC_SET_AVMUTE, v_FC_SET_AVMUTE(0)); } } -- 2.34.1