diff for duplicates of <534ED41A.3000202@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5ceeb66..909e4cc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -20,24 +20,24 @@ Applied to berlin/dt. > cache-level = <2>; > }; > -> + scu: snoop-control-unit at ad0000 { +> + scu: snoop-control-unit@ad0000 { > + compatible = "arm,cortex-a9-scu"; > + reg = <0xad0000 0x58>; > + }; > + -> gic: interrupt-controller at ad1000 { +> gic: interrupt-controller@ad1000 { > compatible = "arm,cortex-a9-gic"; > reg = <0xad1000 0x1000>, <0xad0100 0x0100>; > @@ -176,6 +181,11 @@ > }; > }; > -> + generic-regs at ea0184 { +> + generic-regs@ea0184 { > + compatible = "marvell,berlin-generic-regs", "syscon"; > + reg = <0xea0184 0x10>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi @@ -48,24 +48,24 @@ Applied to berlin/dt. > cache-level = <2>; > }; > -> + scu: snoop-control-unit at ad0000 { +> + scu: snoop-control-unit@ad0000 { > + compatible = "arm,cortex-a9-scu"; > + reg = <0xad0000 0x58>; > + }; > + -> local-timer at ad0600 { +> local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > @@ -183,6 +188,11 @@ > }; > }; > -> + generic-regs at ea0110 { +> + generic-regs@ea0110 { > + compatible = "marvell,berlin-generic-regs", "syscon"; > + reg = <0xea0110 0x10>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/a/content_digest b/N1/content_digest index 03c6c59..edb93f0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,19 @@ "ref\01395347986-30203-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01395347986-30203-2-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: berlin: add scu and chipctrl device nodes for BG2/BG2Q\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: berlin: add scu and chipctrl device nodes for BG2/BG2Q\0" "Date\0Wed, 16 Apr 2014 21:03:54 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "Cc\0Mark Rutland <mark.rutland@arm.com>" + devicetree@vger.kernel.org + Russell King <linux@arm.linux.org.uk> + Pawel Moll <pawel.moll@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Antoine Tenart <antoine.tenart@free-electrons.com> + linux-kernel@vger.kernel.org + Rob Herring <robh+dt@kernel.org> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + Kumar Gala <galak@codeaurora.org> + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On 03/20/2014 09:39 PM, Sebastian Hesselbarth wrote:\n" @@ -28,24 +38,24 @@ "> \t\t\tcache-level = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\tscu: snoop-control-unit at ad0000 {\n" + "> +\t\tscu: snoop-control-unit@ad0000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "> +\t\t\treg = <0xad0000 0x58>;\n" "> +\t\t};\n" "> +\n" - "> \t\tgic: interrupt-controller at ad1000 {\n" + "> \t\tgic: interrupt-controller@ad1000 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> \t\t\treg = <0xad1000 0x1000>, <0xad0100 0x0100>;\n" "> @@ -176,6 +181,11 @@\n" "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tgeneric-regs at ea0184 {\n" + "> +\t\tgeneric-regs@ea0184 {\n" "> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n" "> +\t\t\treg = <0xea0184 0x10>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi\n" @@ -56,26 +66,26 @@ "> \t\t\tcache-level = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\tscu: snoop-control-unit at ad0000 {\n" + "> +\t\tscu: snoop-control-unit@ad0000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "> +\t\t\treg = <0xad0000 0x58>;\n" "> +\t\t};\n" "> +\n" - "> \t\tlocal-timer at ad0600 {\n" + "> \t\tlocal-timer@ad0600 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> \t\t\treg = <0xad0600 0x20>;\n" "> @@ -183,6 +188,11 @@\n" "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tgeneric-regs at ea0110 {\n" + "> +\t\tgeneric-regs@ea0110 {\n" "> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n" "> +\t\t\treg = <0xea0110 0x10>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" > -606ee6e04c87614d3141b24b8d65a339e9d16b7338381c9a8dfac3b763a0528b +34fce11ff14e5b1e2376fb6676a3cb32092bb787d561bf99008f7cf61cdecfbf
diff --git a/a/1.txt b/N2/1.txt index 5ceeb66..909e4cc 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -20,24 +20,24 @@ Applied to berlin/dt. > cache-level = <2>; > }; > -> + scu: snoop-control-unit at ad0000 { +> + scu: snoop-control-unit@ad0000 { > + compatible = "arm,cortex-a9-scu"; > + reg = <0xad0000 0x58>; > + }; > + -> gic: interrupt-controller at ad1000 { +> gic: interrupt-controller@ad1000 { > compatible = "arm,cortex-a9-gic"; > reg = <0xad1000 0x1000>, <0xad0100 0x0100>; > @@ -176,6 +181,11 @@ > }; > }; > -> + generic-regs at ea0184 { +> + generic-regs@ea0184 { > + compatible = "marvell,berlin-generic-regs", "syscon"; > + reg = <0xea0184 0x10>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi @@ -48,24 +48,24 @@ Applied to berlin/dt. > cache-level = <2>; > }; > -> + scu: snoop-control-unit at ad0000 { +> + scu: snoop-control-unit@ad0000 { > + compatible = "arm,cortex-a9-scu"; > + reg = <0xad0000 0x58>; > + }; > + -> local-timer at ad0600 { +> local-timer@ad0600 { > compatible = "arm,cortex-a9-twd-timer"; > reg = <0xad0600 0x20>; > @@ -183,6 +188,11 @@ > }; > }; > -> + generic-regs at ea0110 { +> + generic-regs@ea0110 { > + compatible = "marvell,berlin-generic-regs", "syscon"; > + reg = <0xea0110 0x10>; > + }; > + -> apb at fc0000 { +> apb@fc0000 { > compatible = "simple-bus"; > #address-cells = <1>; > diff --git a/a/content_digest b/N2/content_digest index 03c6c59..07e4862 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,20 @@ "ref\01395347986-30203-1-git-send-email-sebastian.hesselbarth@gmail.com\0" "ref\01395347986-30203-2-git-send-email-sebastian.hesselbarth@gmail.com\0" - "From\0sebastian.hesselbarth@gmail.com (Sebastian Hesselbarth)\0" - "Subject\0[PATCH 1/2] ARM: berlin: add scu and chipctrl device nodes for BG2/BG2Q\0" + "From\0Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>\0" + "Subject\0Re: [PATCH 1/2] ARM: berlin: add scu and chipctrl device nodes for BG2/BG2Q\0" "Date\0Wed, 16 Apr 2014 21:03:54 +0200\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0unlisted-recipients:; (no To-header on input)\0" + "Cc\0Rob Herring <robh+dt@kernel.org>" + Pawel Moll <pawel.moll@arm.com> + Mark Rutland <mark.rutland@arm.com> + Ian Campbell <ijc+devicetree@hellion.org.uk> + Kumar Gala <galak@codeaurora.org> + Russell King <linux@arm.linux.org.uk> + Antoine Tenart <antoine.tenart@free-electrons.com> + Alexandre Belloni <alexandre.belloni@free-electrons.com> + devicetree@vger.kernel.org + linux-arm-kernel@lists.infradead.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "On 03/20/2014 09:39 PM, Sebastian Hesselbarth wrote:\n" @@ -28,24 +39,24 @@ "> \t\t\tcache-level = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\tscu: snoop-control-unit at ad0000 {\n" + "> +\t\tscu: snoop-control-unit@ad0000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "> +\t\t\treg = <0xad0000 0x58>;\n" "> +\t\t};\n" "> +\n" - "> \t\tgic: interrupt-controller at ad1000 {\n" + "> \t\tgic: interrupt-controller@ad1000 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-gic\";\n" "> \t\t\treg = <0xad1000 0x1000>, <0xad0100 0x0100>;\n" "> @@ -176,6 +181,11 @@\n" "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tgeneric-regs at ea0184 {\n" + "> +\t\tgeneric-regs@ea0184 {\n" "> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n" "> +\t\t\treg = <0xea0184 0x10>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" "> diff --git a/arch/arm/boot/dts/berlin2q.dtsi b/arch/arm/boot/dts/berlin2q.dtsi\n" @@ -56,26 +67,26 @@ "> \t\t\tcache-level = <2>;\n" "> \t\t};\n" "> \n" - "> +\t\tscu: snoop-control-unit at ad0000 {\n" + "> +\t\tscu: snoop-control-unit@ad0000 {\n" "> +\t\t\tcompatible = \"arm,cortex-a9-scu\";\n" "> +\t\t\treg = <0xad0000 0x58>;\n" "> +\t\t};\n" "> +\n" - "> \t\tlocal-timer at ad0600 {\n" + "> \t\tlocal-timer@ad0600 {\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> \t\t\treg = <0xad0600 0x20>;\n" "> @@ -183,6 +188,11 @@\n" "> \t\t\t};\n" "> \t\t};\n" "> \n" - "> +\t\tgeneric-regs at ea0110 {\n" + "> +\t\tgeneric-regs@ea0110 {\n" "> +\t\t\tcompatible = \"marvell,berlin-generic-regs\", \"syscon\";\n" "> +\t\t\treg = <0xea0110 0x10>;\n" "> +\t\t};\n" "> +\n" - "> \t\tapb at fc0000 {\n" + "> \t\tapb@fc0000 {\n" "> \t\t\tcompatible = \"simple-bus\";\n" "> \t\t\t#address-cells = <1>;\n" > -606ee6e04c87614d3141b24b8d65a339e9d16b7338381c9a8dfac3b763a0528b +82c90d507df927fb113fabf430f25e2643f116ab922ffa0743d7f2273dc91296
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.