Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video: omapfb2: Make standard and custom panel drivers mutually exclusive

Standard DRM panel drivers for several panels used by omapfb2 are now
available. Their module name clashes with the modules from
drivers/video/fbdev/omap2/omapfb/displays, part of the deprecated omapfb2
fbdev driver. As omapfb2 can only be compiled when the omapdrm driver is
disabled, and the DRM panel drivers are useless in that case, make the
omapfb2 panels depend on the standard DRM panels being disabled to fix
the name clash.

Signed-off-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Reviewed-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Fixes: dc2e1e5b279966 ("drm/panel: Add driver for the Toppoly TD043MTEA1 panel")
Fixes: 415b8dd0871188 ("drm/panel: Add driver for the Toppoly TD028TTEC1 panel")
Fixes: 1c8fc3f0c5d280 ("drm/panel: Add driver for the Sony ACX565AKM panel")
Fixes: c9cf4c2a3bd35f ("drm/panel: Add driver for the Sharp LS037V7DW01 panel")
Fixes: df439abe650177 ("drm/panel: Add driver for the NEC NL8048HL11 panel")
Cc: Bartlomiej Zolnierkiewicz <b.zolnierkie@samsung.com>
Signed-off-by: Sam Ravnborg <sam@ravnborg.org> [added tags]
Link: https://patchwork.freedesktop.org/patch/msgid/20190816122228.9475-2-laurent.pinchart@ideasonboard.com

authored by

Laurent Pinchart and committed by
Sam Ravnborg
1e938755 b016cd6e

+5
+5
drivers/video/fbdev/omap2/omapfb/displays/Kconfig
··· 49 49 config FB_OMAP2_PANEL_SONY_ACX565AKM 50 50 tristate "ACX565AKM Panel" 51 51 depends on SPI && BACKLIGHT_CLASS_DEVICE 52 + depends on DRM_PANEL_SONY_ACX565AKM = n 52 53 help 53 54 This is the LCD panel used on Nokia N900 54 55 ··· 62 61 config FB_OMAP2_PANEL_SHARP_LS037V7DW01 63 62 tristate "Sharp LS037V7DW01 LCD Panel" 64 63 depends on BACKLIGHT_CLASS_DEVICE 64 + depends on DRM_PANEL_SHARP_LS037V7DW01 = n 65 65 help 66 66 LCD Panel used in TI's SDP3430 and EVM boards 67 67 68 68 config FB_OMAP2_PANEL_TPO_TD028TTEC1 69 69 tristate "TPO TD028TTEC1 LCD Panel" 70 70 depends on SPI 71 + depends on DRM_PANEL_TPO_TD028TTEC1 = n 71 72 help 72 73 LCD panel used in Openmoko. 73 74 74 75 config FB_OMAP2_PANEL_TPO_TD043MTEA1 75 76 tristate "TPO TD043MTEA1 LCD Panel" 76 77 depends on SPI 78 + depends on DRM_PANEL_TPO_TD043MTEA1 = n 77 79 help 78 80 LCD Panel used in OMAP3 Pandora 79 81 ··· 84 80 tristate "NEC NL8048HL11 Panel" 85 81 depends on SPI 86 82 depends on BACKLIGHT_CLASS_DEVICE 83 + depends on DRM_PANEL_NEC_NL8048HL11 = n 87 84 help 88 85 This NEC NL8048HL11 panel is TFT LCD used in the 89 86 Zoom2/3/3630 sdp boards.