summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMax Krummenacher <max.krummenacher@toradex.com>2015-07-23 14:17:19 +0200
committerMax Krummenacher <max.krummenacher@toradex.com>2015-07-23 14:17:19 +0200
commit6c2f7b22f5aa9572d35a3ddd7d14b653cf606550 (patch)
tree6744f4734dd75b7559d07c8656fc77a04c5a748d
parent3e33d8ba495ac44791061324704308d908ee8588 (diff)
apalis imx6: remove weim driver
The WEIM signals are not accessible so remove the driver from the config and set it to disabled in the device tree.
-rw-r--r--arch/arm/boot/dts/imx6qdl-apalis.dtsi4
-rw-r--r--arch/arm/configs/apalis_imx6_defconfig1
2 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/boot/dts/imx6qdl-apalis.dtsi b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
index ab0db9bc2241..c82a52c8c3af 100644
--- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi
+++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi
@@ -895,3 +895,7 @@
non-removable;
status = "okay";
};
+
+&weim {
+ status = "disabled"; /* weim signals not accessible on i.MX6 */
+};
diff --git a/arch/arm/configs/apalis_imx6_defconfig b/arch/arm/configs/apalis_imx6_defconfig
index 04ec38f3e5fd..f647b91abd8d 100644
--- a/arch/arm/configs/apalis_imx6_defconfig
+++ b/arch/arm/configs/apalis_imx6_defconfig
@@ -87,7 +87,6 @@ CONFIG_DEVTMPFS_MOUNT=y
# CONFIG_STANDALONE is not set
CONFIG_CMA=y
CONFIG_CMA_SIZE_MBYTES=256
-CONFIG_IMX_WEIM=y
CONFIG_CONNECTOR=y
CONFIG_MTD=y
CONFIG_MTD_CMDLINE_PARTS=y