drm/rockchip: tve: porting to linux 4.19

Change-Id: I059808111bfa96724eb629b6fc37915a4852e234
Signed-off-by: Sandy Huang <hjc@rock-chips.com>
This commit is contained in:
Sandy Huang
2019-08-15 20:38:38 +08:00
committed by Tao Huang
parent cf928240a6
commit 0f2f64e27c
3 changed files with 10 additions and 3 deletions

View File

@@ -66,4 +66,12 @@ config ROCKCHIP_LVDS
Rockchip rk3288 SoC has LVDS TX Controller can be used, and it
support LVDS, rgb, dual LVDS output mode. say Y to enable its
driver.
config ROCKCHIP_DRM_TVE
bool "Rockchip TVE support"
depends on DRM_ROCKCHIP
help
Choose this option to enable support for Rockchip TVE controllers.
say Y to enable its driver.
endif

View File

@@ -14,5 +14,6 @@ rockchipdrm-$(CONFIG_ROCKCHIP_DW_HDMI) += dw_hdmi-rockchip.o
rockchipdrm-$(CONFIG_ROCKCHIP_DW_MIPI_DSI) += dw-mipi-dsi.o
rockchipdrm-$(CONFIG_ROCKCHIP_INNO_HDMI) += inno_hdmi.o
rockchipdrm-$(CONFIG_ROCKCHIP_LVDS) += rockchip_lvds.o
rockchipdrm-$(CONFIG_ROCKCHIP_DRM_TVE) += rockchip_drm_tve.o
obj-$(CONFIG_DRM_ROCKCHIP) += rockchipdrm.o

View File

@@ -305,7 +305,6 @@ static const struct drm_encoder_funcs rockchip_tve_encoder_funcs = {
};
static const struct drm_connector_funcs rockchip_tve_connector_funcs = {
.dpms = drm_atomic_helper_connector_dpms,
.detect = rockchip_tve_connector_detect,
.fill_modes = drm_helper_probe_single_connector_modes,
.destroy = rockchip_tve_connector_destroy,
@@ -536,7 +535,7 @@ static int rockchip_tve_bind(struct device *dev, struct device *master,
drm_connector_helper_add(connector,
&rockchip_tve_connector_helper_funcs);
ret = drm_mode_connector_attach_encoder(connector, encoder);
ret = drm_connector_attach_encoder(connector, encoder);
if (ret < 0) {
dev_dbg(tve->dev, "failed to attach connector and encoder\n");
goto err_free_connector;
@@ -607,7 +606,6 @@ struct platform_driver rockchip_tve_driver = {
.of_match_table = of_match_ptr(rockchip_tve_dt_ids),
},
};
module_platform_driver(rockchip_tve_driver);
MODULE_AUTHOR("Algea Cao <Algea.cao@rock-chips.com>");
MODULE_DESCRIPTION("ROCKCHIP TVE Driver");