diff options
| author | Chandrabhanu Mahapatra | 2012-08-01 09:03:31 +0200 |
|---|---|---|
| committer | Tomi Valkeinen | 2012-08-22 10:43:04 +0200 |
| commit | ee223b703033ccfc2a47c3bb3e7352b4f5828fd2 (patch) | |
| tree | 415598c24c6dd3841e179930133cbc7f6f857673 | |
| parent | ARM: OMAP: Disable venc for OMAP4 (diff) | |
| download | kernel-qcow2-linux-ee223b703033ccfc2a47c3bb3e7352b4f5828fd2.tar.gz kernel-qcow2-linux-ee223b703033ccfc2a47c3bb3e7352b4f5828fd2.tar.xz kernel-qcow2-linux-ee223b703033ccfc2a47c3bb3e7352b4f5828fd2.zip | |
OMAPDSS: VENC: Remove cpu_is_xxxx checks
OMAP4 checks are removed from VENC to provide it a cleaner interface. These
checks were introduced by patches "HACK: OMAP: DSS2: VENC: disable VENC on OMAP4
to prevent crash" (ba02fa37de) by Tomi Valkeinen <tomi.valkeinen@ti.com> and
"OMAPDSS: VENC: fix NULL pointer dereference in DSS2 VENC sysfs debug attr on
OMAP4" (cc1d3e032d) by Danny Kukawka <danny.kukawka@bisect.de> to prevent VENC
from crashing OMAP4 kernel.
Signed-off-by: Chandrabhanu Mahapatra <cmahapatra@ti.com>
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
| -rw-r--r-- | drivers/video/omap2/dss/venc.c | 11 |
1 files changed, 0 insertions, 11 deletions
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c index 7d3eef8a010f..4a6caf9c6da3 100644 --- a/drivers/video/omap2/dss/venc.c +++ b/drivers/video/omap2/dss/venc.c @@ -674,11 +674,6 @@ static void venc_dump_regs(struct seq_file *s) { #define DUMPREG(r) seq_printf(s, "%-35s %08x\n", #r, venc_read_reg(r)) - if (cpu_is_omap44xx()) { - seq_printf(s, "VENC currently disabled on OMAP44xx\n"); - return; - } - if (venc_runtime_get()) return; @@ -893,16 +888,10 @@ static struct platform_driver omap_venchw_driver = { int __init venc_init_platform_driver(void) { - if (cpu_is_omap44xx()) - return 0; - return platform_driver_probe(&omap_venchw_driver, omap_venchw_probe); } void __exit venc_uninit_platform_driver(void) { - if (cpu_is_omap44xx()) - return; - platform_driver_unregister(&omap_venchw_driver); } |