Commit a3d72ca ("ARM: dts: Clean up exynos5250-snow") improved
the Snow DTS but the patch was rebased due conflicting changes
and the merge resolution added a device node removed by commit
a98c3c2 ("ARM: dts: update display related nodes for exynos5250-snow").
This patch removes the node again to keep the DTS as before.
Signed-off-by: Javier Martinez Canillas <javier.marti...@collabora.co.uk>
---
arch/arm/boot/dts/exynos5250-snow.dts | 16 ----------------
1 file changed, 16 deletions(-)
diff --git a/arch/arm/boot/dts/exynos5250-snow.dts
b/arch/arm/boot/dts/exynos5250-snow.dts
index e562459..f9bc04b 100644
--- a/arch/arm/boot/dts/exynos5250-snow.dts
+++ b/arch/arm/boot/dts/exynos5250-snow.dts
@@ -241,22 +241,6 @@
samsung,lane-count = <2>;
samsung,hpd-gpio = <&gpx0 7 GPIO_ACTIVE_HIGH>;
bridge = <&ptn3460>;
-
- display-timings {
- native-mode = <&timing1>;
-
- timing1: timing@1 {
- clock-frequency = <70589280>;
- hactive = <1366>;
- vactive = <768>;
- hfront-porch = <40>;
- hback-porch = <40>;
- hsync-len = <32>;
- vback-porch = <10>;
- vfront-porch = <12>;
- vsync-len = <6>;
- };
- };
};
&ehci {
--
2.1.0
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
