diff options
| author | Frieder Schrempf <frieder.schrempf@kontron.de> | 2020-05-28 16:43:42 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2020-06-23 05:39:21 +0200 |
| commit | 04a2c05179b732a4c097f0a9c701ef4c9a37e1e3 (patch) | |
| tree | 43e56c32e0e22ce75c2b9e2def95979d9a8168bc /arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | |
| parent | arm64: dts: imx8mm-beacon: Fix voltages on LDO1 and LDO2 (diff) | |
| download | linux-04a2c05179b732a4c097f0a9c701ef4c9a37e1e3.tar.xz linux-04a2c05179b732a4c097f0a9c701ef4c9a37e1e3.zip | |
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: 1ea4b76cdfde ("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>
Diffstat (limited to 'arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi')
| -rw-r--r-- | arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi index a17af4d9bfdf..fc316408721d 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi @@ -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 + >; + }; }; |