Skip to content

Commit caf0578

Browse files
tombatomba
committed
Merge omapdss split between omapdrm and omapfb
Merge changes to create a separate copy of omapdss for omapdrm and omapfb.
2 parents ef1ea03 + 5b63aa3 commit caf0578

File tree

122 files changed

+36300
-20
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

122 files changed

+36300
-20
lines changed

‎drivers/gpu/drm/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@ obj-$(CONFIG_DRM_ARMADA) += armada/
6262
obj-$(CONFIG_DRM_ATMEL_HLCDC) += atmel-hlcdc/
6363
obj-$(CONFIG_DRM_RCAR_DU) += rcar-du/
6464
obj-$(CONFIG_DRM_SHMOBILE) +=shmobile/
65-
obj-$(CONFIG_DRM_OMAP) += omapdrm/
65+
obj-y += omapdrm/
6666
obj-y += tilcdc/
6767
obj-$(CONFIG_DRM_QXL) += qxl/
6868
obj-$(CONFIG_DRM_BOCHS) += bochs/

‎drivers/gpu/drm/omapdrm/Kconfig

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
1-
21
config DRM_OMAP
32
tristate "OMAP DRM"
43
depends on DRM
54
depends on ARCH_OMAP2PLUS || ARCH_MULTIPLATFORM
6-
depends on OMAP2_DSS
5+
select OMAP2_DSS
76
select DRM_KMS_HELPER
87
select DRM_KMS_FB_HELPER
98
select FB_SYS_FILLRECT
@@ -14,13 +13,18 @@ config DRM_OMAP
1413
help
1514
DRM display driver for OMAP2/3/4 based boards.
1615

16+
if DRM_OMAP
17+
1718
config DRM_OMAP_NUM_CRTCS
1819
int "Number of CRTCs"
1920
range 1 10
2021
default 1 if ARCH_OMAP2 || ARCH_OMAP3
2122
default 2 if ARCH_OMAP4
22-
depends on DRM_OMAP
2323
help
2424
Select the number of video overlays which can be used as framebuffers.
2525
The remaining overlays are reserved for video.
2626

27+
source "drivers/gpu/drm/omapdrm/dss/Kconfig"
28+
source "drivers/gpu/drm/omapdrm/displays/Kconfig"
29+
30+
endif

‎drivers/gpu/drm/omapdrm/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
# Direct Rendering Infrastructure (DRI)
44
#
55

6+
obj-y += dss/
7+
obj-y += displays/
8+
69
ccflags-y := -Iinclude/drm -Werror
710
omapdrm-y := omap_drv.o \
811
omap_irq.o \

‎drivers/video/fbdev/omap2/displays-new/Kconfig renamed to ‎drivers/gpu/drm/omapdrm/displays/Kconfig

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
1-
menu "OMAP Display Device Drivers (new device model)"
2-
depends on OMAP2_DSS
1+
menu "OMAPDRM External Display Device Drivers"
32

43
config DISPLAY_ENCODER_OPA362
54
tristate "OPA362 external analog amplifier"

‎drivers/video/fbdev/omap2/displays-new/Makefile renamed to ‎drivers/gpu/drm/omapdrm/displays/Makefile

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-analog-tv.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-analog-tv.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-dvi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-dvi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/connector-hdmi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/connector-hdmi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-opa362.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-opa362.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-tfp410.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-tfp410.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/encoder-tpd12s015.c renamed to ‎drivers/gpu/drm/omapdrm/displays/encoder-tpd12s015.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-dpi.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-dpi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-dsi-cm.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-dsi-cm.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-lgphilips-lb035q02.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-lgphilips-lb035q02.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-nec-nl8048hl11.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-nec-nl8048hl11.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-sharp-ls037v7dw01.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-sharp-ls037v7dw01.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-sony-acx565akm.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-sony-acx565akm.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-tpo-td028ttec1.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-tpo-td028ttec1.c

File renamed without changes.

