diff options
| author | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-09-02 15:10:48 +0200 |
|---|---|---|
| committer | Thomas Petazzoni <thomas.petazzoni@free-electrons.com> | 2017-09-02 15:10:48 +0200 |
| commit | 29ace1e216d8c1a588a505c83075c1efde45b299 (patch) | |
| tree | eb6eeb5473324bbf13301cca5a53a3110454ba61 /board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch | |
| parent | 8ce27bb9fee80a406a4199657ef90e3c315e7457 (diff) | |
| parent | f80572547038373ff58d2e7a0c89f9c014d12e22 (diff) | |
| download | buildroot-29ace1e216d8c1a588a505c83075c1efde45b299.tar.gz buildroot-29ace1e216d8c1a588a505c83075c1efde45b299.zip | |
Merge branch 'next'
Diffstat (limited to 'board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch')
| -rw-r--r-- | board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch b/board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch new file mode 100644 index 0000000000..84128f58c4 --- /dev/null +++ b/board/technexion/imx7dpico/patches/linux/0002-ARM-dts-imx7d-pico-Add-watchdog-support.patch @@ -0,0 +1,49 @@ +From d1ceec2a8f6ab1b35c296c3339127adca1ace30b Mon Sep 17 00:00:00 2001 +From: Fabio Estevam <fabio.estevam@nxp.com> +Date: Tue, 23 May 2017 12:16:08 -0300 +Subject: [PATCH] ARM: dts: imx7d-pico: Add watchdog support + +imx7d-pico has the WDOG1_B pin connected to the PMIC, so add the +wdog1 node and use the 'fsl,ext-reset-output' property to +properly describe it. + +Signed-off-by: Fabio Estevam <fabio.estevam@nxp.com> +Signed-off-by: Shawn Guo <shawnguo@kernel.org> +Upstream: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=d1ceec2a8f6ab1b35c296c3339127adca1ace30b +--- + arch/arm/boot/dts/imx7d-pico.dts | 15 +++++++++++++++ + 1 file changed, 15 insertions(+) + +diff --git a/arch/arm/boot/dts/imx7d-pico.dts b/arch/arm/boot/dts/imx7d-pico.dts +index ebda3df..f874352 100644 +--- a/arch/arm/boot/dts/imx7d-pico.dts ++++ b/arch/arm/boot/dts/imx7d-pico.dts +@@ -284,6 +284,13 @@ + status = "okay"; + }; + ++&wdog1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&pinctrl_wdog>; ++ fsl,ext-reset-output; ++ status = "okay"; ++}; ++ + &iomuxc { + pinctrl_enet1: enet1grp { + fsl,pins = < +@@ -385,3 +392,11 @@ + >; + }; + }; ++ ++&iomuxc_lpsr { ++ pinctrl_wdog: wdoggrp { ++ fsl,pins = < ++ MX7D_PAD_LPSR_GPIO1_IO00__WDOD1_WDOG_B 0x74 ++ >; ++ }; ++}; +-- +2.7.4 + |
