Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

video: fix composite video connector compatible string

The quite-recently-added analog-tv-connector bindings say that the
compatible string for composite video connector is
"composite-connector". That string is also used in the omap3-n900.dts
file. However, the connector driver uses "composite-video-connector", so
this has never worked.

While changing the driver's compatible string to "composite-connector"
would be safer, as published DT bindings should not be changed, I'd
rather fix the bindings in this case for two reasons:

* composite-connector is a bit too generic name, as it doesn't even hint
at video.
* it's clear that this has never worked, which means no one has used
those bindings, which should make it safe to change this.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

+3 -3
+2 -2
Documentation/devicetree/bindings/video/analog-tv-connector.txt
··· 2 2 =================== 3 3 4 4 Required properties: 5 - - compatible: "composite-connector" or "svideo-connector" 5 + - compatible: "composite-video-connector" or "svideo-connector" 6 6 7 7 Optional properties: 8 8 - label: a symbolic name for the connector ··· 14 14 ------- 15 15 16 16 tv: connector { 17 - compatible = "composite-connector"; 17 + compatible = "composite-video-connector"; 18 18 label = "tv"; 19 19 20 20 port {
+1 -1
arch/arm/boot/dts/omap3-n900.dts
··· 93 93 }; 94 94 95 95 tv: connector { 96 - compatible = "composite-connector"; 96 + compatible = "composite-video-connector"; 97 97 label = "tv"; 98 98 99 99 port {