diff for duplicates of <1577993276-2184-5-git-send-email-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index bcf819f..40ac43b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,19 +10,19 @@ diff --git a/arch/arm/boot/dts/aspeed-g6.dtsi b/arch/arm/boot/dts/aspeed-g6.dtsi index 5f6142d99eeb..ead336e93a12 100644 --- a/arch/arm/boot/dts/aspeed-g6.dtsi +++ b/arch/arm/boot/dts/aspeed-g6.dtsi -@@ -288,6 +288,20 @@ smp-memram at 180 { +@@ -288,6 +288,20 @@ smp-memram@180 { compatible = "aspeed,ast2600-smpmem"; reg = <0x180 0x40>; }; + -+ scu_ic0: interrupt-controller at 0 { ++ scu_ic0: interrupt-controller@0 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic0"; + interrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>; + interrupt-controller; + }; + -+ scu_ic1: interrupt-controller at 1 { ++ scu_ic1: interrupt-controller@1 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2600-scu-ic1"; + interrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>; @@ -30,6 +30,6 @@ index 5f6142d99eeb..ead336e93a12 100644 + }; }; - rng: hwrng at 1e6e2524 { + rng: hwrng@1e6e2524 { -- 2.24.0 diff --git a/a/content_digest b/N1/content_digest index e6fdec8..a91be80 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,6 +3,16 @@ "Subject\0[PATCH v4 04/12] ARM: dts: aspeed: ast2600: Add SCU interrupt controllers\0" "Date\0Thu, 2 Jan 2020 13:27:48 -0600\0" "To\0linux-aspeed@lists.ozlabs.org\0" + "Cc\0linux-kernel@vger.kernel.org" + devicetree@vger.kernel.org + mark.rutland@arm.com + jason@lakedaemon.net + maz@kernel.org + robh+dt@kernel.org + tglx@linutronix.de + joel@jms.id.au + andrew@aj.id.au + " eajames@linux.ibm.com\0" "\00:1\0" "b\0" "Add nodes for the interrupt controllers provided by the SCU.\n" @@ -17,19 +27,19 @@ "index 5f6142d99eeb..ead336e93a12 100644\n" "--- a/arch/arm/boot/dts/aspeed-g6.dtsi\n" "+++ b/arch/arm/boot/dts/aspeed-g6.dtsi\n" - "@@ -288,6 +288,20 @@ smp-memram at 180 {\n" + "@@ -288,6 +288,20 @@ smp-memram@180 {\n" " \t\t\t\t\tcompatible = \"aspeed,ast2600-smpmem\";\n" " \t\t\t\t\treg = <0x180 0x40>;\n" " \t\t\t\t};\n" "+\n" - "+\t\t\t\tscu_ic0: interrupt-controller at 0 {\n" + "+\t\t\t\tscu_ic0: interrupt-controller@0 {\n" "+\t\t\t\t\t#interrupt-cells = <1>;\n" "+\t\t\t\t\tcompatible = \"aspeed,ast2600-scu-ic0\";\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 12 IRQ_TYPE_LEVEL_HIGH>;\n" "+\t\t\t\t\tinterrupt-controller;\n" "+\t\t\t\t};\n" "+\n" - "+\t\t\t\tscu_ic1: interrupt-controller at 1 {\n" + "+\t\t\t\tscu_ic1: interrupt-controller@1 {\n" "+\t\t\t\t\t#interrupt-cells = <1>;\n" "+\t\t\t\t\tcompatible = \"aspeed,ast2600-scu-ic1\";\n" "+\t\t\t\t\tinterrupts = <GIC_SPI 41 IRQ_TYPE_LEVEL_HIGH>;\n" @@ -37,8 +47,8 @@ "+\t\t\t\t};\n" " \t\t\t};\n" " \n" - " \t\t\trng: hwrng at 1e6e2524 {\n" + " \t\t\trng: hwrng@1e6e2524 {\n" "-- \n" 2.24.0 -01620aa0a1ad2f3bb91cb85aa9c86f665913b77e363b755db1e2822ff7cd8582 +626d1ade6be6a6ef89dcd93b027b1c224cbcb7104b6464de01c67b8f080aae25
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.