diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-07-23 14:17:19 +0200 |
|---|---|---|
| committer | Max Krummenacher <max.krummenacher@toradex.com> | 2015-12-26 14:35:57 +0100 |
| commit | cc67148debb52395f31dfe8f18ff5afc736a0111 (patch) | |
| tree | e020981b9c92c759828a78be9e8f2accc93af04a /arch/arm | |
| parent | 379b868647e6ee83874ba07c9eb89b305c761993 (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.
(cherry picked from commit 6c2f7b22f5aa9572d35a3ddd7d14b653cf606550)
Conflicts:
arch/arm/configs/apalis_imx6_defconfig
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6qdl-apalis.dtsi | 4 | ||||
| -rw-r--r-- | arch/arm/configs/apalis_imx6_defconfig | 1 |
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 015e96072b42..96e095e67a25 100644 --- a/arch/arm/boot/dts/imx6qdl-apalis.dtsi +++ b/arch/arm/boot/dts/imx6qdl-apalis.dtsi @@ -1132,3 +1132,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 dcde2cf59aa9..98033c5b0315 100644 --- a/arch/arm/configs/apalis_imx6_defconfig +++ b/arch/arm/configs/apalis_imx6_defconfig @@ -88,7 +88,6 @@ CONFIG_DEVTMPFS_MOUNT=y # CONFIG_STANDALONE is not set CONFIG_DMA_CMA=y CONFIG_CMA_SIZE_MBYTES=320 -CONFIG_IMX_WEIM=y CONFIG_CONNECTOR=y CONFIG_MTD=y CONFIG_MTD_CMDLINE_PARTS=y |