diff options
author | George Joseph <george.joseph@fairview5.com> | 2014-07-08 20:48:16 +0200 |
---|---|---|
committer | Shawn Guo <shawn.guo@freescale.com> | 2014-07-18 10:49:45 +0200 |
commit | 8536239e371fababdb2b97468a07b3dac1cbfd5e (patch) | |
tree | 1c110c3881a889b56bcc3e50e7e56bfa680f8100 /arch/arm/boot/dts/imx6q-wandboard.dts | |
parent | ARM: dts: imx53: correct clock-names of SATA node (diff) | |
download | linux-8536239e371fababdb2b97468a07b3dac1cbfd5e.tar.xz linux-8536239e371fababdb2b97468a07b3dac1cbfd5e.zip |
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: George Joseph <george.joseph@fairview5.com>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Diffstat (limited to 'arch/arm/boot/dts/imx6q-wandboard.dts')
-rw-r--r-- | arch/arm/boot/dts/imx6q-wandboard.dts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6q-wandboard.dts b/arch/arm/boot/dts/imx6q-wandboard.dts index 36be17f207b1..4a8a6ee13e9f 100644 --- a/arch/arm/boot/dts/imx6q-wandboard.dts +++ b/arch/arm/boot/dts/imx6q-wandboard.dts @@ -10,7 +10,7 @@ */ /dts-v1/; #include "imx6q.dtsi" -#include "imx6qdl-wandboard.dtsi" +#include "imx6qdl-wandboard-revc1.dtsi" / { model = "Wandboard i.MX6 Quad Board"; |