diff options
| author | Sandor Yu <R01008@freescale.com> | 2015-02-02 13:54:23 +0800 |
|---|---|---|
| committer | Sandor Yu <R01008@freescale.com> | 2015-02-02 15:25:52 +0800 |
| commit | f4968e7b116d7db5a5867c501a164d165c487362 (patch) | |
| tree | 1be8c7fe29738d7664eaa982bb9d20dbdf0a0b8f | |
| parent | f2ed595051921d3609e8aabde66ce75ffc80efea (diff) | |
MLK-10192: dts: Move sii902x hdmi function to imx6sx sdb lcdif1 dts
-Sii902x hdmi daughter connect to lcdif1 interface,
move this function to lcdif1 dts.
-Sii902x hdmi driver share the reset pin with ov5640 driver,
one driver will been reset by the other driver,
so move sii902x reset pin configure to licdif1 dts.
Signed-off-by: Sandor Yu <R01008@freescale.com>
(cherry picked from commit 59c54859ec5b4bd319be2aec8ce034be1ecc7bf5)
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts | 12 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 4 |
2 files changed, 14 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts index 0126e24db6bb..4f3979ab94a1 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2014-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 @@ -22,6 +22,10 @@ status = "okay"; }; }; + + sii902x_reset: sii902x-reset { + status = "okay"; + }; }; &csi1 { @@ -31,3 +35,9 @@ &lcdif1 { status = "okay"; }; + +&i2c1 { + sii902x@39 { + status = "okay"; + }; +}; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index 37773bd060a6..23afc097cd0e 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -1,5 +1,5 @@ /* - * Copyright (C) 2014 Freescale Semiconductor, Inc. + * Copyright (C) 2014-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 @@ -163,6 +163,7 @@ reset-gpios = <&gpio3 27 1>; reset-delay-us = <100000>; #reset-cells = <0>; + status = "disabled"; }; }; @@ -355,6 +356,7 @@ bits-per-pixel = <32>; resets = <&sii902x_reset>; reg = <0x39>; + status = "disabled"; }; }; |