From: "Uwe Kleine-König" <u.kleine-koenig@pengutronix.de>
To: Philipp Zabel <p.zabel@pengutronix.de>
Cc: barebox@lists.infradead.org
Subject: Re: [PATCH] ARM: imx6: fix GK802 DT
Date: Tue, 7 Jul 2015 10:31:06 +0200 [thread overview]
Message-ID: <20150707083106.GD6099@pengutronix.de> (raw)
In-Reply-To: <1436254400-5271-1-git-send-email-p.zabel@pengutronix.de>
On Tue, Jul 07, 2015 at 09:33:20AM +0200, Philipp Zabel wrote:
> 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 {
Alternatively you could remove the line
#include <arm/imx6q.dtsi>
from arch/arm/dts/imx6q.dtsi, right? This is already included via
arch/arm/dts/imx6q-gk802.dts -> #include <arm/imx6q-gk802.dts>
dts/src/arm/imx6q-gk802.dts -> #include "imx6q.dtsi"
anyhow. This would need a fixup for all imx6q boards that don't have a
dts in dts/src though (i.e. all but imx6q-gk802 if my grep magic was
correct).
Best regards
Uwe
--
Pengutronix e.K. | Uwe Kleine-König |
Industrial Linux Solutions | http://www.pengutronix.de/ |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
prev parent reply other threads:[~2015-07-07 8:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-07-07 7:33 Philipp Zabel
2015-07-07 8:31 ` Uwe Kleine-König [this message]
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=20150707083106.GD6099@pengutronix.de \
--to=u.kleine-koenig@pengutronix.de \
--cc=barebox@lists.infradead.org \
--cc=p.zabel@pengutronix.de \
/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