Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8536239e authored by George Joseph's avatar George Joseph Committed by Shawn Guo
Browse files

ARM: dts: Restructure imx6qdl-wandboard.dtsi for new rev C1 board. 



The rev C1 Wandboard uses the Broadcom 4330 for WiFi and Bluetooth instead of
the 4329.  This changes the PADS assigned for the control lines.  Another
side effect of the change is that on the rev C1 board, usdhc driver can't
detect the chip presence correctly so usdhc2 now needs its 'non-removeable'
property removed.

So that rev B1 and earlier can continue to work, this patch splits the
board-specific definitions from imx6qdl-wandboard.dtsi into
imx6qdl-wandboard-revb1.dtsi and imx6qdl-wandboard-revc1.dtsi.  The new files
include the original base imx6qdl-wandboard.dtsi which retains the common
definitions.

The existing imx6dl-wandboard.dts includes imx6qdl-wandboard-revc1.dtsi and
imx6dl-wandboard-revb1.dts (new) includes imx6qdl-wandboard-revb1.dtsi.
This makes the rev C1 board the new default.  The same pattern is used for
imx6q-wandboard.dts.

So, from U-Boot on a WB-Quad you use imxq-wandboard-revb1.dtb for the older B1
board and imxq-wandboard.dtb for the current rev C1 board.

Signed-off-by: default avatarGeorge Joseph <george.joseph@fairview5.com>
Signed-off-by: default avatarShawn Guo <shawn.guo@freescale.com>
parent 02578153

arch/arm/boot/dts/Makefile

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6dl-tx6u-801x.dtb \

	imx6dl-tx6u-811x.dtb \

	imx6dl-wandboard.dtb \

	imx6dl-wandboard-revb1.dtb \

	imx6q-arm2.dtb \

	imx6q-cm-fx6.dtb \

	imx6q-cubox-i.dtb \
@@ -224,6 +225,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ 
	imx6q-sbc6x.dtb \

	imx6q-udoo.dtb \

	imx6q-wandboard.dtb \

	imx6q-wandboard-revb1.dtb \

	imx6q-tx6q-1010.dtb \

	imx6q-tx6q-1010-comtft.dtb \

	imx6q-tx6q-1020.dtb \

arch/arm/boot/dts/imx6dl-wandboard-revb1.dts

0 → 100644
+22 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Freescale Semiconductor, Inc.

 *

 * Author: Fabio Estevam <fabio.estevam@freescale.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-wandboard-revb1.dtsi"



/ {

	model = "Wandboard i.MX6 Dual Lite Board";

	compatible = "wand,imx6dl-wandboard", "fsl,imx6dl";



	memory {

		reg = <0x10000000 0x40000000>;

	};

};

arch/arm/boot/dts/imx6dl-wandboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */

/dts-v1/;

#include "imx6dl.dtsi"

#include "imx6qdl-wandboard.dtsi"

#include "imx6qdl-wandboard-revc1.dtsi"



/ {

	model = "Wandboard i.MX6 Dual Lite Board";

arch/arm/boot/dts/imx6q-wandboard-revb1.dts

0 → 100644
+26 −0
Original line number Diff line number Diff line 
/*

 * Copyright 2013 Freescale Semiconductor, Inc.

 *

 * Author: Fabio Estevam <fabio.estevam@freescale.com>

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of the GNU General Public License version 2 as

 * published by the Free Software Foundation.

 *

 */

/dts-v1/;

#include "imx6q.dtsi"

#include "imx6qdl-wandboard-revb1.dtsi"



/ {

	model = "Wandboard i.MX6 Quad Board";

	compatible = "wand,imx6q-wandboard", "fsl,imx6q";



	memory {

		reg = <0x10000000 0x80000000>;

	};

};



&sata {

	status = "okay";

};

arch/arm/boot/dts/imx6q-wandboard.dts

+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
 */

/dts-v1/;

#include "imx6q.dtsi"

#include "imx6qdl-wandboard.dtsi"

#include "imx6qdl-wandboard-revc1.dtsi"



/ {

	model = "Wandboard i.MX6 Quad Board";