git.samba.org
/
sfrench
/
cifs-2.6.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
555d111
)
ARM: dts: imx51-zii-scu2-mezz: Disable the internal watchdog
author
Fabio Estevam
<festevam@gmail.com>
Tue, 11 Sep 2018 20:10:45 +0000
(17:10 -0300)
committer
Shawn Guo
<shawnguo@kernel.org>
Wed, 26 Sep 2018 02:19:22 +0000
(10:19 +0800)
imx51-zii-scu2-mezz has an external watchdog in the environment
microcontroller, so disable the internal one.
Signed-off-by: Fabio Estevam <festevam@gmail.com>
Acked-by: Andrey Smirnov <andrew.smirnov@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
patch
|
blob
|
history
diff --git
a/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
b/arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
index fc4a32ce2a23df35968a709c836acc59e74cfaa7..243d1c8cab0a13c52f80593e7dec76df104389cd 100644
(file)
--- a/
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
+++ b/
arch/arm/boot/dts/imx51-zii-scu2-mezz.dts
@@
-346,6
+346,10
@@
status = "disabled";
};
+&wdog1 {
+ status = "disabled";
+};
+
&iomuxc {
pinctrl_ecspi1: ecspi1grp {
fsl,pins = <