diff options
| author | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-06-13 12:05:10 +0800 |
|---|---|---|
| committer | Shengjiu Wang <shengjiu.wang@freescale.com> | 2016-06-13 12:16:33 +0800 |
| commit | 09858ff8594f1248cda659893e25fcea0176f057 (patch) | |
| tree | 390ea7c9b28ec25072a9209d690ac1bae07a76aa /arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts | |
| parent | c49e6bd08727c6e0d068618a2ed20e9afb048e56 (diff) | |
MLK-12900-1: ARM: dts: pin confict for spdif and wdog
Disable wdog in wm8958.dts for conflict with spdif
Signed-off-by: Shengjiu Wang <shengjiu.wang@freescale.com>
(cherry picked from commit 71863bcd34420384f5ef5eeecc2c8ca45389db24)
Diffstat (limited to 'arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts')
| -rw-r--r-- | arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts index fbbc648bb933..8ff24dab5a2f 100644 --- a/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts +++ b/arch/arm/boot/dts/imx6ull-14x14-ddr3-arm2-wm8958.dts @@ -149,3 +149,7 @@ &usdhc2 { no-1-8-v; }; + +&wdog1 { + status = "disabled"; +}; |