summaryrefslogtreecommitdiff
path: root/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
diff options
context:
space:
mode:
authorGeorge Joseph <george.joseph@fairview5.com>2014-07-08 22:48:16 +0400
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 12:49:45 +0400
commit8536239e371fababdb2b97468a07b3dac1cbfd5e (patch)
tree1c110c3881a889b56bcc3e50e7e56bfa680f8100 /arch/arm/boot/dts/imx6qdl-wandboard.dtsi
parent025781539a3ccf867c1e0f2fc63f61cc8c7c5415 (diff)
downloadlinux-8536239e371fababdb2b97468a07b3dac1cbfd5e.tar.xz
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/imx6qdl-wandboard.dtsi')
-rw-r--r--arch/arm/boot/dts/imx6qdl-wandboard.dtsi21
1 files changed, 0 insertions, 21 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
index 13eae9e5bae8..5fb091675582 100644
--- a/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-wandboard.dtsi
@@ -91,22 +91,8 @@
&iomuxc {
pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_hog>;
imx6qdl-wandboard {
- pinctrl_hog: hoggrp {
- fsl,pins = <
- MX6QDL_PAD_GPIO_0__CCM_CLKO1 0x130b0
- MX6QDL_PAD_GPIO_2__GPIO1_IO02 0x80000000
- MX6QDL_PAD_EIM_DA9__GPIO3_IO09 0x80000000
- MX6QDL_PAD_EIM_EB1__GPIO2_IO29 0x80000000 /* WL_REF_ON */
- MX6QDL_PAD_EIM_A25__GPIO5_IO02 0x80000000 /* WL_RST_N */
- MX6QDL_PAD_ENET_RXD1__GPIO1_IO26 0x80000000 /* WL_REG_ON */
- MX6QDL_PAD_ENET_TXD1__GPIO1_IO29 0x80000000 /* WL_HOST_WAKE */
- MX6QDL_PAD_ENET_TXD0__GPIO1_IO30 0x80000000 /* WL_WAKE */
- MX6QDL_PAD_EIM_D29__GPIO3_IO29 0x80000000
- >;
- };
pinctrl_audmux: audmuxgrp {
fsl,pins = <
@@ -268,13 +254,6 @@
status = "okay";
};
-&usdhc2 {
- pinctrl-names = "default";
- pinctrl-0 = <&pinctrl_usdhc2>;
- non-removable;
- status = "okay";
-};
-
&usdhc3 {
pinctrl-names = "default";
pinctrl-0 = <&pinctrl_usdhc3>;