omapfb: Add support for new LCDs / misc fixes
Subsystems (3)
cover omapfb: Add support for new LCDs / misc fixes
Hi Andrew,
I'd like to ask for the merging of this patchset into Linus' tree. It adds support for new LCDs on OMAP based boards (01-12) and fixes generic parts of the omapfb driver (13-20). The changes have been staged in the Linux OMAP tree for quite a long time, and got reviewed on the linux-fbdev-devel list.
Note that this is about the existing "DSS1" FB driver which will eventually be replaced by Tomi Valkeinen's DSS2 FB driver.
Thanks,
Imre
[PATCH 01/20] omapfb: Add support for the Apollon LCD
[PATCH 02/20] omapfb: Add support for MIPI-DCS compatible LCDs [PATCH 03/20] omapfb: Add support for the Amstrad Delta LCD [PATCH 04/20] omapfb: Add support for the 2430SDP LCD
[PATCH 05/20] omapfb: Add support for the OMAP2EVM LCD
[PATCH 06/20] omapfb: Add support for the 3430SDP LCD
[PATCH 07/20] omapfb: Add support for the OMAP3 EVM LCD
[PATCH 08/20] omapfb: Add support for the OMAP3 Beagle DVI output [PATCH 09/20] omapfb: Add support for the Gumstix Overo LCD [PATCH 10/20] omapfb: Add support for the ZOOM MDK LCD
[PATCH 11/20] omapfb: Add support for rotation on the Blizzard LCD ctrl [PATCH 12/20] N770: Enable LCD MIPI-DCS in Kconfig
[PATCH 13/20] omapfb: dispc: Various typo fixes
[PATCH 14/20] omapfb: dispc: Disable iface clocks along with func clocks [PATCH 15/20] omapfb: dispc: Enable wake up capability
[PATCH 16/20] omapfb: dispc: Allow multiple external IRQ handlers [PATCH 17/20] omapfb: suspend/resume only if FB device is already initialized [PATCH 18/20] omapfb: Fix coding style / remove dead line
[PATCH 19/20] omapfb: Add FB manual update option to Kconfig [PATCH 20/20] omapfb: HWA742: fix pointer to be const
PATCH 1/20 omapfb: Add support for the Apollon LCD
From: Kyungmin Park <[email protected]>
--- drivers/video/omap/Makefile | 2 + drivers/video/omap/lcd_apollon.c | 138 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 140 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_apollon.c
drivers/video/omap/Makefile +2 -0
@@ -24,5 +24,7 @@ objs-$(CONFIG_ARCH_OMAP16XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1610.o objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o +objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o + omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_apollon.c new file +138 -0
138 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 2/20 omapfb: Add support for MIPI-DCS compatible LCDs
--- arch/arm/plat-omap/include/mach/lcd_mipid.h | 5 + drivers/video/omap/Kconfig | 8 + drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_mipid.c | 625 +++++++++++++++++++++++++++ 4 files changed, 639 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_mipid.c
arch/arm/plat-omap/include/mach/lcd_mipid.h +5 -0
@@ -16,7 +16,12 @@ enum mipid_test_result {struct mipid_platform_data {int nreset_gpio;int data_lines; +void (*shutdown)(struct mipid_platform_data *pdata); +void (*set_bklight_level)(struct mipid_platform_data *pdata, +int level); +int (*get_bklight_level)(struct mipid_platform_data *pdata); +int (*get_bklight_max)(struct mipid_platform_data *pdata); };#endif
drivers/video/omap/Kconfig +8 -0
@@ -7,6 +7,14 @@ config FB_OMAP help Frame buffer driver for OMAP based boards. +config FB_OMAP_LCD_MIPID + bool "MIPI DBI-C/DCS compatible LCD support" + depends on FB_OMAP && SPI_MASTER + help + Say Y here if you want to have support for LCDs compatible with + the Mobile Industry Processor Interface DBI-C/DCS + specification. (Supported LCDs: Philips LPH8923, Sharp LS041Y3) + config FB_OMAP_BOOTLOADER_INIT bool "Check bootloader initialization" depends on FB_OMAP
drivers/video/omap/Makefile +1 -0
@@ -25,6 +25,7 @@ objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o +objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_mipid.c new file +625 -0
625 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 3/20 omapfb: Add support for the Amstrad Delta LCD
From: Jonathan McDowell <[email protected]>
This is an updated version of the LCD driver for the Amstrad Delta to take into account the recent changes to the omapfb infrastructure. The Delta features a 480x320 12 bit DSTN panel.
--- drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_ams_delta.c | 137 ++++++++++++++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_ams_delta.c
drivers/video/omap/Makefile +1 -0
@@ -15,6 +15,7 @@ objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o objs-y$(CONFIG_FB_OMAP_LCDC_HWA742) += hwa742.o objs-y$(CONFIG_FB_OMAP_LCDC_BLIZZARD) += blizzard.o +objs-y$(CONFIG_MACH_AMS_DELTA) += lcd_ams_delta.o objs-y$(CONFIG_MACH_OMAP_H4) += lcd_h4.o objs-y$(CONFIG_MACH_OMAP_H3) += lcd_h3.o objs-y$(CONFIG_MACH_OMAP_PALMTE) += lcd_palmte.o
drivers/video/omap/lcd_ams_delta.c new file +137 -0
137 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 4/20 omapfb: Add support for the 2430SDP LCD
From: Hunyue Yau <[email protected]>
Add glue to control the 2430SDP LCD as a frame buffer device using the existing dispc.c driver under omapfb.
--- drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_2430sdp.c | 198 ++++++++++++++++++++++++++++++++++++++ 2 files changed, 199 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_2430sdp.c
drivers/video/omap/Makefile +1 -0
@@ -26,6 +26,7 @@ objs-$(CONFIG_ARCH_OMAP15XX)$(CONFIG_MACH_OMAP_INNOVATOR) += lcd_inn1510.o objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o +objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_2430sdp.c new file +198 -0
198 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 5/20 omapfb: Add support for the OMAP2EVM LCD
From: arun c <[email protected]>
omap2evm LCD supports VGA and QVGA resolution, by default its in VGA mode.
--- drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_omap2evm.c | 191 +++++++++++++++++++++++++++++++++++++ 2 files changed, 192 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_omap2evm.c
drivers/video/omap/Makefile +1 -0
@@ -27,6 +27,7 @@ objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o +objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_omap2evm.c new file +191 -0
191 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 6/20 omapfb: Add support for the 3430SDP LCD
From: Kevin Hilman <[email protected]>
The 3430SDP uses the same panel as the 2430SDP. The main difference are in the GPIO lines used for panel enable and backlight, and the VAUX register/commands sent to the TWL4030 power subsystem.
Also, some misc. whitespace cleanups.
--- arch/arm/configs/omap_3430sdp_defconfig | 39 +++++++++++++++++++++++++++++- drivers/video/omap/Makefile | 2 + drivers/video/omap/lcd_2430sdp.c | 12 ++++++--- 3 files changed, 47 insertions(+), 6 deletions(-)
arch/arm/configs/omap_3430sdp_defconfig +37 -2
@@ -1313,8 +1313,33 @@ CONFIG_DVB_ISL6421=m # Graphics support # # CONFIG_VGASTATE is not set -# CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set #
@@ -1331,6 +1356,16 @@ CONFIG_DISPLAY_SUPPORT=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y CONFIG_SOUND=y CONFIG_SOUND_OSS_CORE=y CONFIG_SND=y
drivers/video/omap/Makefile +2 -0
@@ -8,6 +8,7 @@ objs-yy := omapfb_main.o objs-y$(CONFIG_ARCH_OMAP1) += lcdc.o objs-y$(CONFIG_ARCH_OMAP2) += dispc.o +objs-y$(CONFIG_ARCH_OMAP3) += dispc.o objs-$(CONFIG_ARCH_OMAP1)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += sossi.o objs-$(CONFIG_ARCH_OMAP2)$(CONFIG_FB_OMAP_LCDC_EXTERNAL) += rfbi.o
@@ -27,6 +28,7 @@ objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o +objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o
drivers/video/omap/lcd_2430sdp.c +8 -4
@@ -39,13 +39,17 @@static unsigned backlight_gpio;static unsigned enable_gpio; -#define LCD_PANEL_BACKLIGHT_GPIO 91 -#define LCD_PANEL_ENABLE_GPIO 154#define LCD_PIXCLOCK_MAX 5400/* freq 5.4 MHz */ #define PM_RECEIVER TWL4030_MODULE_PM_RECEIVER#define ENABLE_VAUX2_DEDICATED 0x09#define ENABLE_VAUX2_DEV_GRP 0x20 +#define ENABLE_VAUX3_DEDICATED 0x03 +#define ENABLE_VAUX3_DEV_GRP 0x20 +#define ENABLE_VPLL2_DEDICATED 0x05 +#define ENABLE_VPLL2_DEV_GRP 0xE0 +#define TWL4030_VPLL2_DEV_GRP 0x33 +#define TWL4030_VPLL2_DEDICATED 0x36#define t2_out (c, r, v) twl4030_i2c_write_u8(c, r, v)
@@ -146,7 +150,7 @@ struct lcd_panel sdp2430_panel = { .init = sdp2430_panel_init, .cleanup = sdp2430_panel_cleanup, - .enable = sdp2430_panel_enable, + .enable = sdp2430_panel_enable, .disable = sdp2430_panel_disable, .get_caps = sdp2430_panel_get_caps, };
@@ -176,7 +180,7 @@ static int sdp2430_panel_resume(struct platform_device *pdev)struct platform_driver sdp2430_panel_driver = { .probe = sdp2430_panel_probe, .remove = sdp2430_panel_remove, - .suspend = sdp2430_panel_suspend, + .suspend = sdp2430_panel_suspend, .resume = sdp2430_panel_resume, .driver = { .name ="sdp2430_lcd" ,
Signature · 1 line
1.6.3.2
PATCH 7/20 omapfb: Add support for the OMAP3 EVM LCD
From: Steve Sakoman <[email protected]>
Add LCD support for OMAP3 EVM
Backlight support by Arun C <[email protected]>
--- drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_omap3evm.c | 192 +++++++++++++++++++++++++++++++++++++ 2 files changed, 193 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_omap3evm.c
drivers/video/omap/Makefile +1 -0
@@ -30,6 +30,7 @@ objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o +objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_omap3evm.c new file +192 -0
192 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 8/20 omapfb: Add support for the OMAP3 Beagle DVI output
From: Koen Kooi <[email protected]>
The default resolution is 1024x768@24bit
This version addresses the comments from Felipe Balbi adn Arun Edarath
--- arch/arm/configs/omap3_beagle_defconfig | 47 +++++++++++- drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_omap3beagle.c | 130 +++++++++++++++++++++++++++++++ 3 files changed, 177 insertions(+), 1 deletions(-) create mode 100644 drivers/video/omap/lcd_omap3beagle.c
arch/arm/configs/omap3_beagle_defconfig +46 -1
@@ -769,7 +769,33 @@ CONFIG_DAB=y # # CONFIG_VGASTATE is not set # CONFIG_VIDEO_OUTPUT_CONTROL is not set -# CONFIG_FB is not set +CONFIG_FB=y +# CONFIG_FIRMWARE_EDID is not set +# CONFIG_FB_DDC is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +# CONFIG_FB_MODE_HELPERS is not set +# CONFIG_FB_TILEBLITTING is not set + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +CONFIG_FB_OMAP=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 # CONFIG_BACKLIGHT_LCD_SUPPORT is not set #
@@ -782,6 +808,25 @@ CONFIG_DAB=y # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +CONFIG_FRAMEBUFFER_CONSOLE_ROTATION=y +CONFIG_FONTS=y +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +# CONFIG_FONT_6x11 is not set +# CONFIG_FONT_7x14 is not set +# CONFIG_FONT_PEARL_8x8 is not set +# CONFIG_FONT_ACORN_8x8 is not set +# CONFIG_FONT_MINI_4x6 is not set +# CONFIG_FONT_SUN8x16 is not set +# CONFIG_FONT_SUN12x22 is not set +# CONFIG_FONT_10x18 is not set +# CONFIG_LOGO is not set + +# +# Sound +# # CONFIG_SOUND is not set # CONFIG_HID_SUPPORT is not set CONFIG_USB_SUPPORT=y
drivers/video/omap/Makefile +1 -0
@@ -31,6 +31,7 @@ objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o +objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_omap3beagle.c new file +130 -0
130 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 9/20 omapfb: Add support for the Gumstix Overo LCD
From: Steve Sakoman <[email protected]>
--- drivers/video/omap/Kconfig | 21 +++++ drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_overo.c | 179 ++++++++++++++++++++++++++++++++++++++++ 3 files changed, 201 insertions(+), 0 deletions(-) create mode 100644 drivers/video/omap/lcd_overo.c
drivers/video/omap/Kconfig +21 -0
@@ -7,6 +7,27 @@ config FB_OMAP help Frame buffer driver for OMAP based boards. +choice + depends on FB_OMAP && MACH_OVERO + prompt "Screen resolution" + default FB_OMAP_079M3R + help + Selected desired screen resolution + +config FB_OMAP_031M3R + boolean "640 x 480 @ 60 Hz Reduced blanking" + +config FB_OMAP_048M3R + boolean "800 x 600 @ 60 Hz Reduced blanking" + +config FB_OMAP_079M3R + boolean "1024 x 768 @ 60 Hz Reduced blanking" + +config FB_OMAP_092M9R + boolean "1280 x 720 @ 60 Hz Reduced blanking" + +endchoice + config FB_OMAP_LCD_MIPID bool "MIPI DBI-C/DCS compatible LCD support" depends on FB_OMAP && SPI_MASTER
drivers/video/omap/Makefile +1 -0
@@ -33,6 +33,7 @@ objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o objs-y$(CONFIG_FB_OMAP_LCD_MIPID) += lcd_mipid.o +objs-y$(CONFIG_MACH_OVERO) += lcd_overo.o omapfb-objs := $(objs-yy)
drivers/video/omap/lcd_overo.c new file +179 -0
179 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 10/20 omapfb: Add support for the ZOOM MDK LCD
From: Stanley.Miao <[email protected]>
Add glue to control the OMAP_LDP LCD as a frame buffer device using the existing dispc.c driver under omapfb.
Patch updated for mainline kernel. Note that the drivers/video/omap should be updated to pass omap_lcd_config in platform_data. The patch should also be updated to compile if twl4030 is not selected, and eventually to use the regulator framework.
--- arch/arm/configs/omap_ldp_defconfig | 54 +++++++++- drivers/video/omap/Kconfig | 4 + drivers/video/omap/Makefile | 1 + drivers/video/omap/lcd_ldp.c | 200 +++++++++++++++++++++++++++++++++++ 4 files changed, 257 insertions(+), 2 deletions(-) create mode 100644 drivers/video/omap/lcd_ldp.c
arch/arm/configs/omap_ldp_defconfig +52 -2
@@ -690,6 +690,7 @@ CONFIG_GPIOLIB=y # CONFIG_GPIO_MAX732X is not set # CONFIG_GPIO_PCA953X is not set # CONFIG_GPIO_PCF857X is not set +CONFIG_GPIO_TWL4030=y # # PCI GPIO expanders:
@@ -742,6 +743,7 @@ CONFIG_SSB_POSSIBLE=y # CONFIG_MFD_SM501 is not set # CONFIG_HTC_EGPIO is not set # CONFIG_HTC_PASIC3 is not set +CONFIG_TWL4030_CORE=y # CONFIG_MFD_TMIO is not set # CONFIG_MFD_T7L66XB is not set # CONFIG_MFD_TC6387XB is not set
@@ -767,8 +769,46 @@ CONFIG_DAB=y # # CONFIG_VGASTATE is not set CONFIG_VIDEO_OUTPUT_CONTROL=m -# CONFIG_FB is not set -# CONFIG_BACKLIGHT_LCD_SUPPORT is not set +CONFIG_FB=y +CONFIG_FIRMWARE_EDID=y +# CONFIG_FB_DDC is not set +# CONFIG_FB_BOOT_VESA_SUPPORT is not set +CONFIG_FB_CFB_FILLRECT=y +CONFIG_FB_CFB_COPYAREA=y +CONFIG_FB_CFB_IMAGEBLIT=y +# CONFIG_FB_CFB_REV_PIXELS_IN_BYTE is not set +# CONFIG_FB_SYS_FILLRECT is not set +# CONFIG_FB_SYS_COPYAREA is not set +# CONFIG_FB_SYS_IMAGEBLIT is not set +# CONFIG_FB_FOREIGN_ENDIAN is not set +# CONFIG_FB_SYS_FOPS is not set +# CONFIG_FB_SVGALIB is not set +# CONFIG_FB_MACMODES is not set +# CONFIG_FB_BACKLIGHT is not set +CONFIG_FB_MODE_HELPERS=y +CONFIG_FB_TILEBLITTING=y + +# +# Frame buffer hardware drivers +# +# CONFIG_FB_S1D13XXX is not set +# CONFIG_FB_VIRTUAL is not set +# CONFIG_FB_METRONOME is not set +CONFIG_FB_OMAP=y +CONFIG_FB_OMAP_LCD_VGA=y +# CONFIG_FB_OMAP_LCDC_EXTERNAL is not set +# CONFIG_FB_OMAP_BOOTLOADER_INIT is not set +CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=4 +CONFIG_BACKLIGHT_LCD_SUPPORT=y +CONFIG_LCD_CLASS_DEVICE=y +# CONFIG_LCD_LTV350QV is not set +# CONFIG_LCD_ILI9320 is not set +# CONFIG_LCD_TDO24M is not set +# CONFIG_LCD_VGG2432A4 is not set +CONFIG_LCD_PLATFORM=y +CONFIG_BACKLIGHT_CLASS_DEVICE=y +# CONFIG_BACKLIGHT_CORGI is not set +# CONFIG_BACKLIGHT_GENERIC is not set # # Display device support
@@ -780,6 +820,16 @@ CONFIG_VIDEO_OUTPUT_CONTROL=m # # CONFIG_VGA_CONSOLE is not set CONFIG_DUMMY_CONSOLE=y +CONFIG_FRAMEBUFFER_CONSOLE=y +# CONFIG_FRAMEBUFFER_CONSOLE_DETECT_PRIMARY is not set +# CONFIG_FRAMEBUFFER_CONSOLE_ROTATION is not set +# CONFIG_FONTS is not set +CONFIG_FONT_8x8=y +CONFIG_FONT_8x16=y +CONFIG_LOGO=y +CONFIG_LOGO_LINUX_MONO=y +CONFIG_LOGO_LINUX_VGA16=y +CONFIG_LOGO_LINUX_CLUT224=y CONFIG_SOUND=y CONFIG_SND=y # CONFIG_SND_SEQUENCER is not set
drivers/video/omap/Kconfig +4 -0
@@ -7,6 +7,10 @@ config FB_OMAP help Frame buffer driver for OMAP based boards. +config FB_OMAP_LCD_VGA + bool "Use LCD in VGA mode" + depends on MACH_OMAP_3430SDP || MACH_OMAP_LDP + choice depends on FB_OMAP && MACH_OVERO prompt "Screen resolution"
drivers/video/omap/Makefile +1 -0
@@ -29,6 +29,7 @@ objs-y$(CONFIG_MACH_OMAP_OSK) += lcd_osk.o objs-y$(CONFIG_MACH_OMAP_APOLLON) += lcd_apollon.o objs-y$(CONFIG_MACH_OMAP_2430SDP) += lcd_2430sdp.o objs-y$(CONFIG_MACH_OMAP_3430SDP) += lcd_2430sdp.o +objs-y$(CONFIG_MACH_OMAP_LDP) += lcd_ldp.o objs-y$(CONFIG_MACH_OMAP2EVM) += lcd_omap2evm.o objs-y$(CONFIG_MACH_OMAP3EVM) += lcd_omap3evm.o objs-y$(CONFIG_MACH_OMAP3_BEAGLE) += lcd_omap3beagle.o
drivers/video/omap/lcd_ldp.c new file +200 -0
200 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 11/20 omapfb: Add support for rotation on the Blizzard LCD ctrl
From: Rodrigo Vivi <[email protected]>
The LCD controller (EPSON S1D13744) supports rotation (0, 90, 180 and 270 degrees) on hardware just setting the bits 0 and 1 of 0x28 register (LCD Panel Configuration Register). Now it is possible to use this caps only setting the angle degree on var rotate of fb_var_screeninfo using the FBIOPUT_VSCREENINFO ioctl.
--- drivers/video/omap/blizzard.c | 91 +++++++++++++++++++++++++++++++++++-- drivers/video/omap/omapfb_main.c | 52 ++++++++++++++++------ 2 files changed, 124 insertions(+), 19 deletions(-)
drivers/video/omap/blizzard.c +86 -5
@@ -44,6 +44,7 @@#define BLIZZARD_CLK_SRC 0x0e#define BLIZZARD_MEM_BANK0_ACTIVATE 0x10#define BLIZZARD_MEM_BANK0_STATUS 0x14 +#define BLIZZARD_PANEL_CONFIGURATION 0x28#define BLIZZARD_HDISP 0x2a#define BLIZZARD_HNDP 0x2c#define BLIZZARD_VDISP0 0x2e
@@ -162,6 +163,10 @@ struct blizzard_struct {int vid_scaled;int last_color_mode;int zoom_on; +int zoom_area_gx1; +int zoom_area_gx2; +int zoom_area_gy1; +int zoom_area_gy2;int screen_width;int screen_height; unsigned te_connected:1;
@@ -513,6 +518,13 @@ static int do_full_screen_update(struct blizzard_request *req)return REQ_PENDING ; } +static int check_1d_intersect (int a1,int a2,int b1,int b2) +{ +if (a2 <= b1 || b2 <= a1) +return 0 ; +return 1 ; +} +/* Setup all planes with an overlapping area with the update window. */ static int do_partial_update(struct blizzard_request *req, int plane, int x, int y, int w, int h,
@@ -525,6 +537,7 @@ static int do_partial_update(struct blizzard_request *req, int plane,int color_mode;int flags;int zoom_off; +int have_zoom_for_this_update =0 ;/* Global coordinates, relative to pixel 0,0 of the LCD */ gx1 = x + blizzard.plane[plane].pos_x;
@@ -544,10 +557,6 @@ static int do_partial_update(struct blizzard_request *req, int plane, gx2_out = gx1_out + w_out; gy2_out = gy1_out + h_out; } - zoom_off = blizzard.zoom_on && gx1 ==0 && gy1 ==0 && - w == blizzard.screen_width && h == blizzard.screen_height; - blizzard.zoom_on = (!zoom_off && blizzard.zoom_on) || - (w < w_out || h < h_out);for (i =0 ; i <OMAPFB_PLANE_NUM ; i++) {struct plane_info *p = &blizzard.plane[i];
@@ -653,8 +662,49 @@ static int do_partial_update(struct blizzard_request *req, int plane,else disable_tearsync (); +if ((gx2_out - gx1_out) != (gx2 - gx1) || + (gy2_out - gy1_out) != (gy2 - gy1)) + have_zoom_for_this_update =1 ; + +/* 'background' type of screen update (as opposed to 'destructive') +can be used to disable scaling if scaling is active */ + zoom_off = blizzard.zoom_on && !have_zoom_for_this_update && + (gx1_out ==0 ) && (gx2_out == blizzard.screen_width) && + (gy1_out ==0 ) && (gy2_out == blizzard.screen_height) && + (gx1 ==0 ) && (gy1 ==0 ); + +if (blizzard.zoom_on && !have_zoom_for_this_update && !zoom_off && +check_1d_intersect (blizzard.zoom_area_gx1, blizzard.zoom_area_gx2, + gx1_out, gx2_out) && +check_1d_intersect (blizzard.zoom_area_gy1, blizzard.zoom_area_gy2, + gy1_out, gy2_out)) { +/* Previous screen update was using scaling, current update +* is not using it. Additionally, current screen update is +* going to overlap with the scaled area. Scaling needs to be +* disabled in order to avoid 'magnifying glass' effect. +* Dummy setup of background window can be used for this. +*/ +set_window_regs (0 ,0 , blizzard.screen_width, + blizzard.screen_height, +0 ,0 , blizzard.screen_width, + blizzard.screen_height, +BLIZZARD_COLOR_RGB565 ,1 , flags); + blizzard.zoom_on =0 ; + } + +/* remember scaling settings if we have scaled update */ +if (have_zoom_for_this_update) { + blizzard.zoom_on =1 ; + blizzard.zoom_area_gx1 = gx1_out; + blizzard.zoom_area_gx2 = gx2_out; + blizzard.zoom_area_gy1 = gy1_out; + blizzard.zoom_area_gy2 = gy2_out; + } +set_window_regs (gx1, gy1, gx2, gy2, gx1_out, gy1_out, gx2_out, gy2_out, color_mode, zoom_off, flags); +if (zoom_off) + blizzard.zoom_on =0 ; blizzard.extif->set_bits_per_cycle (16 );/* set_window_regs has left the register index at the right
@@ -908,6 +958,35 @@ static int blizzard_set_scale(int plane, int orig_w, int orig_h,return 0 ; } +static int blizzard_set_rotate (int angle) +{ +u32 l; + + l =blizzard_read_reg (BLIZZARD_PANEL_CONFIGURATION ); + l &= ~0x03 ; + +switch (angle) { +case 0 : + l = l |0x00 ; +break ; +case 90 : + l = l |0x03 ; +break ; +case 180 : + l = l |0x02 ; +break ; +case 270 : + l = l |0x01 ; +break ; +default : +return -EINVAL ; + } + +blizzard_write_reg (BLIZZARD_PANEL_CONFIGURATION , l); + +return 0 ; +} +static int blizzard_enable_plane (int plane,int enable) {if (enable)
@@ -1285,7 +1364,8 @@ static void blizzard_get_caps(int plane, struct omapfb_caps *caps) caps->ctrl |=OMAPFB_CAPS_MANUAL_UPDATE |OMAPFB_CAPS_WINDOW_PIXEL_DOUBLE |OMAPFB_CAPS_WINDOW_SCALE | -OMAPFB_CAPS_WINDOW_OVERLAY ; +OMAPFB_CAPS_WINDOW_OVERLAY | +OMAPFB_CAPS_WINDOW_ROTATE ;if (blizzard.te_connected) caps->ctrl |=OMAPFB_CAPS_TEARSYNC ; caps->wnd_color |= (1 << OMAPFB_COLOR_RGB565) |
@@ -1560,6 +1640,7 @@ struct lcd_ctrl blizzard_ctrl = { .setup_plane = blizzard_setup_plane, .set_scale = blizzard_set_scale, .enable_plane = blizzard_enable_plane, + .set_rotate = blizzard_set_rotate, .update_window = blizzard_update_window_async, .sync = blizzard_sync, .suspend = blizzard_suspend,
drivers/video/omap/omapfb_main.c +38 -14
85 lines not on this page · raw message
Signature · 1 line
1.6.3.2
PATCH 12/20 N770: Enable LCD MIPI-DCS in Kconfig
--- arch/arm/configs/n770_defconfig | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
arch/arm/configs/n770_defconfig +1 -1
@@ -875,7 +875,7 @@ CONFIG_FB_OMAP_LCDC_EXTERNAL=y CONFIG_FB_OMAP_LCDC_HWA742=y # CONFIG_FB_OMAP_LCDC_BLIZZARD is not set CONFIG_FB_OMAP_MANUAL_UPDATE=y -# CONFIG_FB_OMAP_LCD_MIPID is not set +CONFIG_FB_OMAP_LCD_MIPID=y # CONFIG_FB_OMAP_BOOTLOADER_INIT is not set CONFIG_FB_OMAP_CONSISTENT_DMA_SIZE=2 # CONFIG_FB_OMAP_DMA_TUNE is not set
Signature · 1 line
1.6.3.2
PATCH 13/20 omapfb: dispc: Various typo fixes
- value and register offset was swapped in a dispc write
- DISPC_CONTROL register was used instead of DISPC_SYSCONFIG
- FIFO size bit field had incorrect length for OMAP3
--- drivers/video/omap/dispc.c | 8 ++++---- 1 files changed, 4 insertions(+), 4 deletions(-)
drivers/video/omap/dispc.c +4 -4
@@ -286,7 +286,7 @@ static void setup_plane_fifo(int plane, int ext_mode)BUG_ON (plane >2 ); l =dispc_read_reg (fsz_reg[plane]); - l &=FLD_MASK (0 ,9 ); + l &=FLD_MASK (0 ,11 );if (ext_mode) { low = l *3 /4 ; high = l;
@@ -294,7 +294,7 @@ static void setup_plane_fifo(int plane, int ext_mode) low = l /4 ; high = l *3 /4 ; } -MOD_REG_FLD (ftrs_reg[plane],FLD_MASK (16 ,9 ) |FLD_MASK (0 ,9 ), +MOD_REG_FLD (ftrs_reg[plane],FLD_MASK (16 ,12 ) |FLD_MASK (0 ,12 ), (high <<16 ) | low); }
@@ -1397,7 +1397,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, }/* Enable smart idle and autoidle */ - l =dispc_read_reg (DISPC_CONTROL ); + l =dispc_read_reg (DISPC_SYSCONFIG ); l &= ~((3 <<12 ) | (3 <<3 )); l |= (2 <<12 ) | (2 <<3 ) | (1 <<0 );dispc_write_reg (DISPC_SYSCONFIG , l);
@@ -1409,7 +1409,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,dispc_write_reg (DISPC_CONFIG , l); l =dispc_read_reg (DISPC_IRQSTATUS ); -dispc_write_reg (l,DISPC_IRQSTATUS ); +dispc_write_reg (DISPC_IRQSTATUS , l);/* Enable those that we handle always */ omap_dispc_enable_irqs (DISPC_IRQ_FRAMEMASK );
Signature · 1 line
1.6.3.2
PATCH 14/20 omapfb: dispc: Disable iface clocks along with func clocks
From: Jouni Hogander <[email protected]>
Leaving interface clocks enabled causes dss pwrdm to stay in active state when mpu is in active state. This fix puts dss to sleep state when it is not needed.
Earlier version broke framebuffer on 24xx. This is fixed by enabling clocks before trying to access DISPC_IRQSTATUS register.
--- drivers/video/omap/dispc.c | 23 ++++++++++------------- 1 files changed, 10 insertions(+), 13 deletions(-)
drivers/video/omap/dispc.c +10 -13
@@ -858,8 +858,11 @@ EXPORT_SYMBOL(omap_dispc_free_irq);static irqreturn_t omap_dispc_irq_handler (int irq,void *dev) { -u32 stat =dispc_read_reg (DISPC_IRQSTATUS ); +u32 stat; +enable_lcd_clocks (1 ); + + stat =dispc_read_reg (DISPC_IRQSTATUS );if (stat &DISPC_IRQ_FRAMEMASK )complete (&dispc.frame_done);
@@ -875,6 +878,8 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev)dispc_write_reg (DISPC_IRQSTATUS , stat); +enable_lcd_clocks (0 ); +return IRQ_HANDLED ; }
@@ -913,18 +918,13 @@ static void put_dss_clocks(void)static void enable_lcd_clocks (int enable) { -if (enable) +if (enable) { +clk_enable (dispc.dss_ick);clk_enable (dispc.dss1_fck); -else + }else {clk_disable (dispc.dss1_fck); -} - -static void enable_interface_clocks (int enable) -{ -if (enable) -clk_enable (dispc.dss_ick); -else clk_disable (dispc.dss_ick); + } }static void enable_digit_clocks (int enable)
@@ -1365,7 +1365,6 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,if ((r =get_dss_clocks ()) <0 ) goto fail0; -enable_interface_clocks (1 );enable_lcd_clocks (1 );#ifdef CONFIG_FB_OMAP_BOOTLOADER_INIT
@@ -1469,7 +1468,6 @@ fail2:free_irq (INT_24XX_DSS_IRQ , fbdev); fail1:enable_lcd_clocks (0 ); -enable_interface_clocks (0 );put_dss_clocks (); fail0:iounmap (dispc.base);
@@ -1487,7 +1485,6 @@ static void omap_dispc_cleanup(void)cleanup_fbmem ();free_palette_ram ();free_irq (INT_24XX_DSS_IRQ , dispc.fbdev); -enable_interface_clocks (0 );put_dss_clocks ();iounmap (dispc.base); }
Signature · 1 line
1.6.3.2
PATCH 15/20 omapfb: dispc: Enable wake up capability
From: Jouni Hogander <[email protected]>
Without wakeup enable omap doesn't wake up on dispc interrupts. This causes problems in a case where mpu is in sleep state and dispc interrupt fires.
--- drivers/video/omap/dispc.c | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-)
drivers/video/omap/dispc.c +2 -2
@@ -1395,10 +1395,10 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode,enable_digit_clocks (0 ); } -/* Enable smart idle and autoidle */ +/* Enable smart standby/idle, autoidle and wakeup */ l =dispc_read_reg (DISPC_SYSCONFIG ); l &= ~((3 <<12 ) | (3 <<3 )); - l |= (2 <<12 ) | (2 <<3 ) | (1 <<0 ); + l |= (2 <<12 ) | (2 <<3 ) | (1 <<2 ) | (1 <<0 );dispc_write_reg (DISPC_SYSCONFIG , l);omap_writel (1 <<0 ,DSS_BASE +DSS_SYSCONFIG );
Signature · 1 line
1.6.3.2
PATCH 16/20 omapfb: dispc: Allow multiple external IRQ handlers
From: Daniel Stone <[email protected]>
Previously, the only external (to dispc.c) IRQ handler was RFBI's frame done handler. dispc's IRQ framework was very dumb: you could only have one handler, and the semantics of {request,free}_irq were odd, to say the least.
The new framework allows multiple consumers to register arbitrary IRQ masks.
--- drivers/video/omap/dispc.c | 95 +++++++++++++++++++++++++++----------------- drivers/video/omap/dispc.h | 7 ++- drivers/video/omap/rfbi.c | 7 ++- 3 files changed, 67 insertions(+), 42 deletions(-)
drivers/video/omap/dispc.c +58 -37
@@ -155,6 +155,8 @@ struct resmap {unsigned long *map; }; +#define MAX_IRQ_HANDLERS 4 + static struct { void __iomem *base;
@@ -167,9 +169,11 @@ static struct {int ext_mode; -unsigned long enabled_irqs; -void (*irq_callback)(void *); -void *irq_callback_data; +struct { +u32 irq_mask; +void (*callback)(void *); +void *data; + } irq_handlers[MAX_IRQ_HANDLERS ];struct completion frame_done;int fir_hinc[OMAPFB_PLANE_NUM ];
@@ -809,56 +813,70 @@ static void set_lcd_timings(void) panel->pixel_clock = fck / lck_div / pck_div /1000 ; } -int omap_dispc_request_irq (void (*callback)(void *data),void *data) +static void recalc_irq_mask (void ) { -int r =0 ; +int i; +unsigned long irq_mask =DISPC_IRQ_MASK_ERROR ; -BUG_ON (callback ==NULL ); +for (i =0 ; i <MAX_IRQ_HANDLERS ; i++) { +if (!dispc.irq_handlers[i].callback) +continue ; -if (dispc.irq_callback) - r = -EBUSY ; -else { - dispc.irq_callback = callback; - dispc.irq_callback_data = data; + irq_mask |= dispc.irq_handlers[i].irq_mask; } -return r; -} -EXPORT_SYMBOL (omap_dispc_request_irq); - -void omap_dispc_enable_irqs (int irq_mask) -{enable_lcd_clocks (1 ); - dispc.enabled_irqs = irq_mask; - irq_mask |=DISPC_IRQ_MASK_ERROR ;MOD_REG_FLD (DISPC_IRQENABLE ,0x7fff , irq_mask);enable_lcd_clocks (0 ); } -EXPORT_SYMBOL (omap_dispc_enable_irqs); -void omap_dispc_disable_irqs (int irq_mask) +int omap_dispc_request_irq (unsigned long irq_mask,void (*callback)(void *data), +void *data) { -enable_lcd_clocks (1 ); - dispc.enabled_irqs &= ~irq_mask; - irq_mask &= ~DISPC_IRQ_MASK_ERROR ; -MOD_REG_FLD (DISPC_IRQENABLE ,0x7fff , irq_mask); -enable_lcd_clocks (0 ); +int i; + +BUG_ON (callback ==NULL ); + +for (i =0 ; i <MAX_IRQ_HANDLERS ; i++) { +if (dispc.irq_handlers[i].callback) +continue ; + + dispc.irq_handlers[i].irq_mask = irq_mask; + dispc.irq_handlers[i].callback = callback; + dispc.irq_handlers[i].data = data; +recalc_irq_mask (); + +return 0 ; + } + +return -EBUSY ; } -EXPORT_SYMBOL (omap_dispc_disable_irqs); +EXPORT_SYMBOL (omap_dispc_request_irq); -void omap_dispc_free_irq (void ) +void omap_dispc_free_irq (unsigned long irq_mask,void (*callback)(void *data), +void *data) { -enable_lcd_clocks (1 ); -omap_dispc_disable_irqs (DISPC_IRQ_MASK_ALL ); - dispc.irq_callback =NULL ; - dispc.irq_callback_data =NULL ; -enable_lcd_clocks (0 ); +int i; + +for (i =0 ; i <MAX_IRQ_HANDLERS ; i++) { +if (dispc.irq_handlers[i].callback == callback && + dispc.irq_handlers[i].data == data) { + dispc.irq_handlers[i].irq_mask =0 ; + dispc.irq_handlers[i].callback =NULL ; + dispc.irq_handlers[i].data =NULL ; +recalc_irq_mask (); +return ; + } + } + +BUG (); }EXPORT_SYMBOL (omap_dispc_free_irq);static irqreturn_t omap_dispc_irq_handler (int irq,void *dev) {u32 stat; +int i =0 ;enable_lcd_clocks (1 );
@@ -873,8 +891,12 @@ static irqreturn_t omap_dispc_irq_handler(int irq, void *dev) } } -if ((stat & dispc.enabled_irqs) && dispc.irq_callback) - dispc.irq_callback (dispc.irq_callback_data); +for (i =0 ; i <MAX_IRQ_HANDLERS ; i++) { +if (unlikely (dispc.irq_handlers[i].callback && + (stat & dispc.irq_handlers[i].irq_mask))) + dispc.irq_handlers[i].callback ( + dispc.irq_handlers[i].data); + }dispc_write_reg (DISPC_IRQSTATUS , stat);
@@ -1410,8 +1432,7 @@ static int omap_dispc_init(struct omapfb_device *fbdev, int ext_mode, l =dispc_read_reg (DISPC_IRQSTATUS );dispc_write_reg (DISPC_IRQSTATUS , l); -/* Enable those that we handle always */ -omap_dispc_enable_irqs (DISPC_IRQ_FRAMEMASK ); +recalc_irq_mask ();if ((r =request_irq (INT_24XX_DSS_IRQ , omap_dispc_irq_handler,0 ,MODULE_NAME , fbdev)) <0 ) {
drivers/video/omap/dispc.h +4 -3
@@ -37,9 +37,10 @@ extern void omap_dispc_set_lcd_size(int width, int height);extern void omap_dispc_enable_lcd_out (int enable);extern void omap_dispc_enable_digit_out (int enable); -extern int omap_dispc_request_irq (void (*callback)(void *data),void *data); -extern void omap_dispc_free_irq (void ); +extern int omap_dispc_request_irq (unsigned long irq_mask, +void (*callback)(void *data),void *data); +extern void omap_dispc_free_irq (unsigned long irq_mask, +void (*callback)(void *data),void *data);extern const struct lcd_ctrl omap2_int_ctrl; -#endif
drivers/video/omap/rfbi.c +5 -2
@@ -57,6 +57,7 @@#define DISPC_BASE 0x48050400#define DISPC_CONTROL 0x0040 +#define DISPC_IRQ_FRAMEMASK 0x0001 static struct { void __iomem *base;
@@ -553,7 +554,9 @@ static int rfbi_init(struct omapfb_device *fbdev) l = (0x01 <<2 );rfbi_write_reg (RFBI_CONTROL , l); -if ((r =omap_dispc_request_irq (rfbi_dma_callback,NULL )) <0 ) { + r =omap_dispc_request_irq (DISPC_IRQ_FRAMEMASK , rfbi_dma_callback, +NULL ); +if (r <0 ) {dev_err (fbdev->dev,"can't get DISPC irq\n" );rfbi_enable_clocks (0 );return r;
@@ -570,7 +573,7 @@ static int rfbi_init(struct omapfb_device *fbdev)static void rfbi_cleanup (void ) { -omap_dispc_free_irq (); +omap_dispc_free_irq (DISPC_IRQ_FRAMEMASK , rfbi_dma_callback,NULL );rfbi_put_clocks ();iounmap (rfbi.base); }
Signature · 1 line
1.6.3.2
PATCH 17/20 omapfb: suspend/resume only if FB device is already initialized
From: Jouni Högander <[email protected]>
Check wether fbdev is NULL in suspend / resume functions. Fbdev is NULL, if there is no lcd or it is not enabled in configuration.
--- drivers/video/omap/omapfb_main.c | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-)
drivers/video/omap/omapfb_main.c +4 -3
@@ -1842,8 +1842,8 @@ static int omapfb_suspend(struct platform_device *pdev, pm_message_t mesg) {struct omapfb_device *fbdev =platform_get_drvdata (pdev); -omapfb_blank (FB_BLANK_POWERDOWN , fbdev->fb_info[0 ]); - +if (fbdev !=NULL ) +omapfb_blank (FB_BLANK_POWERDOWN , fbdev->fb_info[0 ]);return 0 ; }
@@ -1852,7 +1852,8 @@ static int omapfb_resume(struct platform_device *pdev) {struct omapfb_device *fbdev =platform_get_drvdata (pdev); -omapfb_blank (FB_BLANK_UNBLANK , fbdev->fb_info[0 ]); +if (fbdev !=NULL ) +omapfb_blank (FB_BLANK_UNBLANK , fbdev->fb_info[0 ]);return 0 ; }
Signature · 1 line
1.6.3.2
PATCH 18/20 omapfb: Fix coding style / remove dead line
From: arun c <[email protected]>
- use __iomem type attribute where appropriate
- expand (a ? : b) to (a ? a : b)
As suggested by Russel King <[email protected]>
- remove a dead line from omapfb_main.c
--- arch/arm/plat-omap/include/mach/omapfb.h | 4 ++-- drivers/video/omap/omapfb_main.c | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-)
arch/arm/plat-omap/include/mach/omapfb.h +2 -2
@@ -276,8 +276,8 @@ typedef int (*omapfb_notifier_callback_t)(struct notifier_block *, void *fbi);struct omapfb_mem_region { -dma_addr_t paddr; -void *vaddr; +u32 paddr; +void __iomem *vaddr;unsigned long size;u8 type;/* OMAPFB_PLANE_MEM_* */ unsigned alloc:1 ;/* allocated by the driver */
drivers/video/omap/omapfb_main.c +2 -3
@@ -562,7 +562,6 @@ static int set_fb_var(struct fb_info *fbi, var->xoffset = var->xres_virtual - var->xres;if (var->yres + var->yoffset > var->yres_virtual) var->yoffset = var->yres_virtual - var->yres; - line_size = var->xres * bpp /8 ;if (plane->color_mode ==OMAPFB_COLOR_RGB444 ) { var->red.offset =8 ; var->red.length =4 ;
@@ -1719,8 +1718,8 @@ static int omapfb_do_probe(struct platform_device *pdev,pr_info ("omapfb: configured for panel %s\n" , fbdev->panel->name); - def_vxres = def_vxres ? : fbdev->panel->x_res; - def_vyres = def_vyres ? : fbdev->panel->y_res; + def_vxres = def_vxres ? def_vxres : fbdev->panel->x_res; + def_vyres = def_vyres ? def_vyres : fbdev->panel->y_res; init_state++;
Signature · 1 line
1.6.3.2
PATCH 19/20 omapfb: Add FB manual update option to Kconfig
Also move the controller specific options up in the menu, to a more logical spot.
--- drivers/video/omap/Kconfig | 49 ++++++++++++++++++++++++++----------------- 1 files changed, 30 insertions(+), 19 deletions(-)
drivers/video/omap/Kconfig +30 -19
@@ -32,6 +32,36 @@ config FB_OMAP_092M9R endchoice +config FB_OMAP_LCDC_EXTERNAL + bool "External LCD controller support" + depends on FB_OMAP + help + Say Y here, if you want to have support for boards with an + external LCD controller connected to the SoSSI/RFBI interface. + +config FB_OMAP_LCDC_HWA742 + bool "Epson HWA742 LCD controller support" + depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL + help + Say Y here if you want to have support for the external + Epson HWA742 LCD controller. + +config FB_OMAP_LCDC_BLIZZARD + bool "Epson Blizzard LCD controller support" + depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL + help + Say Y here if you want to have support for the external + Epson Blizzard LCD controller. + +config FB_OMAP_MANUAL_UPDATE + bool "Default to manual update mode" + depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL + help + Say Y here, if your user-space applications are capable of + notifying the frame buffer driver when a change has occured in + the frame buffer content and thus a reload of the image data to + the external frame buffer is required. If unsure, say N. + config FB_OMAP_LCD_MIPID bool "MIPI DBI-C/DCS compatible LCD support" depends on FB_OMAP && SPI_MASTER
@@ -69,23 +99,4 @@ config FB_OMAP_DMA_TUNE answer yes. Answer no if you have a dedicated video memory, or don't use any of the accelerated features. -config FB_OMAP_LCDC_EXTERNAL - bool "External LCD controller support" - depends on FB_OMAP - help - Say Y here, if you want to have support for boards with an - external LCD controller connected to the SoSSI/RFBI interface. -config FB_OMAP_LCDC_HWA742 - bool "Epson HWA742 LCD controller support" - depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL - help - Say Y here if you want to have support for the external - Epson HWA742 LCD controller. - -config FB_OMAP_LCDC_BLIZZARD - bool "Epson Blizzard LCD controller support" - depends on FB_OMAP && FB_OMAP_LCDC_EXTERNAL - help - Say Y here if you want to have support for the external - Epson Blizzard LCD controller.
Signature · 1 line
1.6.3.2
PATCH 20/20 omapfb: HWA742: fix pointer to be const
Fixes the following:
warning: assignment discards qualifiers from pointer target type
--- drivers/video/omap/hwa742.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-)
drivers/video/omap/hwa742.c +1 -1
@@ -131,7 +131,7 @@ struct {struct omapfb_device *fbdev;struct lcd_ctrl_extif *extif; -struct lcd_ctrl *int_ctrl; +const struct lcd_ctrl *int_ctrl;void (*power_up)(struct device *dev);void (*power_down)(struct device *dev);
Signature · 1 line
1.6.3.2
Re: [PATCH 16/20] omapfb: dispc: Allow multiple external IRQ handlers
In reply to Imre DeakQuoted 9 lines · Deak Imre (Nokia-D/Helsinki)
From: Daniel Stone <[email protected]>
Previously, the only external (to
dispc.c) IRQ handler was RFBI's frame done handler. dispc's IRQ framework was very dumb: you could only have one handler, and the semantics of {request,free}_irq were odd, to say the least.The new framework allows multiple consumers to register arbitrary IRQ masks.
No chance to use genirq ?
Then rfbi and others could simply request_irq() as usual
Signature · 1 line
balbi
Re: [PATCH 16/20] omapfb: dispc: Allow multiple external IRQ handlers
Quoted 8 lines · Balbi Felipe (Nokia-D/Helsinki)
Quoted 7 lines · Deak Imre (Nokia-D/Helsinki)
From: Daniel Stone <[email protected]>
Previously, the only external (to
dispc.c) IRQ handler was RFBI's frame done handler. dispc's IRQ framework was very dumb: you could only have one handler, and the semantics of {request,free}_irq were odd, to say the least.
Quoted 6 lines
Quoted 2 lines
The new framework allows multiple consumers to register arbitrary IRQ masks.
No chance to use genirq ?
Then rfbi and others could simply
request_irq()as usual
The problem with that is that we want to register handlers to take care of - possibly - multiple interrupt events. We do this by passing a mask of events to our IRQ register function, that the handler should be called for.
With the current genirq interface this is not possible, thus we need our own implementation.
--Imre