Skip to content

Commit

Permalink
Merge tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux into…
Browse files Browse the repository at this point in the history
… drm-next

tilcdc fixes for v4.15

* tag 'tilcdc-4.15-fixes' of https://github.com/jsarha/linux:
  drm/tilcdc: Remove obsolete "ti,tilcdc,slave" dts binding support
  • Loading branch information
airlied committed Nov 23, 2017
2 parents 9cae775 + 739acd8 commit 1cee3bc
Show file tree
Hide file tree
Showing 5 changed files with 0 additions and 380 deletions.
11 changes: 0 additions & 11 deletions drivers/gpu/drm/tilcdc/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -12,14 +12,3 @@ config DRM_TILCDC
controller, for example AM33xx in beagle-bone, DA8xx, or
OMAP-L1xx. This driver replaces the FB_DA8XX fbdev driver.

config DRM_TILCDC_SLAVE_COMPAT
bool "Support device tree blobs using TI LCDC Slave binding"
depends on DRM_TILCDC
default y
select OF_RESOLVE
select OF_OVERLAY
help
Choose this option if you need a kernel that is compatible
with device tree blobs using the obsolete "ti,tilcdc,slave"
binding. If you find "ti,tilcdc,slave"-string from your DTB,
you probably need this. Otherwise you do not.
3 changes: 0 additions & 3 deletions drivers/gpu/drm/tilcdc/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,6 @@ ifeq (, $(findstring -W,$(EXTRA_CFLAGS)))
ccflags-y += -Werror
endif

obj-$(CONFIG_DRM_TILCDC_SLAVE_COMPAT) += tilcdc_slave_compat.o \
tilcdc_slave_compat.dtb.o

tilcdc-y := \
tilcdc_plane.o \
tilcdc_crtc.o \
Expand Down
269 changes: 0 additions & 269 deletions drivers/gpu/drm/tilcdc/tilcdc_slave_compat.c

This file was deleted.

72 changes: 0 additions & 72 deletions drivers/gpu/drm/tilcdc/tilcdc_slave_compat.dts

This file was deleted.

25 changes: 0 additions & 25 deletions drivers/gpu/drm/tilcdc/tilcdc_slave_compat.h

This file was deleted.

0 comments on commit 1cee3bc

Please sign in to comment.