From: Zheng Yang Date: Fri, 17 Oct 2014 00:52:40 +0000 (+0800) Subject: rk3036/rk3128 tve: fix compile error. X-Git-Tag: firefly_0821_release~4571 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3803d1d08eb8f176fe4735bd469a4dc3b6c38aa0;p=firefly-linux-kernel-4.4.55.git rk3036/rk3128 tve: fix compile error. --- diff --git a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c index d28559ad1189..79118f6f04fa 100644 --- a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c +++ b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c @@ -78,7 +78,7 @@ static void tve_set_mode(int mode) if (cvbsformat >= 0) return; tve_writel(TV_RESET, v_RESET(1)); - udelay_range(100, 100); + usleep_range(100, 100); tve_writel(TV_RESET, v_RESET(0)); if (rk3036_tve->inputformat == INPUT_FORMAT_RGB) tve_writel(TV_CTRL, v_CVBS_MODE(mode) | v_CLK_UPSTREAM_EN(2) | @@ -130,7 +130,7 @@ static void tve_set_mode(int mode) if (rk3036_tve->soctype == SOC_RK312X) { tve_writel(TV_ADJ_TIMING, (0xa << 28) | 0x06c00800 | 0x80); - udelay_range(100, 100); + usleep_range(100, 100); tve_writel(TV_ADJ_TIMING, (0xa << 28) | 0x06c00800 | 0x80); tve_writel(TV_ACT_TIMING, 0x0694011D |