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: dc2e1e5b27 ("drm/panel: Add driver for the Toppoly TD043MTEA1 panel")
Fixes: 415b8dd087 ("drm/panel: Add driver for the Toppoly TD028TTEC1 panel")
Fixes: 1c8fc3f0c5 ("drm/panel: Add driver for the Sony ACX565AKM panel")
Fixes: c9cf4c2a3b ("drm/panel: Add driver for the Sharp LS037V7DW01 panel")
Fixes: df439abe65 ("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
This commit is contained in:
Laurent Pinchart 2019-08-16 15:22:27 +03:00 committed by Sam Ravnborg
parent b016cd6ed4
commit 1e938755fa

View File

@ -49,6 +49,7 @@ config FB_OMAP2_PANEL_DSI_CM
config FB_OMAP2_PANEL_SONY_ACX565AKM config FB_OMAP2_PANEL_SONY_ACX565AKM
tristate "ACX565AKM Panel" tristate "ACX565AKM Panel"
depends on SPI && BACKLIGHT_CLASS_DEVICE depends on SPI && BACKLIGHT_CLASS_DEVICE
depends on DRM_PANEL_SONY_ACX565AKM = n
help help
This is the LCD panel used on Nokia N900 This is the LCD panel used on Nokia N900
@ -61,18 +62,21 @@ config FB_OMAP2_PANEL_LGPHILIPS_LB035Q02
config FB_OMAP2_PANEL_SHARP_LS037V7DW01 config FB_OMAP2_PANEL_SHARP_LS037V7DW01
tristate "Sharp LS037V7DW01 LCD Panel" tristate "Sharp LS037V7DW01 LCD Panel"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_PANEL_SHARP_LS037V7DW01 = n
help help
LCD Panel used in TI's SDP3430 and EVM boards LCD Panel used in TI's SDP3430 and EVM boards
config FB_OMAP2_PANEL_TPO_TD028TTEC1 config FB_OMAP2_PANEL_TPO_TD028TTEC1
tristate "TPO TD028TTEC1 LCD Panel" tristate "TPO TD028TTEC1 LCD Panel"
depends on SPI depends on SPI
depends on DRM_PANEL_TPO_TD028TTEC1 = n
help help
LCD panel used in Openmoko. LCD panel used in Openmoko.
config FB_OMAP2_PANEL_TPO_TD043MTEA1 config FB_OMAP2_PANEL_TPO_TD043MTEA1
tristate "TPO TD043MTEA1 LCD Panel" tristate "TPO TD043MTEA1 LCD Panel"
depends on SPI depends on SPI
depends on DRM_PANEL_TPO_TD043MTEA1 = n
help help
LCD Panel used in OMAP3 Pandora LCD Panel used in OMAP3 Pandora
@ -80,6 +84,7 @@ config FB_OMAP2_PANEL_NEC_NL8048HL11
tristate "NEC NL8048HL11 Panel" tristate "NEC NL8048HL11 Panel"
depends on SPI depends on SPI
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
depends on DRM_PANEL_NEC_NL8048HL11 = n
help help
This NEC NL8048HL11 panel is TFT LCD used in the This NEC NL8048HL11 panel is TFT LCD used in the
Zoom2/3/3630 sdp boards. Zoom2/3/3630 sdp boards.