Commit d232fd04 authored by Tomi Valkeinen's avatar Tomi Valkeinen

omapfb/displays: change CONFIG_DISPLAY_* to CONFIG_FB_OMAP2_*

We need to change the config symbols of omapfb's private copy of the
panel and encoder drivers so that we won't have config symbol conflicts.

This patch changes the symbols from the panel and encoder drivers using
simple replacement of DISPLAY_* to FB_OMAP2*.
Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarDave Airlie <airlied@gmail.com>
Acked-by: default avatarRob Clark <robdclark@gmail.com>
parent 35b522cf
menu "OMAP Display Device Drivers (new device model)" menu "OMAPFB Panel and Encoder Drivers"
depends on OMAP2_DSS depends on FB_OMAP2_DSS
config DISPLAY_ENCODER_OPA362 config FB_OMAP2_ENCODER_OPA362
tristate "OPA362 external analog amplifier" tristate "OPA362 external analog amplifier"
help help
Driver for OPA362 external analog TV amplifier controlled Driver for OPA362 external analog TV amplifier controlled
through a GPIO. through a GPIO.
config DISPLAY_ENCODER_TFP410 config FB_OMAP2_ENCODER_TFP410
tristate "TFP410 DPI to DVI Encoder" tristate "TFP410 DPI to DVI Encoder"
help help
Driver for TFP410 DPI to DVI encoder. Driver for TFP410 DPI to DVI encoder.
config DISPLAY_ENCODER_TPD12S015 config FB_OMAP2_ENCODER_TPD12S015
tristate "TPD12S015 HDMI ESD protection and level shifter" tristate "TPD12S015 HDMI ESD protection and level shifter"
help help
Driver for TPD12S015, which offers HDMI ESD protection and level Driver for TPD12S015, which offers HDMI ESD protection and level
shifting. shifting.
config DISPLAY_CONNECTOR_DVI config FB_OMAP2_CONNECTOR_DVI
tristate "DVI Connector" tristate "DVI Connector"
depends on I2C depends on I2C
help help
Driver for a generic DVI connector. Driver for a generic DVI connector.
config DISPLAY_CONNECTOR_HDMI config FB_OMAP2_CONNECTOR_HDMI
tristate "HDMI Connector" tristate "HDMI Connector"
help help
Driver for a generic HDMI connector. Driver for a generic HDMI connector.
config DISPLAY_CONNECTOR_ANALOG_TV config FB_OMAP2_CONNECTOR_ANALOG_TV
tristate "Analog TV Connector" tristate "Analog TV Connector"
help help
Driver for a generic analog TV connector. Driver for a generic analog TV connector.
config DISPLAY_PANEL_DPI config FB_OMAP2_PANEL_DPI
tristate "Generic DPI panel" tristate "Generic DPI panel"
help help
Driver for generic DPI panels. Driver for generic DPI panels.
config DISPLAY_PANEL_DSI_CM config FB_OMAP2_PANEL_DSI_CM
tristate "Generic DSI Command Mode Panel" tristate "Generic DSI Command Mode Panel"
depends on BACKLIGHT_CLASS_DEVICE depends on BACKLIGHT_CLASS_DEVICE
help help
Driver for generic DSI command mode panels. Driver for generic DSI command mode panels.
config DISPLAY_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
help help
This is the LCD panel used on Nokia N900 This is the LCD panel used on Nokia N900
config DISPLAY_PANEL_LGPHILIPS_LB035Q02 config FB_OMAP2_PANEL_LGPHILIPS_LB035Q02
tristate "LG.Philips LB035Q02 LCD Panel" tristate "LG.Philips LB035Q02 LCD Panel"
depends on SPI depends on SPI
help help
LCD Panel used on the Gumstix Overo Palo35 LCD Panel used on the Gumstix Overo Palo35
config DISPLAY_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
help help
LCD Panel used in TI's SDP3430 and EVM boards LCD Panel used in TI's SDP3430 and EVM boards
config DISPLAY_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
help help
LCD panel used in Openmoko. LCD panel used in Openmoko.
config DISPLAY_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
help help
LCD Panel used in OMAP3 Pandora LCD Panel used in OMAP3 Pandora
config DISPLAY_PANEL_NEC_NL8048HL11 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
......
obj-$(CONFIG_DISPLAY_ENCODER_OPA362) += encoder-opa362.o obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o
obj-$(CONFIG_DISPLAY_ENCODER_TFP410) += encoder-tfp410.o obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o
obj-$(CONFIG_DISPLAY_ENCODER_TPD12S015) += encoder-tpd12s015.o obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o
obj-$(CONFIG_DISPLAY_CONNECTOR_DVI) += connector-dvi.o obj-$(CONFIG_FB_OMAP2_CONNECTOR_DVI) += connector-dvi.o
obj-$(CONFIG_DISPLAY_CONNECTOR_HDMI) += connector-hdmi.o obj-$(CONFIG_FB_OMAP2_CONNECTOR_HDMI) += connector-hdmi.o
obj-$(CONFIG_DISPLAY_CONNECTOR_ANALOG_TV) += connector-analog-tv.o obj-$(CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
obj-$(CONFIG_DISPLAY_PANEL_DPI) += panel-dpi.o obj-$(CONFIG_FB_OMAP2_PANEL_DPI) += panel-dpi.o
obj-$(CONFIG_DISPLAY_PANEL_DSI_CM) += panel-dsi-cm.o obj-$(CONFIG_FB_OMAP2_PANEL_DSI_CM) += panel-dsi-cm.o
obj-$(CONFIG_DISPLAY_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o obj-$(CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
obj-$(CONFIG_DISPLAY_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o obj-$(CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
obj-$(CONFIG_DISPLAY_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o obj-$(CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
obj-$(CONFIG_DISPLAY_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
obj-$(CONFIG_DISPLAY_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
obj-$(CONFIG_DISPLAY_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o obj-$(CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment