diff options
| author | Robby Cai <r63905@freescale.com> | 2014-11-28 21:25:05 +0800 |
|---|---|---|
| committer | Robby Cai <r63905@freescale.com> | 2014-12-01 11:39:57 +0800 |
| commit | 8c3246ca837f3ee7756b6cd2149627cbc0ca662f (patch) | |
| tree | 48c8bd8598befcaab8908f8b3079352fa5d2fbfa /arch/arm | |
| parent | 10eee03c68c0fc934c03ea607afef719d91f5e00 (diff) | |
MLK-9934 ARM: dts: imx6sx-sdb: disable PWM3 when not used for LCD backlight
Previously PWM3 is always enabled even when the LCDIF1 is not used.
This is not correct, since the default DTS file enables CSI while
disable LCDIF1 due to pin conflict between CSI and LCDIF1 on imx6sx-sdb board.
This patch fixed it.
Signed-off-by: Robby Cai <r63905@freescale.com>
(cherry picked from commit f77c15ccab9e8a68870048d4964b2dd15b3d4c0c)
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts | 4 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx6sx-sdb.dts | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts index b0661436ad23..91da37572421 100644 --- a/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts +++ b/arch/arm/boot/dts/imx6sx-sdb-lcdif1.dts @@ -9,6 +9,10 @@ #include "imx6sx-sdb.dts" / { + backlight1 { + status = "enabled"; + }; + csi1_v4l2_cap { status = "disabled"; }; diff --git a/arch/arm/boot/dts/imx6sx-sdb.dts b/arch/arm/boot/dts/imx6sx-sdb.dts index b4ed352b36ef..02c99958fed2 100644 --- a/arch/arm/boot/dts/imx6sx-sdb.dts +++ b/arch/arm/boot/dts/imx6sx-sdb.dts @@ -21,6 +21,7 @@ brightness-levels = <0 4 8 16 32 64 128 255>; default-brightness-level = <6>; fb-names = "mxs-lcdif0"; + status = "disabled"; }; backlight2 { |