Merge remote-tracking branch 'asoc/fix/rt5645' into asoc-linus

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / media / exynos-jpeg-codec.txt

diff --git a/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
index bf52ed4a5067de5c9d825f77865321112ec5a651..4ef45636ebdedd538bef484a94705b720aceda66 100644 (file)
--- a/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
+++ b/Documentation/devicetree/bindings/media/exynos-jpeg-codec.txt
@@ -4,7 +4,7 @@ Required properties:
 
 - compatible   : should be one of:
                  "samsung,s5pv210-jpeg", "samsung,exynos4210-jpeg",
-                 "samsung,exynos3250-jpeg";
+                 "samsung,exynos3250-jpeg", "samsung,exynos5420-jpeg";
 - reg          : address and length of the JPEG codec IP register set;
 - interrupts   : specifies the JPEG codec IP interrupt;
 - clock-names   : should contain: