Commit 6730201f authored by Jyri Sarha's avatar Jyri Sarha

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: default avatarJyri Sarha <jsarha@ti.com>
Acked-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
parent de9cb5f2
Device-Tree bindings for tilcdc DRM encoder slave output driver
Required properties:
- compatible: value should be "ti,tilcdc,slave".
- i2c: the phandle for the i2c device the encoder slave is connected to
Recommended properties:
- pinctrl-names, pinctrl-0: the pincontrol settings to configure
muxing properly for pins that connect to TFP410 device
Example:
hdmi {
compatible = "ti,tilcdc,slave";
i2c = <&i2c0>;
pinctrl-names = "default";
pinctrl-0 = <&nxp_hdmi_bonelt_pins>;
};
...@@ -6,7 +6,6 @@ endif ...@@ -6,7 +6,6 @@ endif
tilcdc-y := \ tilcdc-y := \
tilcdc_crtc.o \ tilcdc_crtc.o \
tilcdc_tfp410.o \ tilcdc_tfp410.o \
tilcdc_slave.o \
tilcdc_panel.o \ tilcdc_panel.o \
tilcdc_drv.o tilcdc_drv.o
......
...@@ -20,13 +20,11 @@ ...@@ -20,13 +20,11 @@
#include "tilcdc_drv.h" #include "tilcdc_drv.h"
#include "tilcdc_regs.h" #include "tilcdc_regs.h"
#include "tilcdc_tfp410.h" #include "tilcdc_tfp410.h"
#include "tilcdc_slave.h"
#include "tilcdc_panel.h" #include "tilcdc_panel.h"
#include "drm_fb_helper.h" #include "drm_fb_helper.h"
static LIST_HEAD(module_list); static LIST_HEAD(module_list);
static bool slave_probing;
void tilcdc_module_init(struct tilcdc_module *mod, const char *name, void tilcdc_module_init(struct tilcdc_module *mod, const char *name,
const struct tilcdc_module_ops *funcs) const struct tilcdc_module_ops *funcs)
...@@ -42,11 +40,6 @@ void tilcdc_module_cleanup(struct tilcdc_module *mod) ...@@ -42,11 +40,6 @@ void tilcdc_module_cleanup(struct tilcdc_module *mod)
list_del(&mod->list); list_del(&mod->list);
} }
void tilcdc_slave_probedefer(bool defered)
{
slave_probing = defered;
}
static struct of_device_id tilcdc_of_match[]; static struct of_device_id tilcdc_of_match[];
static struct drm_framebuffer *tilcdc_fb_create(struct drm_device *dev, 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,10 +613,6 @@ static int tilcdc_pdev_probe(struct platform_device *pdev)
return -ENXIO; return -ENXIO;
} }
/* defer probing if slave is in deferred probing */
if (slave_probing == true)
return -EPROBE_DEFER;
return drm_platform_init(&tilcdc_driver, pdev); return drm_platform_init(&tilcdc_driver, pdev);
} }
...@@ -654,7 +643,6 @@ static int __init tilcdc_drm_init(void) ...@@ -654,7 +643,6 @@ static int __init tilcdc_drm_init(void)
{ {
DBG("init"); DBG("init");
tilcdc_tfp410_init(); tilcdc_tfp410_init();
tilcdc_slave_init();
tilcdc_panel_init(); tilcdc_panel_init();
return platform_driver_register(&tilcdc_platform_driver); return platform_driver_register(&tilcdc_platform_driver);
} }
...@@ -664,7 +652,6 @@ static void __exit tilcdc_drm_fini(void) ...@@ -664,7 +652,6 @@ static void __exit tilcdc_drm_fini(void)
DBG("fini"); DBG("fini");
platform_driver_unregister(&tilcdc_platform_driver); platform_driver_unregister(&tilcdc_platform_driver);
tilcdc_panel_fini(); tilcdc_panel_fini();
tilcdc_slave_fini();
tilcdc_tfp410_fini(); tilcdc_tfp410_fini();
} }
......
...@@ -116,7 +116,6 @@ struct tilcdc_module { ...@@ -116,7 +116,6 @@ struct tilcdc_module {
void tilcdc_module_init(struct tilcdc_module *mod, const char *name, void tilcdc_module_init(struct tilcdc_module *mod, const char *name,
const struct tilcdc_module_ops *funcs); const struct tilcdc_module_ops *funcs);
void tilcdc_module_cleanup(struct tilcdc_module *mod); void tilcdc_module_cleanup(struct tilcdc_module *mod);
void tilcdc_slave_probedefer(bool defered);
/* Panel config that needs to be set in the crtc, but is not coming from /* Panel config that needs to be set in the crtc, but is not coming from
* the mode timings. The display module is expected to call * the mode timings. The display module is expected to call
......
This diff is collapsed.
/*
* Copyright (C) 2012 Texas Instruments
* Author: Rob Clark <robdclark@gmail.com>
*
* This program is free software; you can redistribute it and/or modify it
* under the terms of the GNU General Public License version 2 as published by
* the Free Software Foundation.
*
* This program is distributed in the hope that it will be useful, but WITHOUT
* ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
* FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
* more details.
*
* You should have received a copy of the GNU General Public License along with
* this program. If not, see <http://www.gnu.org/licenses/>.
*/
#ifndef __TILCDC_SLAVE_H__
#define __TILCDC_SLAVE_H__
/* sub-module for i2c slave encoder output */
int tilcdc_slave_init(void);
void tilcdc_slave_fini(void);
#endif /* __TILCDC_SLAVE_H__ */
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment