shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-09 12:17:12 +09:00
Code Issues Packages Projects Releases Wiki Activity

HDMI: fix rk3288 hdmi driver code compile error

Browse Source
This commit is contained in:
zwl
2014-03-11 17:15:15 +08:00
parent 3a2b762e8f
commit 41f7cffafa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi.c
View File

@@ -17,6 +17,8 @@
#include <linux/interrupt.h>
#include <linux/clk.h>
#include <linux/uaccess.h>
#include <linux/rockchip/grf.h>
#include <linux/rockchip/iomap.h>
#if defined(CONFIG_OF)
#include <linux/of.h>
#include <linux/of_device.h>
@@ -27,8 +29,6 @@
#include <linux/seq_file.h>
#endif
#include "../../../../../../arch/arm/mach-rockchip/grf.h"
#include "../../../../../../arch/arm/mach-rockchip/iomap.h"
#include "rk3288_hdmi_hw.h"
#include "rk3288_hdmi.h"

5
drivers/video/rockchip/hdmi/chips/rk3288/rk3288_hdmi_hw.c
View File

@@ -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));
}
}