ODROID-C5: drm: remove 'DUMMY-1' connector
Signed-off-by: Dongjin Kim <tobetter@gmail.com>
Change-Id: I84536fadfb141adf6dadd32a10b251ef595374aa
diff --git a/drivers/drm/Makefile b/drivers/drm/Makefile
index 952faef..e56daec 100644
--- a/drivers/drm/Makefile
+++ b/drivers/drm/Makefile
@@ -38,7 +38,6 @@
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 \
@@ -51,6 +50,10 @@
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 e17f1d5..62b3f4c 100644
--- a/drivers/drm/meson_drm_bind.c
+++ b/drivers/drm/meson_drm_bind.c
@@ -55,11 +55,13 @@
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);
@@ -103,11 +105,13 @@
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);