[PATCH] ARM: imx6: fix GK802 DT

[Philipp Zabel]

From: Philipp Zabel <philipp.zabel at gmail.com>

Including "imx6q.dtsi" after <arm/imx6q-gk802.dts> also includes
<arm/imx6ql.dtsi> again, disabling all peripherals, including the
serial console uart. We can't include it first either, because
arm/imx6q-gk802.dts contains the /dts-v1/ header.
This patch drops the offending include statement and instead adds
the missing IPU aliases manually.

Signed-off-by: Philipp Zabel <philipp.zabel at gmail.com>
---
 arch/arm/dts/imx6q-gk802.dts | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/arch/arm/dts/imx6q-gk802.dts b/arch/arm/dts/imx6q-gk802.dts
index 310d6f0..d712e00 100644
--- a/arch/arm/dts/imx6q-gk802.dts
+++ b/arch/arm/dts/imx6q-gk802.dts
@@ -7,7 +7,13 @@
  */
 
 #include <arm/imx6q-gk802.dts>
-#include "imx6q.dtsi"
+
+/ {
+	aliases {
+		ipu0 = &ipu1;
+		ipu1 = &ipu2;
+	};
+};
 
 /* External USB-A port (USBOTG) */
 &usbotg {
-- 
2.2.1.209.g41e5f3a