diff for duplicates of <20221101205338.577427-3-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index fd71554..94da8cb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,21 +10,21 @@ diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index 04f98d1dbb97..b4b98bf38e48 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi -@@ -410,18 +410,21 @@ wdt1: watchdog at 1e785000 { +@@ -410,18 +410,21 @@ wdt1: watchdog@1e785000 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785000 0x20>; clocks = <&syscon ASPEED_CLK_APB>; + interrupts = <27>; }; - wdt2: watchdog at 1e785020 { + wdt2: watchdog@1e785020 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785020 0x20>; clocks = <&syscon ASPEED_CLK_APB>; + interrupts = <27>; }; - wdt3: watchdog at 1e785040 { + wdt3: watchdog@1e785040 { compatible = "aspeed,ast2500-wdt"; reg = <0x1e785040 0x20>; clocks = <&syscon ASPEED_CLK_APB>; @@ -36,29 +36,29 @@ diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index ebbcfe445d9c..d9379fd7b1c2 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi -@@ -539,23 +539,27 @@ uart5: serial at 1e784000 { +@@ -539,23 +539,27 @@ uart5: serial@1e784000 { - wdt1: watchdog at 1e785000 { + wdt1: watchdog@1e785000 { compatible = "aspeed,ast2600-wdt"; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; reg = <0x1e785000 0x40>; }; - wdt2: watchdog at 1e785040 { + wdt2: watchdog@1e785040 { compatible = "aspeed,ast2600-wdt"; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; reg = <0x1e785040 0x40>; status = "disabled"; }; - wdt3: watchdog at 1e785080 { + wdt3: watchdog@1e785080 { compatible = "aspeed,ast2600-wdt"; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; reg = <0x1e785080 0x40>; status = "disabled"; }; - wdt4: watchdog at 1e7850c0 { + wdt4: watchdog@1e7850c0 { compatible = "aspeed,ast2600-wdt"; + interrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>; reg = <0x1e7850C0 0x40>; diff --git a/a/content_digest b/N1/content_digest index 2707084..08ae736 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,14 @@ "From\0Eddie James <eajames@linux.ibm.com>\0" "Subject\0[PATCH v2 2/2] ARM: dts: aspeed: Setup watchdog pre-timeout interrupt\0" "Date\0Tue, 1 Nov 2022 15:53:38 -0500\0" - "To\0linux-aspeed@lists.ozlabs.org\0" + "To\0linux-watchdog@vger.kernel.org\0" + "Cc\0wim@linux-watchdog.org" + linux@roeck-us.net + joel@jms.id.au + andrew@aj.id.au + linux-aspeed@lists.ozlabs.org + linux-kernel@vger.kernel.org + " Eddie James <eajames@linux.ibm.com>\0" "\00:1\0" "b\0" "Specify the interrupt lines for the base SOCs that support it.\n" @@ -17,21 +24,21 @@ "index 04f98d1dbb97..b4b98bf38e48 100644\n" "--- a/arch/arm/boot/dts/aspeed-g5.dtsi\n" "+++ b/arch/arm/boot/dts/aspeed-g5.dtsi\n" - "@@ -410,18 +410,21 @@ wdt1: watchdog at 1e785000 {\n" + "@@ -410,18 +410,21 @@ wdt1: watchdog@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n" " \t\t\t\treg = <0x1e785000 0x20>;\n" " \t\t\t\tclocks = <&syscon ASPEED_CLK_APB>;\n" "+\t\t\t\tinterrupts = <27>;\n" " \t\t\t};\n" " \n" - " \t\t\twdt2: watchdog at 1e785020 {\n" + " \t\t\twdt2: watchdog@1e785020 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n" " \t\t\t\treg = <0x1e785020 0x20>;\n" " \t\t\t\tclocks = <&syscon ASPEED_CLK_APB>;\n" "+\t\t\t\tinterrupts = <27>;\n" " \t\t\t};\n" " \n" - " \t\t\twdt3: watchdog at 1e785040 {\n" + " \t\t\twdt3: watchdog@1e785040 {\n" " \t\t\t\tcompatible = \"aspeed,ast2500-wdt\";\n" " \t\t\t\treg = <0x1e785040 0x20>;\n" " \t\t\t\tclocks = <&syscon ASPEED_CLK_APB>;\n" @@ -43,29 +50,29 @@ "index ebbcfe445d9c..d9379fd7b1c2 100644\n" "--- a/arch/arm/boot/dts/aspeed-g6.dtsi\n" "+++ b/arch/arm/boot/dts/aspeed-g6.dtsi\n" - "@@ -539,23 +539,27 @@ uart5: serial at 1e784000 {\n" + "@@ -539,23 +539,27 @@ uart5: serial@1e784000 {\n" " \n" - " \t\t\twdt1: watchdog at 1e785000 {\n" + " \t\t\twdt1: watchdog@1e785000 {\n" " \t\t\t\tcompatible = \"aspeed,ast2600-wdt\";\n" "+\t\t\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t\t\treg = <0x1e785000 0x40>;\n" " \t\t\t};\n" " \n" - " \t\t\twdt2: watchdog at 1e785040 {\n" + " \t\t\twdt2: watchdog@1e785040 {\n" " \t\t\t\tcompatible = \"aspeed,ast2600-wdt\";\n" "+\t\t\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t\t\treg = <0x1e785040 0x40>;\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - " \t\t\twdt3: watchdog at 1e785080 {\n" + " \t\t\twdt3: watchdog@1e785080 {\n" " \t\t\t\tcompatible = \"aspeed,ast2600-wdt\";\n" "+\t\t\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t\t\treg = <0x1e785080 0x40>;\n" " \t\t\t\tstatus = \"disabled\";\n" " \t\t\t};\n" " \n" - " \t\t\twdt4: watchdog at 1e7850c0 {\n" + " \t\t\twdt4: watchdog@1e7850c0 {\n" " \t\t\t\tcompatible = \"aspeed,ast2600-wdt\";\n" "+\t\t\t\tinterrupts = <GIC_SPI 24 IRQ_TYPE_LEVEL_HIGH>;\n" " \t\t\t\treg = <0x1e7850C0 0x40>;\n" @@ -74,4 +81,4 @@ "-- \n" 2.31.1 -e6e3dbf623cab1796590b58d4f3b515cd346129e0529e7c2b724e474c3684e56 +af717ffb3b1e1ee67f1e9270982280ab95e1cde253c3cf57d5f0b621f6d01b04
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.