‎drivers/video/fbdev/omap2/displays-new/panel-tpo-td043mtea1.c renamed to ‎drivers/gpu/drm/omapdrm/displays/panel-tpo-td043mtea1.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/Kconfig renamed to ‎drivers/gpu/drm/omapdrm/dss/Kconfig

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/Makefile renamed to ‎drivers/gpu/drm/omapdrm/dss/Makefile

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/apply.c renamed to ‎drivers/gpu/drm/omapdrm/dss/apply.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/core.c renamed to ‎drivers/gpu/drm/omapdrm/dss/core.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc-compat.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc-compat.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc-compat.h renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc-compat.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc.h renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dispc_coefs.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dispc_coefs.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/display-sysfs.c renamed to ‎drivers/gpu/drm/omapdrm/dss/display-sysfs.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/display.c renamed to ‎drivers/gpu/drm/omapdrm/dss/display.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dpi.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dpi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dsi.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dsi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dss-of.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dss-of.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dss.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dss.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dss.h renamed to ‎drivers/gpu/drm/omapdrm/dss/dss.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dss_features.c renamed to ‎drivers/gpu/drm/omapdrm/dss/dss_features.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/dss_features.h renamed to ‎drivers/gpu/drm/omapdrm/dss/dss_features.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi.h renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi4.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi4.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi4_core.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi4_core.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi4_core.h renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi4_core.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi5.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi5.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi5_core.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi5_core.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi5_core.h renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi5_core.h

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi_common.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi_common.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi_phy.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi_phy.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi_pll.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi_pll.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/hdmi_wp.c renamed to ‎drivers/gpu/drm/omapdrm/dss/hdmi_wp.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/manager-sysfs.c renamed to ‎drivers/gpu/drm/omapdrm/dss/manager-sysfs.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/manager.c renamed to ‎drivers/gpu/drm/omapdrm/dss/manager.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/omapdss-boot-init.c renamed to ‎drivers/gpu/drm/omapdrm/dss/omapdss-boot-init.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/output.c renamed to ‎drivers/gpu/drm/omapdrm/dss/output.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/overlay-sysfs.c renamed to ‎drivers/gpu/drm/omapdrm/dss/overlay-sysfs.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/overlay.c renamed to ‎drivers/gpu/drm/omapdrm/dss/overlay.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/pll.c renamed to ‎drivers/gpu/drm/omapdrm/dss/pll.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/rfbi.c renamed to ‎drivers/gpu/drm/omapdrm/dss/rfbi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/sdi.c renamed to ‎drivers/gpu/drm/omapdrm/dss/sdi.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/venc.c renamed to ‎drivers/gpu/drm/omapdrm/dss/venc.c

File renamed without changes.

‎drivers/video/fbdev/omap2/dss/video-pll.c renamed to ‎drivers/gpu/drm/omapdrm/dss/video-pll.c

File renamed without changes.

‎drivers/media/platform/omap/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,9 @@ config VIDEO_OMAP2_VOUT
55
tristate "OMAP2/OMAP3 V4L2-Display driver"
66
depends on MMU
77
depends on ARCH_OMAP2 || ARCH_OMAP3
8+
depends on FB_OMAP2
89
select VIDEOBUF_GEN
910
select VIDEOBUF_DMA_CONTIG
10-
select OMAP2_DSS if HAS_IOMEM && ARCH_OMAP2PLUS
1111
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
1212
select VIDEO_OMAP2_VOUT_VRFB if VIDEO_OMAP2_VOUT && OMAP2_VRFB
1313
select FRAME_VECTOR

‎drivers/video/fbdev/omap2/Kconfig

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,5 @@
1-
config OMAP2_VRFB
2-
bool
3-
41
if ARCH_OMAP2PLUS
52

6-
source "drivers/video/fbdev/omap2/dss/Kconfig"
73
source "drivers/video/fbdev/omap2/omapfb/Kconfig"
8-
source "drivers/video/fbdev/omap2/displays-new/Kconfig"
94

105
endif

‎drivers/video/fbdev/omap2/Makefile

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1 @@
1-
obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
2-
3-
obj-y += dss/
4-
obj-y += displays-new/
5-
obj-$(CONFIG_FB_OMAP2) += omapfb/
1+
obj-y += omapfb/

‎drivers/video/fbdev/omap2/omapfb/Kconfig

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
1+
config OMAP2_VRFB
2+
bool
3+
14
menuconfig FB_OMAP2
25
tristate "OMAP2+ frame buffer support"
3-
depends on FB && OMAP2_DSS && !DRM_OMAP
6+
depends on FB
7+
depends on DRM_OMAP = n
48

9+
select FB_OMAP2_DSS
510
select OMAP2_VRFB if ARCH_OMAP2 || ARCH_OMAP3
611
select FB_CFB_FILLRECT
712
select FB_CFB_COPYAREA
813
select FB_CFB_IMAGEBLIT
914
help
1015
Frame buffer driver for OMAP2+ based boards.
1116

17+
if FB_OMAP2
18+
1219
config FB_OMAP2_DEBUG_SUPPORT
1320
bool "Debug support for OMAP2+ FB"
1421
default y
@@ -25,3 +32,8 @@ config FB_OMAP2_NUM_FBS
2532
help
2633
Select the number of framebuffers created. OMAP2/3 has 3 overlays
2734
so normally this would be 3.
35+
36+
source "drivers/video/fbdev/omap2/omapfb/dss/Kconfig"
37+
source "drivers/video/fbdev/omap2/omapfb/displays/Kconfig"
38+
39+
endif

‎drivers/video/fbdev/omap2/omapfb/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,5 @@
1+
obj-$(CONFIG_OMAP2_VRFB) += vrfb.o
2+
obj-y += dss/
3+
obj-y += displays/
14
obj-$(CONFIG_FB_OMAP2) += omapfb.o
25
omapfb-y := omapfb-main.o omapfb-sysfs.o omapfb-ioctl.o

