diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-03-28 09:34:19 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-03-28 09:34:19 +0200 |
| commit | e5c1ff14757afe21733ddee9cc4bbaeaeadbf803 (patch) | |
| tree | 0da1c9aaf772fac30fe68590a4ca1c3dd439cebd /Documentation/devicetree/bindings/display | |
| parent | BackMerge tag 'v4.11-rc3' into drm-next (diff) | |
| parent | Linux 4.11-rc4 (diff) | |
| download | linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.tar.xz linux-e5c1ff14757afe21733ddee9cc4bbaeaeadbf803.zip | |
Backmerge tag 'v4.11-rc4' into drm-next
Linux 4.11-rc4
The i915 GVT team need the rc4 code to base some more code on.
Diffstat (limited to 'Documentation/devicetree/bindings/display')
| -rw-r--r-- | Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt | 1 | ||||
| -rw-r--r-- | Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt | 1 |
2 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt index a78265993665..ca5204b3bc21 100644 --- a/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt +++ b/Documentation/devicetree/bindings/display/exynos/exynos_dsim.txt @@ -4,7 +4,6 @@ Required properties: - compatible: value should be one of the following "samsung,exynos3250-mipi-dsi" /* for Exynos3250/3472 SoCs */ "samsung,exynos4210-mipi-dsi" /* for Exynos4 SoCs */ - "samsung,exynos4415-mipi-dsi" /* for Exynos4415 SoC */ "samsung,exynos5410-mipi-dsi" /* for Exynos5410/5420/5440 SoCs */ "samsung,exynos5422-mipi-dsi" /* for Exynos5422/5800 SoCs */ "samsung,exynos5433-mipi-dsi" /* for Exynos5433 SoCs */ diff --git a/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt index 18645e0228b0..5837402c3ade 100644 --- a/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt +++ b/Documentation/devicetree/bindings/display/exynos/samsung-fimd.txt @@ -11,7 +11,6 @@ Required properties: "samsung,s5pv210-fimd"; /* for S5PV210 SoC */ "samsung,exynos3250-fimd"; /* for Exynos3250/3472 SoCs */ "samsung,exynos4210-fimd"; /* for Exynos4 SoCs */ - "samsung,exynos4415-fimd"; /* for Exynos4415 SoC */ "samsung,exynos5250-fimd"; /* for Exynos5250 SoCs */ "samsung,exynos5420-fimd"; /* for Exynos5420/5422/5800 SoCs */ |