diff options
| author | Jason Liu <r64343@freescale.com> | 2015-09-02 14:20:36 +0800 |
|---|---|---|
| committer | Jason Liu <r64343@freescale.com> | 2015-09-02 14:24:26 +0800 |
| commit | c174bc9fad3cd25de814e0505919a7de38b078b2 (patch) | |
| tree | f713c6da42020b5bc5cb3390ab65bbd78f6c7ac6 | |
| parent | 58c3b2b0a8a2e6720cce5083d19bb943b2764980 (diff) | |
MLK-11489 i.MX6UL: Add the 9x9-evk-csi.dts for the camera module
This patch add the 9x9-evk-csi.dts for the camera module
since the csi-camera has the pin conflict with sim module,
this patch is to enable the camera module while disable sim.
Signed-off-by: Jason Liu <r64343@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-9x9-evk-csi.dts | 22 |
2 files changed, 23 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 5131734b4f7d..5e19c92dc309 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -228,6 +228,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6ul-14x14-evk-csi.dtb \ imx6ul-9x9-evk.dtb \ imx6ul-9x9-evk-ldo.dtb \ + imx6ul-9x9-evk-csi.dtb \ vf610-cosmic.dtb \ imx6sx-sdb-emmc.dtb \ imx6sx-sdb-m4.dtb \ diff --git a/arch/arm/boot/dts/imx6ul-9x9-evk-csi.dts b/arch/arm/boot/dts/imx6ul-9x9-evk-csi.dts new file mode 100644 index 000000000000..21778070fb18 --- /dev/null +++ b/arch/arm/boot/dts/imx6ul-9x9-evk-csi.dts @@ -0,0 +1,22 @@ +/* + * Copyright (C) 2015 Freescale Semiconductor, Inc. + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2 as + * published by the Free Software Foundation. + */ + +#include "imx6ul-9x9-evk.dts" + + +&csi { + status = "okay"; +}; + +&ov5640 { + status = "okay"; +}; + +&sim2 { + status = "disabled"; +}; |