Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5874cfed authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux 

Pull fbdev fixes from Tomi Valkeinen:
 "Minor fixes for amba-clcd and video DT bindings"

* tag 'fbdev-fixes-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/tomba/linux:
  video: ARM CLCD: Fix color model capabilities for DT platforms
  video: fix composite video connector compatible string
parents 850ebc0c e4cf39ea

Documentation/devicetree/bindings/video/analog-tv-connector.txt

+2 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ Analog TV Connector 
===================



Required properties:

- compatible: "composite-connector" or "svideo-connector"

- compatible: "composite-video-connector" or "svideo-connector"



Optional properties:

- label: a symbolic name for the connector
@@ -14,7 +14,7 @@ Example 
-------



tv: connector {

	compatible = "composite-connector";

	compatible = "composite-video-connector";

	label = "tv";



	port {

arch/arm/boot/dts/omap3-n900.dts

+1 −1
Original line number Diff line number Diff line
@@ -93,7 +93,7 @@ 
	};



	tv: connector {

		compatible = "composite-connector";

		compatible = "composite-video-connector";

		label = "tv";



		port {

drivers/video/fbdev/amba-clcd.c

+1 −3
Original line number Diff line number Diff line
@@ -639,9 +639,7 @@ static int clcdfb_of_init_tft_panel(struct clcd_fb *fb, u32 r0, u32 g0, u32 b0) 
		if (g0 != panels[i].g0)

			continue;

		if (r0 == panels[i].r0 && b0 == panels[i].b0)

			fb->panel->caps = panels[i].caps & CLCD_CAP_RGB;

		if (r0 == panels[i].b0 && b0 == panels[i].r0)

			fb->panel->caps = panels[i].caps & CLCD_CAP_BGR;

			fb->panel->caps = panels[i].caps;

	}



	return fb->panel->caps ? 0 : -EINVAL;