[PATCH] ARM: imx6: fix GK802 DT

[Uwe Kleine-König]

On Tue, Jul 07, 2015 at 09:33:20AM +0200, Philipp Zabel wrote:
> 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 {
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/  |