diff options
| author | Sandor Yu <R01008@freescale.com> | 2014-04-11 14:47:56 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2014-04-17 21:19:14 -0500 |
| commit | 94d4e724597bce7588ec6c1dbf52395413be0b6d (patch) | |
| tree | 04dab42917a8c57bf61541db21d051581dfacb78 | |
| parent | e416178c0938531d84aa1894af26f049c8ef4baa (diff) | |
ENGR00308643 Add imx6sx-19x19-arm2-csi.dts
csi camera ov5640 pin conflict with esai and sai
in 19x19 arm2 board, add this file to resolve it.
Signed-off-by: Sandor Yu <R01008@freescale.com>
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts | 25 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2.dts | 1 |
3 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index a2333a25d850..fe08961b9084 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -141,6 +141,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6sx-17x17-arm2-ssi.dtb \ imx6sx-17x17-arm2-spdif.dtb \ imx6sx-19x19-arm2.dtb \ + imx6sx-19x19-arm2-csi.dtb \ imx6sx-19x19-arm2-lcdif1.dtb \ imx6sx-19x19-arm2-sai.dtb \ imx6sx-sdb.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts new file mode 100644 index 000000000000..e1b2c2d1b27b --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-csi.dts @@ -0,0 +1,25 @@ +/* + * Copyright (C) 2014 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 "imx6sx-19x19-arm2.dts" + +&esai { + /* pin conflict with sai */ + status = "disabled"; +}; + +&sai1 { + status = "disabled"; +}; + +&i2c2 { + ov564x: ov564x@3c { + status = "okay"; + }; +}; + diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts index 8b8db3028544..1125e943cd70 100644 --- a/arch/arm/boot/dts/imx6sx-19x19-arm2.dts +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2.dts @@ -283,6 +283,7 @@ csi_id = <0>; mclk = <24000000>; mclk_source = <0>; + status = "disabled"; }; }; |