‎drivers/video/fbdev/omap2/omapfb/displays/Kconfig

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
menu "OMAPFB Panel and Encoder Drivers"
2+
depends on FB_OMAP2_DSS
3+
4+
config FB_OMAP2_ENCODER_OPA362
5+
tristate "OPA362 external analog amplifier"
6+
help
7+
Driver for OPA362 external analog TV amplifier controlled
8+
through a GPIO.
9+
10+
config FB_OMAP2_ENCODER_TFP410
11+
tristate "TFP410 DPI to DVI Encoder"
12+
help
13+
Driver for TFP410 DPI to DVI encoder.
14+
15+
config FB_OMAP2_ENCODER_TPD12S015
16+
tristate "TPD12S015 HDMI ESD protection and level shifter"
17+
help
18+
Driver for TPD12S015, which offers HDMI ESD protection and level
19+
shifting.
20+
21+
config FB_OMAP2_CONNECTOR_DVI
22+
tristate "DVI Connector"
23+
depends on I2C
24+
help
25+
Driver for a generic DVI connector.
26+
27+
config FB_OMAP2_CONNECTOR_HDMI
28+
tristate "HDMI Connector"
29+
help
30+
Driver for a generic HDMI connector.
31+
32+
config FB_OMAP2_CONNECTOR_ANALOG_TV
33+
tristate "Analog TV Connector"
34+
help
35+
Driver for a generic analog TV connector.
36+
37+
config FB_OMAP2_PANEL_DPI
38+
tristate "Generic DPI panel"
39+
help
40+
Driver for generic DPI panels.
41+
42+
config FB_OMAP2_PANEL_DSI_CM
43+
tristate "Generic DSI Command Mode Panel"
44+
depends on BACKLIGHT_CLASS_DEVICE
45+
help
46+
Driver for generic DSI command mode panels.
47+
48+
config FB_OMAP2_PANEL_SONY_ACX565AKM
49+
tristate "ACX565AKM Panel"
50+
depends on SPI && BACKLIGHT_CLASS_DEVICE
51+
help
52+
This is the LCD panel used on Nokia N900
53+
54+
config FB_OMAP2_PANEL_LGPHILIPS_LB035Q02
55+
tristate "LG.Philips LB035Q02 LCD Panel"
56+
depends on SPI
57+
help
58+
LCD Panel used on the Gumstix Overo Palo35
59+
60+
config FB_OMAP2_PANEL_SHARP_LS037V7DW01
61+
tristate "Sharp LS037V7DW01 LCD Panel"
62+
depends on BACKLIGHT_CLASS_DEVICE
63+
help
64+
LCD Panel used in TI's SDP3430 and EVM boards
65+
66+
config FB_OMAP2_PANEL_TPO_TD028TTEC1
67+
tristate "TPO TD028TTEC1 LCD Panel"
68+
depends on SPI
69+
help
70+
LCD panel used in Openmoko.
71+
72+
config FB_OMAP2_PANEL_TPO_TD043MTEA1
73+
tristate "TPO TD043MTEA1 LCD Panel"
74+
depends on SPI
75+
help
76+
LCD Panel used in OMAP3 Pandora
77+
78+
config FB_OMAP2_PANEL_NEC_NL8048HL11
79+
tristate "NEC NL8048HL11 Panel"
80+
depends on SPI
81+
depends on BACKLIGHT_CLASS_DEVICE
82+
help
83+
This NEC NL8048HL11 panel is TFT LCD used in the
84+
Zoom2/3/3630 sdp boards.
85+
86+
endmenu

‎drivers/video/fbdev/omap2/omapfb/displays/Makefile

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
obj-$(CONFIG_FB_OMAP2_ENCODER_OPA362) += encoder-opa362.o
2+
obj-$(CONFIG_FB_OMAP2_ENCODER_TFP410) += encoder-tfp410.o
3+
obj-$(CONFIG_FB_OMAP2_ENCODER_TPD12S015) += encoder-tpd12s015.o
4+
obj-$(CONFIG_FB_OMAP2_CONNECTOR_DVI) += connector-dvi.o
5+
obj-$(CONFIG_FB_OMAP2_CONNECTOR_HDMI) += connector-hdmi.o
6+
obj-$(CONFIG_FB_OMAP2_CONNECTOR_ANALOG_TV) += connector-analog-tv.o
7+
obj-$(CONFIG_FB_OMAP2_PANEL_DPI) += panel-dpi.o
8+
obj-$(CONFIG_FB_OMAP2_PANEL_DSI_CM) += panel-dsi-cm.o
9+
obj-$(CONFIG_FB_OMAP2_PANEL_SONY_ACX565AKM) += panel-sony-acx565akm.o
10+
obj-$(CONFIG_FB_OMAP2_PANEL_LGPHILIPS_LB035Q02) += panel-lgphilips-lb035q02.o
11+
obj-$(CONFIG_FB_OMAP2_PANEL_SHARP_LS037V7DW01) += panel-sharp-ls037v7dw01.o
12+
obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD028TTEC1) += panel-tpo-td028ttec1.o
13+
obj-$(CONFIG_FB_OMAP2_PANEL_TPO_TD043MTEA1) += panel-tpo-td043mtea1.o
14+
obj-$(CONFIG_FB_OMAP2_PANEL_NEC_NL8048HL11) += panel-nec-nl8048hl11.o

0 commit comments

Comments
 (0)