Message ID | 20200528144312.25980-2-frieder.schrempf@kontron.de (mailing list archive) |
---|---|
State | Mainlined |
Commit | d22a16cc92e04d053fd807ef3587e4f135e4206f |
Headers | show |
Series | [1/2] ARM: dts: Move watchdog from Kontron i.MX6UL/ULL board to SoM | expand |
On Thu, May 28, 2020 at 02:43:43PM +0000, Schrempf Frieder wrote: > From: Frieder Schrempf <frieder.schrempf@kontron.de> > > The WDOG_ANY signal is connected to the RESET_IN signal of the SoM > and baseboard. It is currently configured as push-pull, which means > that if some external device like a programmer wants to assert the > RESET_IN signal by pulling it to ground, it drives against the high > level WDOG_ANY output of the SoC. > > To fix this we set the WDOG_ANY signal to open-drain configuration. > That way we make sure that the RESET_IN can be asserted by the > watchdog as well as by external devices. > > 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> Added 'imx6ul-kontron:' to subject and applied both patches. Shawn
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 fc316408721d..61ba21a605a8 100644 --- a/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi +++ b/arch/arm/boot/dts/imx6ul-kontron-n6x1x-som-common.dtsi @@ -116,7 +116,7 @@ pinctrl_wdog: wdoggrp { fsl,pins = < - MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x30b0 + MX6UL_PAD_GPIO1_IO09__WDOG1_WDOG_ANY 0x18b0 >; }; };