Revert "ODROID-C5: drm: remove 'DUMMY-1' connector"
This reverts commit 56ea0b4f054fc98ade9c9ce5819306d59749be49.
Change-Id: Ic70a19ac265080faa2442466eb9e81a09b6cbd1b
diff --git a/drivers/drm/Makefile b/drivers/drm/Makefile
index e56daec..952faef 100644
--- a/drivers/drm/Makefile
+++ b/drivers/drm/Makefile
@@ -38,6 +38,7 @@
meson_vpu_pipeline_private.o \
meson_debugfs.o meson_vpu_util.o \
meson_drm_bind.o\
+ meson_dummyl.o meson_dummyp.o \
meson_drm_rdma.o \
vpu-hw/meson_vpu_video_wrapper.o \
vpu-hw/meson_vpu_osd_mif.o \
@@ -50,10 +51,6 @@
vpu-hw/meson_osd_csc.o \
vpu-hw/meson_vpu_postblend.o \
-ifeq ($(CONFIG_ARCH_MESON_ODROID_COMMON),)
- $(MESON_DRM_MODULE_NAME)-y += meson_dummyl.o meson_dummyp.o
-endif
-
ifeq ($(CONFIG_AMLOGIC_ZAPPER_CUT),)
$(MESON_DRM_MODULE_NAME)-y += meson_lcd.o
endif
diff --git a/drivers/drm/meson_drm_bind.c b/drivers/drm/meson_drm_bind.c
index 62b3f4c..e17f1d5 100644
--- a/drivers/drm/meson_drm_bind.c
+++ b/drivers/drm/meson_drm_bind.c
@@ -55,13 +55,11 @@
return meson_panel_dev_bind(drm, type, intf);
#endif
-#ifndef CONFIG_ARCH_MESON_ODROID_COMMON
case DRM_MODE_CONNECTOR_MESON_DUMMY_L:
return meson_dummyl_dev_bind(drm, type, intf);
case DRM_MODE_CONNECTOR_MESON_DUMMY_P:
return meson_dummyp_dev_bind(drm, type, intf);
-#endif
default:
pr_err("unknown connector tye %d\n", type);
@@ -105,13 +103,11 @@
return meson_panel_dev_unbind(drm, type, connector_id);
#endif
-#ifndef CONFIG_ARCH_MESON_ODROID_COMMON
case DRM_MODE_CONNECTOR_MESON_DUMMY_L:
return meson_dummyl_dev_unbind(drm, type, connector_id);
case DRM_MODE_CONNECTOR_MESON_DUMMY_P:
return meson_dummyp_dev_unbind(drm, type, connector_id);
-#endif
default:
pr_err("unknown connector tye %d\n", type);