From: Zheng Yang Date: Tue, 30 Jun 2015 03:26:10 +0000 (+0800) Subject: HDMI:rk3368/rk3288: delete some unused code. X-Git-Tag: firefly_0821_release~3960 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=216f682fbc7e1f5e28b63346594af6511cdf7116;p=firefly-linux-kernel-4.4.55.git HDMI:rk3368/rk3288: delete some unused code. Signed-off-by: Zheng Yang --- diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c index 98c088de2e22..00793d160c9d 100755 --- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c +++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c @@ -401,15 +401,6 @@ int rockchip_hdmiv2_read_phy(struct hdmi_dev *hdmi_dev, return -1; } -void rockchip_hdmiv2_dump_phy_regs(struct hdmi_dev *hdmi_dev) -{ - int i; - - for (i = 0; i < 0x28; i++) - pr_info("phy reg %02x val %04x\n", - i, rockchip_hdmiv2_read_phy(hdmi_dev, i)); -} - static int rockchip_hdmiv2_config_phy(struct hdmi_dev *hdmi_dev) { int stat = 0, i = 0; @@ -666,15 +657,13 @@ static int rockchip_hdmiv2_video_framecomposer(struct hdmi *hdmi_drv, hdmi_writel(hdmi_dev, FC_CTRLDUR, 12); hdmi_writel(hdmi_dev, FC_EXCTRLDUR, 32); - hdmi_writel(hdmi_dev, FC_EXCTRLSPAC, - (hdmi_dev->tmdsclk/1000) * 50 / (256 * 512)); - -#if 0 /* spacing < 256^2 * config / tmdsClock, spacing <= 50ms * worst case: tmdsClock == 25MHz => config <= 19 */ - hdmi_writel(hdmi_dev, FC_EXCTRLSPAC, 1); + hdmi_writel(hdmi_dev, FC_EXCTRLSPAC, + (hdmi_dev->tmdsclk/1000) * 50 / (256 * 512)); +#if 0 /*Set PreambleFilter*/ for (i = 0; i < 3; i++) { value = (i + 1) * 11; @@ -1110,16 +1099,6 @@ static int hdmi_dev_read_edid(struct hdmi *hdmi, int block, unsigned char *buff) exit: /* Disable I2C interrupt */ rockchip_hdmiv2_i2cm_mask_int(hdmi_dev, 1); - - #ifdef DEBUG - if (!ret) { - for (index = 0; index < 128; index++) { - printk("0x%02x ,", buff[index]); - if ((index + 1) % 16 == 0) - printk("\n"); - } - } - #endif return ret; } diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.h b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.h index 6df698da8f1f..1c99c078a261 100644 --- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.h +++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.h @@ -1564,7 +1564,6 @@ void rockchip_hdmiv2_dev_init_ops(struct hdmi_ops *ops); void rockchip_hdmiv2_dev_initial(struct hdmi_dev *hdmi_dev); void rockchip_hdmiv2_cec_init(struct hdmi *hdmi); void rockchip_hdmiv2_cec_isr(struct hdmi_dev *hdmi_dev, char cec_int); -void rockchip_hdmiv2_dump_phy_regs(struct hdmi_dev *hdmi_dev); void rockchip_hdmiv2_hdcp_init(struct hdmi *hdmi); void rockchip_hdmiv2_hdcp2_enable(int enable); void rockchip_hdmiv2_hdcp_isr(struct hdmi_dev *hdmi_dev, int hdcp_int);