summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2014-12-08Merge branches '3.19/omapdss' and '3.19/simplefb' into fbdevTomi Valkeinen41-2111/+2352
Merge fbdev topic branches.
2014-12-04video: uvesafb: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"platform_device_put" The platform_device_put() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev-VIA: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"framebuffer_release" The framebuffer_release() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev-MMP: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"mmp_unregister_path" The mmp_unregister_path() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: mx3fb: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"backlight_device_unregister" The backlight_device_unregister() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev-OMAP2: Deletion of unnecessary checks before the function call ↵Markus Elfring1-6/+3
"i2c_put_adapter" The i2c_put_adapter() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev-SIS: Deletion of unnecessary checks before the function call ↵Markus Elfring1-9/+5
"pci_dev_put" The pci_dev_put() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: smscufx: Deletion of unnecessary checks before the function call "vfree"Markus Elfring1-4/+2
The vfree() function performs also input parameter validation. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: udlfb: Deletion of unnecessary checks before the function call "vfree"Markus Elfring1-6/+3
The vfree() function performs also input parameter validation. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: uvesafb: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"uvesafb_free" The uvesafb_free() function tests whether its argument is NULL and then returns immediately. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev-LCDC: Deletion of an unnecessary check before the function call ↵Markus Elfring1-2/+1
"vfree" The vfree() function performs also input parameter validation. Thus the test around the call is not needed. This issue was detected by using the Coccinelle software. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev: arkfb: suppress build warningLad, Prabhakar1-1/+1
this patch fixes following build warning: drivers/video/fbdev/arkfb.c: In function ‘ark_pci_probe’: drivers/video/fbdev/arkfb.c:1019:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] par->state.vgabase = (void __iomem *) vga_res.start; ^ Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev: s3fb: suppress build warningLad, Prabhakar1-1/+1
this patch fixes following build warning: drivers/video/fbdev/s3fb.c: In function ‘s3_pci_probe’: drivers/video/fbdev/s3fb.c:1185:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] par->state.vgabase = (void __iomem *) vga_res.start; ^ Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04video: fbdev: vt8623fb: suppress build warningLad, Prabhakar1-1/+1
this patch fixes following build warning: drivers/video/fbdev/vt8623fb.c: In function ‘vt8623_pci_probe’: drivers/video/fbdev/vt8623fb.c:734:23: warning: cast to pointer from integer of different size [-Wint-to-pointer-cast] par->state.vgabase = (void __iomem *) vga_res.start; ^ Signed-off-by: Lad, Prabhakar <prabhakar.csengg@gmail.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-04OMAPDSS: hdmi5: Fix bit field for IEC958_AES2_CON_SOURCEJyri Sarha1-1/+1
The bit field for IEC958_AES2_CON_SOURCE is bits 3-0 in HDMI_CORE_FC_AUDSCHNLS2, not imaginary bits 3-4 (reverse order). Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-02OMAPDSS: hdmi: Remove __exit qualifier from hdmi_uninit_output()Jyri Sarha2-2/+2
Remove __exit qualifier from hdmi_uninit_output() because it is used also in omapdss_hdmihw_probe(). Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi5: Change hdmi_wp idlemode to to no_idle for audio playbackJyri Sarha2-0/+8
Enabling idle mode during audio playback causes the glitches on OMAP5 HDMI. The TRM also suggests to use no-idle for HDMI audio playback. This patch sets HDMI idle mode to no-idle for the duration of the playback, and restores it back to original value afterwards. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: Remove all references to obsolete HDMI audio callbacksJyri Sarha3-195/+0
In new model these callbacks are obsolete since the ASoC component drivers are integrated into the HDMI drivers and no callbacks are needed anymore. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01ASoC: omap: Remove obsolete HDMI audio code and Kconfig optionsJyri Sarha5-506/+0
Removes omap-hdmi DAI driver, omap-hdmi-card driver, the related Kconfig options, and Makefile entries. The HDMI DAI drivers has been integrated directly to OMAP4+ HDMI drivers and simple-card driver is used instead of omap-hdmi-card driver. Signed-off-by: Jyri Sarha <jsarha@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi5: Register ASoC platform device for omap hdmi audioJyri Sarha1-0/+125
Implements callbacks for OMAP HDMI audio platform driver and registers it in probe function. Unregistering is done in remove function. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi5: Remove callbacks for the old ASoC DAI driverJyri Sarha1-113/+0
Removes the OMAP5 HDMI audio callbacks for the old external DAI driver. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi4: Register ASoC platform device for omap hdmi audioJyri Sarha1-0/+125
Implements callbacks for OMAP HDMI audio platform driver and registers it in probe function. Unregistering is done in remove function. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi4: Remove callbacks for the old ASoC DAI driverJyri Sarha1-113/+0
Removes the OMAP4 HDMI audio callbacks for the old external DAI driver. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: hdmi: Make hdmi_mode_has_audio() more user friedlyJyri Sarha1-2/+2
Make hdmi_mode_has_audio() more user friedly by taking hdmi_config as parameter. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01OMAPDSS: Kconfig: Remove HDMI audio booleans from KconfigJyri Sarha1-7/+0
The booleans are not used anymore. Just select SND_OMAP_SOC_HDMI_AUDIO to enable OMAP HDMI audio support. Signed-off-by: Jyri Sarha <jsarha@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-12-01ASoC: omap-hdmi-audio: Add platform device for OMAP HDMI audio supportJyri Sarha4-0/+467
The platform device should only be registered from OMAPDSS HDMI driver. The platform driver registers and unregisters all ASoC components needed for OMAP HDMI audio. The hdmi audio driver implements cpu-dai component using the callbacks provided by OMAPDSS and registers the component under DSS HDMI device. Omap-pcm is registered for platform component also under DSS HDMI device. Dummy codec is used as as codec component. The hdmi audio driver implements also the card and registers it under its own platform device. Signed-off-by: Jyri Sarha <jsarha@ti.com> Acked-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Reviewed-by: Mark Brown <broonie@kernel.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi.h: Add members to hdmi drvdata for audio implementationJyri Sarha1-0/+2
Adds display_enabled flag and audio_abort_cb callback to struct hdmi. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi: Add pdev pointer for audio_pdev in HDMI DRV dataJyri Sarha1-0/+2
This is used to store omap-hdmi-audio pdev for unregistering it. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi: Make hdmi structure publicJyri Sarha3-40/+30
Unify the private anonymous struct in hdmi4.c and hdmi5.c, name it as struct omap_hdmi, and make it public in hdmi.h. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi_wp: Add function for getting audio dma addressJyri Sarha2-0/+8
The audio dma port is found in the hdmi_wp physical address space. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi4_core: Remove unused hdmi4_audio_get_dma_port()Jyri Sarha2-11/+0
hdmi4_audio_get_dma_port() is unused and and broken. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi: Remove most of OMAP[45]_DSS_HDMI_AUDIO ifdefsJyri Sarha7-21/+1
It does not waste too many bytes to compile all audio related core functions always in with HDMI support. It should help readability and in keeping the audio code in working shape. Leave the options just for disabling and enabling the functionality in hdmi[45].c. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi.h: Add HDMI_AUDIO_LAYOUT_6CH enum valueJyri Sarha1-1/+2
The OMAP5 HDMI audio implementation needs HDMI_AUDIO_LAYOUT_6CH in hdmi_core_audio_layout enum. I found the correct value from ti-linux 3.8 tree. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi5_core: Initialize mandatory sample_order parameterJyri Sarha1-0/+3
The hdmi_wp_audio_config_format() expects sample_order of struct hdmi_audio_format to be initialized. The only allowed value is HDMI_AUDIO_SAMPLE_LEFT_FIRST. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26OMAPDSS: hdmi_wp: Protect reserved bits in hdmi_wp_audio_config_format()Jyri Sarha1-2/+6
Only OMAP4 DSS has non reserved bits above 6th bit in HDMI_WP_AUDIO_CFG. Signed-off-by: Jyri Sarha <jsarha@ti.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26dt-bindings: simplefb-sunxi: Add sunxi simplefb extensionsHans de Goede1-0/+33
If pre-filled framebuffer nodes are used, the firmware may need extra properties to find the right node. This documents the properties to use for this on sunxi platforms. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-26dt-bindings: simplefb: Drop the advice about using a specific path for nodesHans de Goede1-6/+4
This goes contrary to how devicetree usually works, so drop it. Instead if the firmware needs to be able to find a specific node it should use a platform specific compatible + properties for this. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-25simplefb: Fix build errors when CONFIG_COMMON_CLK is not definedHans de Goede1-2/+2
Both CONFIG_OF and CONFIG_COMMON_CLK must be defined to be able to use of clocks. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-25video: fbdev-MMP: Fix a typo for the word "destroyed"Markus Elfring1-1/+1
A word was corrected in the description for a parameter of the mmp_unregister_path() function. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-25video: fbdev-MMP: Fix typos for the word "destroy"Markus Elfring1-2/+2
Two mistyped words were corrected in the description for the mmp_unregister_path() function. Signed-off-by: Markus Elfring <elfring@users.sourceforge.net> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-19video: ARM CLCD: Remove duplicated include in amba-clcd.cQiang Chen1-1/+0
This patch fixes duplicated include dma-mapping.h in drivers/video/fbdev/amba-clcd.c Signed-off-by: Qiang Chen <qiang2.chen@sonymobile.com> Acked-by: Pawel Moll <pawel.moll@arm.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14simplefb: Change simplefb_init from module_init to fs_initcallHans de Goede1-1/+1
One of the reasons for having the simplefb nodes in /chosen, and doing explicit enumeration of the nodes there, is too allow enumerating them sooner, so that we get a console earlier on. Doing this earlier then fs_initcall is not useful, since the fb only turns into a console when fbcon intializes, which is a fs_initcall too. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14fbcon: Change fbcon_init from module_init to fs_initcallHans de Goede1-1/+1
Various fb drivers register themselves before module_init so as to have a console as early as possible, this is of little use if fbcon does not initialize early too. Fbcon cannot initialize earlier then fs_initcall, because then the creation of /sys/class/graphics/fbcon will fail. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14simplefb: Add support for enumerating simplefb dt nodes in /chosenHans de Goede1-1/+22
Update simplefb to support the new preferred location for simplefb dt nodes under /chosen. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14of.h: Keep extern declaration of of_* variables when !CONFIG_OFHans de Goede1-2/+1
Keep the extern declaration of of_allnodes and friends, when building without of support, this way code using them can be written like this: if (IS_ENABLED(CONFIG_OF_PLATFORM) && of_chosen) { for_each_child_of_node(of_chosen, np) ... } And rely on the compiler optimizing it away, avoiding the need for #ifdef-ery. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14dt-bindings: simplefb: Specify node location and handoff related propertiesHans de Goede1-1/+57
Since simplefb nodes do not relate directly to hw typically they have been placed in the root of the devicetree. As the represent runtime information having them as sub-nodes of /chosen is more logical, specify this. Also specify when to set the chosen stdout-path property to a simplefb node. For reliable handover to a hardware specific driver, that driver needs to know which simplefb to unregister when taking over, specify how the hw driver can find the matching simplefb node. Last add some advice on how to fill and use simplefb nodes from a firmware pov. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Acked-by: Maxime Ripard <maxime.ripard@free-electrons.com> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14simplefb: add clock handling codeLuc Verhaegen1-1/+107
This claims and enables clocks listed in the simple framebuffer dt node. This is needed so that the display engine, in case the required clocks are known by the kernel code and are described in the dt, will remain properly enabled. Signed-off-by: Luc Verhaegen <libv@skynet.be> [hdegoede@redhat.com: Change clks from list to dynamic array] Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14simplefb: add goto error path to probeLuc Verhaegen1-7/+11
Use the usual kernel style of goto error_foo to free resources on probe error. This is a preparation patch for adding clocks support. While at it also update ioremap_wc error return from ENODEV to ENOMEM. Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Stephen Warren <swarren@nvidia.com> Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14simplefb: formalize pseudo palette handlingLuc Verhaegen1-3/+12
Add a proper struct describing simplefb private data, with the palette in there, instead of directly storing the palette in the fb_info->par pointer. Signed-off-by: Luc Verhaegen <libv@skynet.be> Acked-by: Stephen Warren <swarren@nvidia.com> [hdegoede@redhat.com: drop unnecessary void * cast] Reviewed-by: Hans de Goede <hdegoede@redhat.com> Signed-off-by: Hans de Goede <hdegoede@redhat.com> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com> Reviewed-by: David Herrmann <dh.herrmann@gmail.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
2014-11-14dt-bindings: Add a clocks property to the simple-framebuffer bindingHans de Goede1-3/+9
A simple-framebuffer node represents a framebuffer setup by the firmware / bootloader. Such a framebuffer may have a number of clocks in use, add a property to communicate this to the OS. Signed-off-by: Hans de Goede <hdegoede@redhat.com> Reviewed-by: Mike Turquette <mturquette@linaro.org> Acked-by: Geert Uytterhoeven <geert@linux-m68k.org> Reviewed-by: Maxime Ripard <maxime.ripard@free-electrons.com> Acked-by: Grant Likely <grant.likely@linaro.org> Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
generated by cgit v1.2.3 (git 2.39.0) at 2025-09-01 16:02:51 +0300