Skip to content

Commit 04a2c05

Browse files
fschrempfShawn Guo
authored andcommitted
ARM: dts: imx6ul-kontron: Move watchdog from Kontron i.MX6UL/ULL board to SoM
The watchdog's WDOG_ANY signal is used to trigger a POR of the SoC, if a soft reset is issued. As the SoM hardware connects the WDOG_ANY and the POR signals, the watchdog node itself and the pin configuration should be part of the common SoM devicetree. Let's move it from the baseboard's devicetree to its proper place. Fixes: 1ea4b76 ("ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards") Cc: [email protected] Signed-off-by: Frieder Schrempf <[email protected]> Signed-off-by: Shawn Guo <[email protected]>
1 parent e353b32 commit 04a2c05

File tree

2 files changed

+13
-13
lines changed

2 files changed

+13
-13
lines changed

arch/arm/boot/dts/imx6ul-kontron-n6x1x-s.dtsi

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -232,13 +232,6 @@
232232
status = "okay";
233233
};
234234

235-
&wdog1 {
236-
pinctrl-names = "default";
237-
pinctrl-0 = <&pinctrl_wdog>;
238-
fsl,ext-reset-output;
239-
status = "okay";
240-
};
241-
242235
&iomuxc {
243236
pinctrl-0 = <&pinctrl_reset_out &pinctrl_gpio>;
244237

@@ -409,10 +402,4 @@
409402
MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9
410403
>;
411404
};
412-
413-
pinctrl_wdog: wdoggrp {
414-
fsl,pins = <
415-
MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x30b0
416-
>;
417-
};
418405
};

arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -57,6 +57,13 @@
5757
status = "okay";
5858
};
5959

60+
&wdog1 {
61+
pinctrl-names = "default";
62+
pinctrl-0 = <&pinctrl_wdog>;
63+
fsl,ext-reset-output;
64+
status = "okay";
65+
};
66+
6067
&iomuxc {
6168
pinctrl-names = "default";
6269
pinctrl-0 = <&pinctrl_reset_out>;
@@ -106,4 +113,10 @@
106113
MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
107114
>;
108115
};
116+
117+
pinctrl_wdog: wdoggrp {
118+
fsl,pins = <
119+
MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x30b0
120+
>;
121+
};
109122
};

0 commit comments

Comments
 (0)