diff options
| author | Max Krummenacher <max.krummenacher@toradex.com> | 2015-07-23 14:17:19 +0200 |
|---|---|---|
| committer | Marcel Ziswiler <marcel.ziswiler@toradex.com> | 2017-01-10 23:11:47 +0100 |
| commit | 15e202dcc5bc541714c270fe7532c1b772d358e5 (patch) | |
| tree | fc88786a61138a7fc9f334ad063a702859c5fabc /arch | |
| parent | 78d5ad86be5e54f6644d0d77d59ac11cea5794f2 (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.
Signed-off-by: Max Krummenacher <max.krummenacher@toradex.com>
Acked-by: Marcel Ziswiler <marcel.ziswiler@toradex.com>
(cherry picked from commit 6c2f7b22f5aa9572d35a3ddd7d14b653cf606550)
(cherry picked from commit cc67148debb52395f31dfe8f18ff5afc736a0111)
Conflicts:
arch/arm/configs/apalis_imx6_defconfig
Diffstat (limited to 'arch')
| -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 8e84c0f69b72..a0c34a254563 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 |