diff options
author | Jyri Sarha <jsarha@ti.com> | 2015-02-24 08:24:31 -0500 |
---|---|---|
committer | Jyri Sarha <jsarha@ti.com> | 2015-05-27 06:13:32 -0400 |
commit | 6730201f4fdcfbb1e6ec5ec374e6ef95e5bf9662 (patch) | |
tree | 7b02fcc30818221d82d18d7077410a157d791e0b /drivers/gpu/drm/tilcdc/tilcdc_drv.c | |
parent | de9cb5f20a50f2811caf909ee254699fd2228910 (diff) |
drm/tilcdc: Remove tilcdc slave support for tda998x driver
Remove tilcdc slave support for tda998x driver. The tilcdc slave
support would conflicts with componentized use of tda998x.
Signed-off-by: Jyri Sarha <jsarha@ti.com>
Acked-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Diffstat (limited to 'drivers/gpu/drm/tilcdc/tilcdc_drv.c')
-rw-r--r-- | drivers/gpu/drm/tilcdc/tilcdc_drv.c | 13 |
1 files changed, 0 insertions, 13 deletions
diff --git a/drivers/gpu/drm/tilcdc/tilcdc_drv.c b/drivers/gpu/drm/tilcdc/tilcdc_drv.c index 095fca91525c..0f1e09986f56 100644 --- a/drivers/gpu/drm/tilcdc/tilcdc_drv.c +++ b/drivers/gpu/drm/tilcdc/tilcdc_drv.c | |||
@@ -20,13 +20,11 @@ | |||
20 | #include "tilcdc_drv.h" | 20 | #include "tilcdc_drv.h" |
21 | #include "tilcdc_regs.h" | 21 | #include "tilcdc_regs.h" |
22 | #include "tilcdc_tfp410.h" | 22 | #include "tilcdc_tfp410.h" |
23 | #include "tilcdc_slave.h" | ||
24 | #include "tilcdc_panel.h" | 23 | #include "tilcdc_panel.h" |
25 | 24 | ||
26 | #include "drm_fb_helper.h" | 25 | #include "drm_fb_helper.h" |
27 | 26 | ||
28 | static LIST_HEAD(module_list); | 27 | static LIST_HEAD(module_list); |
29 | static bool slave_probing; | ||
30 | 28 | ||
31 | void tilcdc_module_init(struct tilcdc_module *mod, const char *name, | 29 | void tilcdc_module_init(struct tilcdc_module *mod, const char *name, |
32 | const struct tilcdc_module_ops *funcs) | 30 | const struct tilcdc_module_ops *funcs) |
@@ -42,11 +40,6 @@ void tilcdc_module_cleanup(struct tilcdc_module *mod) | |||
42 | list_del(&mod->list); | 40 | list_del(&mod->list); |
43 | } | 41 | } |
44 | 42 | ||
45 | void tilcdc_slave_probedefer(bool defered) | ||
46 | { | ||
47 | slave_probing = defered; | ||
48 | } | ||
49 | |||
50 | static struct of_device_id tilcdc_of_match[]; | 43 | static struct of_device_id tilcdc_of_match[]; |
51 | 44 | ||
52 | static struct drm_framebuffer *tilcdc_fb_create(struct drm_device *dev, | 45 | static struct drm_framebuffer *tilcdc_fb_create(struct drm_device *dev, |
@@ -620,10 +613,6 @@ static int tilcdc_pdev_probe(struct platform_device *pdev) | |||
620 | return -ENXIO; | 613 | return -ENXIO; |
621 | } | 614 | } |
622 | 615 | ||
623 | /* defer probing if slave is in deferred probing */ | ||
624 | if (slave_probing == true) | ||
625 | return -EPROBE_DEFER; | ||
626 | |||
627 | return drm_platform_init(&tilcdc_driver, pdev); | 616 | return drm_platform_init(&tilcdc_driver, pdev); |
628 | } | 617 | } |
629 | 618 | ||
@@ -654,7 +643,6 @@ static int __init tilcdc_drm_init(void) | |||
654 | { | 643 | { |
655 | DBG("init"); | 644 | DBG("init"); |
656 | tilcdc_tfp410_init(); | 645 | tilcdc_tfp410_init(); |
657 | tilcdc_slave_init(); | ||
658 | tilcdc_panel_init(); | 646 | tilcdc_panel_init(); |
659 | return platform_driver_register(&tilcdc_platform_driver); | 647 | return platform_driver_register(&tilcdc_platform_driver); |
660 | } | 648 | } |
@@ -664,7 +652,6 @@ static void __exit tilcdc_drm_fini(void) | |||
664 | DBG("fini"); | 652 | DBG("fini"); |
665 | platform_driver_unregister(&tilcdc_platform_driver); | 653 | platform_driver_unregister(&tilcdc_platform_driver); |
666 | tilcdc_panel_fini(); | 654 | tilcdc_panel_fini(); |
667 | tilcdc_slave_fini(); | ||
668 | tilcdc_tfp410_fini(); | 655 | tilcdc_tfp410_fini(); |
669 | } | 656 | } |
670 | 657 | ||