projects
/
linux-2.6-block.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4a2190a
)
ARM: dts: imx51-zii-rdu1: Disable internal watchdog
author
Fabio Estevam
<fabio.estevam@nxp.com>
Wed, 11 Jul 2018 21:34:27 +0000
(18:34 -0300)
committer
Shawn Guo
<shawnguo@kernel.org>
Tue, 17 Jul 2018 02:56:18 +0000
(10:56 +0800)
imx51-zii-rdu1 has an external watchdog in the environment
microcontroller, so disable the internal one.
This aligns with what was done in commit
7055f714032c
("ARM: dts:
imx6: RDU2: disable internal watchdog") for imx6 rdu2 board.
Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com>
Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/imx51-zii-rdu1.dts
patch
|
blob
|
blame
|
history
diff --git
a/arch/arm/boot/dts/imx51-zii-rdu1.dts
b/arch/arm/boot/dts/imx51-zii-rdu1.dts
index aede622c47a5fb3c4fb3eb67477456ff6f627f0c..1217e196b93abebe070f58a32b220a3120980529 100644
(file)
--- a/
arch/arm/boot/dts/imx51-zii-rdu1.dts
+++ b/
arch/arm/boot/dts/imx51-zii-rdu1.dts
@@
-668,6
+668,10
@@
status = "okay";
};
+&wdog1 {
+ status = "disabled";
+};
+
&iomuxc {
pinctrl_ampgpio: ampgpiogrp {
fsl,pins = <