[PATCH v2 1/2] arm64: dts: fsl: imx8mq: add watchdog devices

[PATCH v2 1/2] arm64: dts: fsl: imx8mq: add watchdog devices

[Baruch Siach]

Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
  * Rename nodes name prefix to 'watchdog@'
  * Add fsl,imx8mq-wdt to compatible list
---
 arch/arm64/boot/dts/freescale/imx8mq.dtsi | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mq.dtsi b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
index 50ed302d299a..8a83218a31e5 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mq.dtsi
@@ -250,6 +250,30 @@
 				              "clk_ext1", "clk_ext2",
 				              "clk_ext3", "clk_ext4";
 			};
+
+			wdog1: watchdog at 30280000 {
+				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
+				reg = <0x30280000 0x10000>;
+				interrupts = <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clk IMX8MQ_CLK_WDOG1_ROOT>;
+				status = "disabled";
+			};
+
+			wdog2: watchdog at 30290000 {
+				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
+				reg = <0x30290000 0x10000>;
+				interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clk IMX8MQ_CLK_WDOG2_ROOT>;
+				status = "disabled";
+			};
+
+			wdog3: watchdog at 302a0000 {
+				compatible = "fsl,imx8mq-wdt", "fsl,imx21-wdt";
+				reg = <0x302a0000 0x10000>;
+				interrupts = <GIC_SPI 10 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&clk IMX8MQ_CLK_WDOG3_ROOT>;
+				status = "disabled";
+			};
 		};
 
 		bus at 30400000 { /* AIPS2 */
-- 
2.15.1

[PATCH v2 2/2] arm64: dts: fsl: imx8mq-evk: enable watchdog

[Baruch Siach]

The external nWDOG signal connects to the EVK board reset circuit.

Tested on the i.MX8MQ EVK rev B3.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2:
  * Rename the fsl,pins to pinmux
  * Drop input-schmitt-enable
---
 arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
index c0e5ee5d6243..15be7ee9c9e4 100644
--- a/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
+++ b/arch/arm64/boot/dts/freescale/imx8mq-evk.dts
@@ -170,6 +170,13 @@
 	status = "okay";
 };
 
+&wdog1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdog>;
+	fsl,ext-reset-output;
+	status = "okay";
+};
+
 &iomuxc {
 	pinctrl_fec1_mdc: fec1mdcgrp {
 		pinmux = <MX8MQ_IOMUXC_ENET_MDC_ENET1_MDC>;
@@ -402,4 +409,11 @@
 		bias-pull-up;
 		input-schmitt-enable;
 	};
+
+	pinctrl_wdog: wdoggrp {
+		pinmux = <MX8MQ_IOMUXC_GPIO1_IO02_WDOG1_WDOG_B>;
+		drive-strength = <6>;
+		slew-rate = <0>;
+		bias-pull-up;
+	};
 };
-- 
2.15.1

[PATCH v2 2/2] arm64: dts: fsl: imx8mq-evk: enable watchdog

[Fabio Estevam]

On Wed, Feb 7, 2018 at 1:12 PM, Baruch Siach <baruch@tkos.co.il> wrote:
> The external nWDOG signal connects to the EVK board reset circuit.
>
> Tested on the i.MX8MQ EVK rev B3.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

There is an ongoing discussion whether we are going to adopt this
generic pinctrl scheme or the old i.MX pinctrl scheme on i.MX8MQ.

Anyway this patch looks good:

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>

[PATCH v2 2/2] arm64: dts: fsl: imx8mq-evk: enable watchdog

[Lucas Stach]

Am Mittwoch, den 07.02.2018, 13:43 -0200 schrieb Fabio Estevam:
> On Wed, Feb 7, 2018 at 1:12 PM, Baruch Siach <baruch@tkos.co.il>
> wrote:
> > The external nWDOG signal connects to the EVK board reset circuit.
> > 
> > Tested on the i.MX8MQ EVK rev B3.
> > 
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> 
> There is an ongoing discussion whether we are going to adopt this
> generic pinctrl scheme or the old i.MX pinctrl scheme on i.MX8MQ.

Yep, ignoring this discussion, patch looks good. I've just tested this
on my MX8_EVK A1 board and it seems to work fine.

Tested-by: Lucas Stach <l.stach@pengutronix.de>

[PATCH v2 1/2] arm64: dts: fsl: imx8mq: add watchdog devices

[Fabio Estevam]

On Wed, Feb 7, 2018 at 1:12 PM, Baruch Siach <baruch@tkos.co.il> wrote:
> Reviewed-by: Lucas Stach <l.stach@pengutronix.de>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>

Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>