aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2013-06-28Merge tag 'fbdev-3.11-2' of git://gitorious.org/linux-omap-dss2/linux into ↵Jean-Christophe PLAGNIOL-VILLARD35-136/+113
fbdev/for-next Various fbdev changes for 3.11 * xilinxfb updates * Small cleanups and fixes to multiple drivers
2013-06-28Merge tag 'omapdss-for-3.11-2' of git://gitorious.org/linux-omap-dss2/linux ↵Jean-Christophe PLAGNIOL-VILLARD30-36/+6911
into fbdev/for-next OMAP display subsystem changes for 3.11 (part 2/2) This is the second part of OMAP DSS changes for 3.11. This part contains the new DSS device model support. The current OMAP panel drivers use a custom DSS bus, and there's a hard limit of one external display block per video pipeline. In the new DSS device model the devices/drivers are made according to the control bus of the display block, usually platform, i2c or spi. The display blocks can also be chained so that we can have separate drivers for setups with both external encoder and panel. To allow the current board files, which use the old style panels, to function, the old display drivers are left in their current state, and new ones are added to drivers/video/omap2/displays-new/. When the board files have been converted to use the new style panels, we can remove the old code. This is planned to happen in v3.12. Having to support two very different DSS device models makes the driver somewhat confusing in some parts, and prevents us from properly cleaning up some other parts. These cleanups will be done when the old code is removed. The new device model is designed with CDF (Common Display Framework) in mind. While CDF is still under work, the new DSS device model should be much more similar to CDF's model than the old device model, which should make the eventual conversion to CDF much easier.
2013-06-28Merge tag 'omapdss-for-3.11-1' of git://gitorious.org/linux-omap-dss2/linux ↵Jean-Christophe PLAGNIOL-VILLARD39-893/+1131
into fbdev/for-next OMAP display subsystem changes for 3.11 (part 1/2) This is the first part of OMAP DSS changes for 3.11. This part contains fixes, cleanups and reorganizations that are not directly related to the new DSS device model that is added in part 2, although many of the reorganizations are made to make the part 2 possible. There should not be any functional changes visible to the user except the few bug fixes. The main new internal features: - Display (dis)connect support, which allows us to explicitly (dis)connect a whole display pipeline - Panel list, which allows us to operate without the specific DSS bus - Combine omap_dss_output to omap_dss_device, so that we have one generic "entity" for display pipeline blocks
2013-06-27video: i740fb: Make i740fb_init staticSachin Kamat1-1/+1
i740fb_init is referenced only in this function. Make it static. Signed-off-by: Sachin Kamat <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: Ondrej Zary <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-27fb: make fp_get_options name argument constVincent Stehlé2-2/+2
drm_get_connector_name now returns a const value, which causes the following compilation warning: drivers/gpu/drm/drm_fb_helper.c: In function ‘drm_fb_helper_parse_command_line’: drivers/gpu/drm/drm_fb_helper.c:127:3: warning: passing argument 1 of ‘fb_get_options’ discards ‘const’ qualifier from pointer target type [enabled by default] In file included from drivers/gpu/drm/drm_fb_helper.c:35:0: include/linux/fb.h:627:12: note: expected ‘char *’ but argument is of type ‘const char *’ As fb_get_options uses its name argument as read only, make it const. This fixes the aforementioned compilation warning. Signed-off-by: Vincent Stehlé <[email protected]> Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: Dave Airlie <[email protected]> Cc: [email protected] Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2013-06-27video: mmp: fix graphics/video layer enable/mask swap issueJing Xiang1-3/+3
There is bug when switch dma of graphic layer and video layer, it configured opposite bit, fix it. Signed-off-by: Jing Xiang <[email protected]> Signed-off-by: Jett.Zhou <[email protected]> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2013-06-27video: mmp: fix memcpy wrong size for mmp_addr issueJing Xiang1-1/+1
Memcpy used wrong struct of mmp_win, fix it. Signed-off-by: Jing Xiang <[email protected]> Signed-off-by: Jett.Zhou <[email protected]> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]>
2013-06-27radeon: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)Yijing Wang1-1/+1
Pci core has been saved pm cap register offset by pdev->pm_cap in pci_pm_init() in init path. So we can use pdev->pm_cap instead of using pci_find_capability(pdev, PCI_CAP_ID_PM) for better performance and simplified code. Signed-off-by: Yijing Wang <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: [email protected] Cc: [email protected] Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-27aty128fb: use pdev->pm_cap instead of pci_find_capability(..,PCI_CAP_ID_PM)Yijing Wang1-1/+1
Pci core has been saved pm cap register offset by pdev->pm_cap in pci_pm_init() in init path. So we can use pdev->pm_cap instead of using pci_find_capability(pdev, PCI_CAP_ID_PM) for better performance and simplified code. Signed-off-by: Yijing Wang <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Tomi Valkeinen <[email protected]> Cc: [email protected] Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-27video: of_display_timing.h: Declare 'display_timing'Fabio Estevam1-0/+1
Commit ffa3fd21de ("videomode: implement public of_get_display_timing()") causes the following build warning: include/video/of_display_timing.h:18:10: warning: 'struct display_timing' declared inside parameter list [enabled by default] include/video/of_display_timing.h:18:10: warning: its scope is only this definition or declaration, which is probably not what you want [enabled by default] Declare 'display_timing' to avoid the build warning. Signed-off-by: Fabio Estevam <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26fbdev: bfin-lq035q1-fb: Use dev_pm_opsLars-Peter Clausen1-8/+14
Use dev_pm_ops instead of the legacy suspend/resume callbacks. Signed-off-by: Lars-Peter Clausen <[email protected]> Acked-by: Michael Hennerich <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26fbmem: return -EFAULT on copy_to_user() failureDan Carpenter1-1/+3
copy_to_user() returns the number of bytes remaining to be copied. put_user() returns -EFAULT on error. This function ORs a bunch of stuff together and returns jumbled non-zero values on error. It should return -EFAULT. Signed-off-by: Dan Carpenter <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26OMAPDSS: DPI: Fix wrong pixel clock limitTomi Valkeinen1-2/+2
DPI is supposed to skip odd dividers in the clock path when the pixel clock is higher than 100MHz. The code, however, defines the pixel clock limit as 1MHz. This causes the driver to skip valid clock dividers, possibly making the pixel clock to be further away from the requested one than necessary. Fix the clock limit to 100MHz. Signed-off-by: Tomi Valkeinen <[email protected]> Cc: NeilBrown <[email protected]>
2013-06-26video: replace strict_strtoul() with kstrtoul()Jingoo Han3-6/+6
The usage of strict_strtoul() is not preferred, because strict_strtoul() is obsolete. Thus, kstrtoul() should be used. Signed-off-by: Jingoo Han <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26uvesafb: Correct/simplify warning messageBorislav Petkov1-2/+2
Streamline it a bit. No functional change. Signed-off-by: Borislav Petkov <[email protected]> Cc: Wang YanQing <[email protected]> Cc: Michal Januszewski <[email protected]> Cc: Florian Tobias Schandinat <[email protected]> Cc: [email protected] Acked-by: Wang YanQing <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26fb: fix atyfb unused data warningsRandy Dunlap1-2/+3
Fix compiler warnings of data defined but not used by using the __maybe_unused attribute. The date are only used with certain kconfig settings. drivers/video/aty/atyfb_base.c:534:13: warning: 'ram_dram' defined but not used [-Wunused-variable] drivers/video/aty/atyfb_base.c:535:13: warning: 'ram_resv' defined but not used [-Wunused-variable] Signed-off-by: Randy Dunlap <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: [email protected] Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Tomi Valkeinen <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26fb: fix atyfb build warningRandy Dunlap1-2/+2
Fix build warning when neither of CONFIG_FB_ATY_GX or CONFIG_FB_ATY_CT is enabled, since ARRAY_SIZE(aty_chips) is 0 in that case. drivers/video/aty/atyfb_base.c:437:11: warning: overflow in implicit constant conversion [-Woverflow] Signed-off-by: Randy Dunlap <[email protected]> Cc: Paul Mackerras <[email protected]> Cc: Benjamin Herrenschmidt <[email protected]> Cc: [email protected] Cc: Jean-Christophe Plagniol-Villard <[email protected]> Cc: Tomi Valkeinen <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: imxfb: Make local symbols staticSachin Kamat1-2/+2
These symbols are used only in this file. Make them static. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: udlfb: Make local symbol staticSachin Kamat1-1/+1
'dlfb_handle_damage' is used only in this file. Make it static. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: udlfb: Use NULL instead of 0Sachin Kamat1-5/+5
Pointer variables should be initialized with NULL instead of 0. Signed-off-by: Sachin Kamat <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: smscufx: Use NULL instead of 0Sachin Kamat1-1/+1
'info' is a pointer. Use NULL instead of 0. Signed-off-by: Sachin Kamat <[email protected]> Acked-by: Steve Glendinning <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: remove unnecessary platform_set_drvdata()Jingoo Han20-31/+0
The driver core clears the driver data to NULL after device_release or on probe failure, since commit 0998d0631001288a5974afc0b2a5f568bcdecb4d (device-core: Ensure drvdata = NULL when no driver is bound). Thus, it is not needed to manually clear the device driver data to NULL. Signed-off-by: Jingoo Han <[email protected]> Cc: Sylwester Nawrocki <[email protected]> Acked-by: Kuninori Morimoto <[email protected]> Acked-by: Shawn Guo <[email protected]> Reviewed-by: H Hartley Sweeten <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: mxsfb: remove redundant dev_err call in mxsfb_probe()Wei Yongjun1-1/+0
There is a error message within devm_ioremap_resource already, so remove the dev_err call to avoid redundant error message. Signed-off-by: Wei Yongjun <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Use driver for Xilinx ARM ZynqMichal Simek1-1/+1
Enable this driver for all Xilinx platforms. Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Add support for little endian accessesMichal Simek1-2/+28
Dynamically detect endianess on IP and use ioread/iowrite functions instead of powerpc and microblaze specific out_be32. Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Group bus initializationMichal Simek1-41/+15
Move of_address_to_resource() to xilinxfb_assign() which simplify driver probing. Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Use drvdata->regs_phys instead of physaddrMichal Simek1-2/+2
physaddr will be remove in the next patch. Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Rename PLB_ACCESS_FLAG to BUS_ACCESS_FLAGMichal Simek1-16/+16
Using only PLB name is wrong for a long time because the same access functions are also used for AXI. s/PLB/BUS/g Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Do not name out_be32 in function nameMichal Simek1-8/+8
out_be32 IO function is not supported by ARM. It is only available for PPC and Microblaze. Because this driver can be used on ARM let's remove out_be32 from function name. Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-26video: xilinxfb: Fix OF probing on little-endian systemsMichal Simek1-4/+3
DTB is always big-endian that's why it is necessary to properly convert value (*p). It is automatically done in of_property_read_u32(). Signed-off-by: Michal Simek <[email protected]> Acked-by: Arnd Bergmann <[email protected]> Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: panels: add Kconfig commentTomi Valkeinen2-2/+2
Add a comment to Kconfig to clarify the difference between the two display driver directories. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add NEC NL8048HL11 panel driverTomi Valkeinen4-0/+421
Add NEC NL8048HL11 panel driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add TPO TD043MTEA1 panel driverTomi Valkeinen4-0/+670
Add TPO TD043MTEA1 panel driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]> Tested-by: Grazvydas Ignotas <[email protected]>
2013-06-17OMAPDSS: Add Sharp LS037V7DW01 panel driverTomi Valkeinen4-0/+355
Add Sharp LS037V7DW01 panel driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add LG.Philips LB035Q02 panel driverTomi Valkeinen4-0/+382
Add LG.Philips LB035Q02 panel driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add Sony ACX565AKM panel driverTomi Valkeinen4-0/+888
Add Sony ACX565AKM panel driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]> Tested-by: Aaro Koskinen <[email protected]>
2013-06-17OMAPDSS: Add new DSI Command Mode panel driverTomi Valkeinen4-0/+1370
Add DSI Command Mode panel driver which uses the new DSS device model and DSS ops. This driver only supports a very basic set of features which should be common to all DSI command mode panels. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new simple DPI panel driverTomi Valkeinen4-0/+299
Add simple DPI Panel driver which uses the new DSS device model and DSS ops. A "simple" panel means one that does not require any special setup. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new Analog TV Connector driverTomi Valkeinen4-0/+286
Add Analog TV Connector driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new HDMI Connector driverTomi Valkeinen4-0/+391
Add HDMI Connector driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new DVI Connector driverTomi Valkeinen4-0/+370
Add DVI Connector driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new TPD12S015 Encoder driverTomi Valkeinen4-0/+418
Add TPD12S015 HDMI ESD protection and level shifter encoder driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: Add new TFP410 Encoder driverTomi Valkeinen6-0/+292
Add TFP410 DPI-to-DVI Encoder driver which uses the new DSS device model and DSS ops. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: DSI: Add opsTomi Valkeinen2-0/+151
Add "ops" style method for using DSI functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: HDMI: Add opsTomi Valkeinen2-11/+267
Add "ops" style method for using HDMI functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: AnalogTV: Add opsTomi Valkeinen2-0/+98
Add "ops" style method for using analog TV functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: DVI: Add opsTomi Valkeinen1-0/+18
Add "ops" style method for using DVI functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: SDI: Add opsTomi Valkeinen2-0/+98
Add "ops" style method for using SDI functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17OMAPDSS: DPI: Add opsTomi Valkeinen2-0/+93
Add "ops" style method for using DPI functionality. Ops style calls will allow us to have arbitrarily long display pipelines, where each entity can call ops in the previous display entity. Signed-off-by: Tomi Valkeinen <[email protected]>
2013-06-17drm/omap: DVI connector fixTomi Valkeinen1-4/+2
The omapdrm driver currently uses a string comparison to find out if the display is a DVI display. This is not reliable, and as we now have a specific display type for DVI, let's use that. Signed-off-by: Tomi Valkeinen <[email protected]>