diff for duplicates of <20200109205903.27036-4-eajames@linux.ibm.com> diff --git a/a/1.txt b/N1/1.txt index 7ecaaab..06c142c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,18 +10,18 @@ diff --git a/arch/arm/boot/dts/aspeed-g5.dtsi b/arch/arm/boot/dts/aspeed-g5.dtsi index ebec0fa8baa7..1c40c8f5b431 100644 --- a/arch/arm/boot/dts/aspeed-g5.dtsi +++ b/arch/arm/boot/dts/aspeed-g5.dtsi -@@ -222,6 +222,13 @@ syscon: syscon at 1e6e2000 { +@@ -222,6 +222,13 @@ syscon: syscon@1e6e2000 { #clock-cells = <1>; #reset-cells = <1>; -+ scu_ic: interrupt-controller at 18 { ++ scu_ic: interrupt-controller@18 { + #interrupt-cells = <1>; + compatible = "aspeed,ast2500-scu-ic"; + interrupts = <21>; + interrupt-controller; + }; + - p2a: p2a-control at 2c { + p2a: p2a-control@2c { compatible = "aspeed,ast2500-p2a-ctrl"; reg = <0x2c 0x4>; -- diff --git a/a/content_digest b/N1/content_digest index a9c5f4e..bedd43e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,6 +3,16 @@ "Subject\0[PATCH v5 03/12] ARM: dts: aspeed: ast2500: Add SCU interrupt controller\0" "Date\0Thu, 9 Jan 2020 14:58:54 -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 a node for the interrupt controller provided by the SCU.\n" @@ -17,21 +27,21 @@ "index ebec0fa8baa7..1c40c8f5b431 100644\n" "--- a/arch/arm/boot/dts/aspeed-g5.dtsi\n" "+++ b/arch/arm/boot/dts/aspeed-g5.dtsi\n" - "@@ -222,6 +222,13 @@ syscon: syscon at 1e6e2000 {\n" + "@@ -222,6 +222,13 @@ syscon: syscon@1e6e2000 {\n" " \t\t\t\t#clock-cells = <1>;\n" " \t\t\t\t#reset-cells = <1>;\n" " \n" - "+\t\t\t\tscu_ic: interrupt-controller at 18 {\n" + "+\t\t\t\tscu_ic: interrupt-controller@18 {\n" "+\t\t\t\t\t#interrupt-cells = <1>;\n" "+\t\t\t\t\tcompatible = \"aspeed,ast2500-scu-ic\";\n" "+\t\t\t\t\tinterrupts = <21>;\n" "+\t\t\t\t\tinterrupt-controller;\n" "+\t\t\t\t};\n" "+\n" - " \t\t\t\tp2a: p2a-control at 2c {\n" + " \t\t\t\tp2a: p2a-control@2c {\n" " \t\t\t\t\tcompatible = \"aspeed,ast2500-p2a-ctrl\";\n" " \t\t\t\t\treg = <0x2c 0x4>;\n" "-- \n" 2.24.0 -f8957c785811832aef0097db182f74d75296e4790295875f4690f10bf9c8c5f6 +906ccc8e284d7a5d39489c67308cbf4d68a05bb2d34fe8a96fee20036fd14862
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.