diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 12:11:37 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-09-12 12:11:37 -0400 |
| commit | 5874cfed0b04f53146f70a519a2371cea5f39178 (patch) | |
| tree | d99173f58d0d95e0cc19bb53f6c298a03d9180d9 /Documentation | |
| parent | 850ebc0c0c50e24126461eec3ca4d07308560058 (diff) | |
| parent | e4cf39ea473329dfc07de1246f97d27b7fc96f79 (diff) | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/video/analog-tv-connector.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/video/analog-tv-connector.txt b/Documentation/devicetree/bindings/video/analog-tv-connector.txt index 0218fcdc1299..0c0970c210ab 100644 --- a/Documentation/devicetree/bindings/video/analog-tv-connector.txt +++ b/Documentation/devicetree/bindings/video/analog-tv-connector.txt | |||
| @@ -2,7 +2,7 @@ Analog TV Connector | |||
| 2 | =================== | 2 | =================== |
| 3 | 3 | ||
| 4 | Required properties: | 4 | Required properties: |
| 5 | - compatible: "composite-connector" or "svideo-connector" | 5 | - compatible: "composite-video-connector" or "svideo-connector" |
| 6 | 6 | ||
| 7 | Optional properties: | 7 | Optional properties: |
| 8 | - label: a symbolic name for the connector | 8 | - label: a symbolic name for the connector |
| @@ -14,7 +14,7 @@ Example | |||
| 14 | ------- | 14 | ------- |
| 15 | 15 | ||
| 16 | tv: connector { | 16 | tv: connector { |
| 17 | compatible = "composite-connector"; | 17 | compatible = "composite-video-connector"; |
| 18 | label = "tv"; | 18 | label = "tv"; |
| 19 | 19 | ||
| 20 | port { | 20 | port { |