mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Philipp Zabel <p.zabel@pengutronix.de>
To: barebox@lists.infradead.org
Subject: [PATCH] ARM: imx6: fix GK802 DT
Date: Tue,  7 Jul 2015 09:33:20 +0200	[thread overview]
Message-ID: <1436254400-5271-1-git-send-email-p.zabel@pengutronix.de> (raw)

From: Philipp Zabel <philipp.zabel@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@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


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

             reply	other threads:[~2015-07-07  7:33 UTC|newest]

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-07-07  7:33 Philipp Zabel [this message]
2015-07-07  8:31 ` Uwe Kleine-König

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1436254400-5271-1-git-send-email-p.zabel@pengutronix.de \
    --to=p.zabel@pengutronix.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox