ARM: dts: imx6ul-kontron: Move watchdog from Kontron i.MX6UL/ULL board to SoM (04a2c051) · Commits · 戴 / test

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: ("ARM: dts: imx6ul-kontron-n6310: Add Kontron i.MX6UL N6310 SoM and boards") Cc: stable@vger.kernel.org Signed-off-by:

Frieder Schrempf <frieder.schrempf@kontron.de> Signed-off-by:

Shawn Guo <shawnguo@kernel.org>

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

+0 −13

Original line number	Diff line number	Diff line
		@@ -232,13 +232,6 @@
		status = "okay";
		};

		&wdog1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_wdog>;
		fsl,ext-reset-output;
		status = "okay";
		};

		&iomuxc {
		pinctrl-0 = <&pinctrl_reset_out &pinctrl_gpio>;

		@@ -409,10 +402,4 @@
		MX6UL_PAD_NAND_DATA03__USDHC2_DATA3 0x170f9
		>;
		};

		pinctrl_wdog: wdoggrp {
		fsl,pins = <
		MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x30b0
		>;
		};
		};

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

+13 −0

Original line number	Diff line number	Diff line
		@@ -57,6 +57,13 @@
		status = "okay";
		};

		&wdog1 {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_wdog>;
		fsl,ext-reset-output;
		status = "okay";
		};

		&iomuxc {
		pinctrl-names = "default";
		pinctrl-0 = <&pinctrl_reset_out>;
		@@ -106,4 +113,10 @@
		MX6UL_PAD_SNVS_TAMPER9__GPIO5_IO09 0x1b0b0
		>;
		};

		pinctrl_wdog: wdoggrp {
		fsl,pins = <
		MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x30b0
		>;
		};
		};

Admin message