diff options
| author | Robby Cai <r63905@freescale.com> | 2014-12-03 11:24:32 +0800 |
|---|---|---|
| committer | Nitin Garg <nitin.garg@freescale.com> | 2015-01-15 21:18:37 -0600 |
| commit | 13644f1a1ab637b167b9e8231a4e40b7b55a8776 (patch) | |
| tree | 0bc336e68ea8fababbdcea52905833433ee7778a /arch/arm/boot | |
| parent | 8ff98598dfd3625e7b39124294ebcf21bfb2a8d8 (diff) | |
MLK-9958 ARM: dts: imx6sx-19x19-arm2: add new DTS file to enable LCDIF1
Due to the CSI and LCDIF1 shares the same pin MX6SX_PAD_LCD1_ENABLE,
we need to disable CSI.
Signed-off-by: Robby Cai <r63905@freescale.com>
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/Makefile | 1 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts | 19 |
2 files changed, 20 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile index 97be1c1cc73a..cd6caebad198 100644 --- a/arch/arm/boot/dts/Makefile +++ b/arch/arm/boot/dts/Makefile @@ -193,6 +193,7 @@ dtb-$(CONFIG_ARCH_MXC) += \ imx6sx-17x17-arm2-mlb.dtb \ imx6sx-19x19-arm2.dtb \ imx6sx-19x19-arm2-csi.dtb \ + imx6sx-19x19-arm2-lcdif1.dtb \ imx6sx-19x19-arm2-gpmi-weim.dtb \ imx6sx-sdb.dtb \ imx6sx-sabreauto.dtb \ diff --git a/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts new file mode 100644 index 000000000000..cf8cb57589f3 --- /dev/null +++ b/arch/arm/boot/dts/imx6sx-19x19-arm2-lcdif1.dts @@ -0,0 +1,19 @@ +/* + * 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" + +&i2c2 { + ov564x: ov564x@3c { + status = "disabled"; + }; +}; + +&lcdif1 { + status = "okay"; +}; |