diff for duplicates of <564DF7E8.7020404@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index c4b8321..ca2c791 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -14,7 +14,7 @@ On 11/19/2015 7:48 AM, Jon Mason wrote: >>> Replace current device tree dummy clocks with real clock support for >>> Broadcom Northstar Plus SoC >>> ->>> Signed-off-by: Jon Mason <jonmason@broadcom.com> +>>> Signed-off-by: Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org> >>> --- >>> arch/arm/boot/dts/bcm-nsp.dtsi | 99 ++++++++++++++++++++++++++++++++---------- >>> 1 file changed, 75 insertions(+), 24 deletions(-) @@ -63,21 +63,21 @@ Okay. >>> - cache-level = <2>; >>> - }; >>> - ->>> - gic: interrupt-controller at 19021000 { +>>> - gic: interrupt-controller@19021000 { >>> - compatible = "arm,cortex-a9-gic"; >>> - #interrupt-cells = <3>; >>> - #address-cells = <0>; >>> - interrupt-controller; >>> - reg = <0x1000 0x1000>, >>> - <0x0100 0x100>; ->>> + a9pll: arm_clk at 19000000 { +>>> + a9pll: arm_clk@19000000 { >>> + #clock-cells = <0>; >>> + compatible = "brcm,nsp-armpll"; >>> + clocks = <&osc>; >>> + reg = <0x00000 0x1000>; >>> }; >>> ->>> timer at 19020200 { +>>> timer@19020200 { >>> compatible = "arm,cortex-a9-global-timer"; >>> - reg = <0x0200 0x100>; >>> + reg = <0x20200 0x100>; @@ -85,7 +85,7 @@ Okay. >>> clocks = <&periph_clk>; >>> }; >>> ->>> twd-timer at 19020600 { +>>> twd-timer@19020600 { >>> compatible = "arm,cortex-a9-twd-timer"; >>> - reg = <0x0600 0x20>; >>> + reg = <0x20600 0x20>; @@ -94,7 +94,7 @@ Okay. >>> clocks = <&periph_clk>; >>> @@ -91,11 +83,27 @@ >>> ->>> twd-watchdog at 19020620 { +>>> twd-watchdog@19020620 { >>> compatible = "arm,cortex-a9-twd-wdt"; >>> - reg = <0x0620 0x20>; >>> + reg = <0x20620 0x20>; @@ -103,7 +103,7 @@ Okay. >>> clocks = <&periph_clk>; >>> }; >>> + ->>> + gic: interrupt-controller at 19021000 { +>>> + gic: interrupt-controller@19021000 { >>> + compatible = "arm,cortex-a9-gic"; >>> + #interrupt-cells = <3>; >>> + #address-cells = <0>; @@ -183,7 +183,7 @@ maintainers need to manually fix all the conflicts? >>> >>> @@ -118,17 +150,17 @@ >>> ->>> uart0: serial at 18000300 { +>>> uart0: serial@18000300 { >>> compatible = "ns16550a"; >>> - reg = <0x0300 0x100>; >>> + reg = <0x000300 0x100>; @@ -193,7 +193,7 @@ maintainers need to manually fix all the conflicts? >>> status = "disabled"; >>> }; >>> ->>> uart1: serial at 18000400 { +>>> uart1: serial@18000400 { >>> compatible = "ns16550a"; >>> - reg = <0x0400 0x100>; >>> + reg = <0x000400 0x100>; @@ -208,7 +208,7 @@ maintainers need to manually fix all the conflicts? >>> brcm,nand-has-wp; >>> }; >>> + ->>> + lcpll0: lcpll0 at 1803f100 { +>>> + lcpll0: lcpll0@1803f100 { >> >> wrong label >> @@ -223,7 +223,7 @@ Please fix >>> + "ddr_phy"; >>> + }; >>> + ->>> + genpll: genpll at 1803f140 { +>>> + genpll: genpll@1803f140 { >> >> wrong label >> @@ -241,3 +241,7 @@ Please fix >>> }; >>> }; >>> +-- +To unsubscribe from this list: send the line "unsubscribe devicetree" in +the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index 07c9aa4..a22360d 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,10 +2,23 @@ "ref\01447888430-4451-3-git-send-email-jonmason@broadcom.com\0" "ref\0564D1070.2040200@broadcom.com\0" "ref\020151119154810.GC23560@broadcom.com\0" - "From\0rjui@broadcom.com (Ray Jui)\0" - "Subject\0[PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "ref\020151119154810.GC23560-dY08KVG/lbpWk0Htik3J/w@public.gmane.org\0" + "From\0Ray Jui <rjui-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 08:25:12 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\0" + "Cc\0Florian Fainelli <f.fainelli-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org>" + Hauke Mehrtens <hauke-5/S+JYg5SzeELgA04lAiVw@public.gmane.org> + Rob Herring <robh+dt-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org> + Pawel Moll <pawel.moll-5wv7dgnIgG8@public.gmane.org> + Mark Rutland <mark.rutland-5wv7dgnIgG8@public.gmane.org> + Ian Campbell <ijc+devicetree-KcIKpvwj1kUDXYZnReoRVg@public.gmane.org> + Kumar Gala <galak-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Russell King <linux-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org> + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " bcm-kernel-feedback-list-dY08KVG/lbpWk0Htik3J/w@public.gmane.org\0" "\00:1\0" "b\0" "\n" @@ -24,7 +37,7 @@ ">>> Replace current device tree dummy clocks with real clock support for\n" ">>> Broadcom Northstar Plus SoC\n" ">>>\n" - ">>> Signed-off-by: Jon Mason <jonmason@broadcom.com>\n" + ">>> Signed-off-by: Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>\n" ">>> ---\n" ">>> arch/arm/boot/dts/bcm-nsp.dtsi | 99 ++++++++++++++++++++++++++++++++----------\n" ">>> 1 file changed, 75 insertions(+), 24 deletions(-)\n" @@ -73,21 +86,21 @@ ">>> -\t\t\tcache-level = <2>;\n" ">>> -\t\t};\n" ">>> -\n" - ">>> -\t\tgic: interrupt-controller at 19021000 {\n" + ">>> -\t\tgic: interrupt-controller@19021000 {\n" ">>> -\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">>> -\t\t\t#interrupt-cells = <3>;\n" ">>> -\t\t\t#address-cells = <0>;\n" ">>> -\t\t\tinterrupt-controller;\n" ">>> -\t\t\treg = <0x1000 0x1000>,\n" ">>> -\t\t\t <0x0100 0x100>;\n" - ">>> +\t\ta9pll: arm_clk at 19000000 {\n" + ">>> +\t\ta9pll: arm_clk@19000000 {\n" ">>> +\t\t\t#clock-cells = <0>;\n" ">>> +\t\t\tcompatible = \"brcm,nsp-armpll\";\n" ">>> +\t\t\tclocks = <&osc>;\n" ">>> +\t\t\treg = <0x00000 0x1000>;\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\ttimer at 19020200 {\n" + ">>> \t\ttimer@19020200 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" ">>> -\t\t\treg = <0x0200 0x100>;\n" ">>> +\t\t\treg = <0x20200 0x100>;\n" @@ -95,7 +108,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\ttwd-timer at 19020600 {\n" + ">>> \t\ttwd-timer@19020600 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" ">>> -\t\t\treg = <0x0600 0x20>;\n" ">>> +\t\t\treg = <0x20600 0x20>;\n" @@ -104,7 +117,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> @@ -91,11 +83,27 @@\n" ">>>\n" - ">>> \t\ttwd-watchdog at 19020620 {\n" + ">>> \t\ttwd-watchdog@19020620 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-twd-wdt\";\n" ">>> -\t\t\treg = <0x0620 0x20>;\n" ">>> +\t\t\treg = <0x20620 0x20>;\n" @@ -113,7 +126,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> \t\t};\n" ">>> +\n" - ">>> +\t\tgic: interrupt-controller at 19021000 {\n" + ">>> +\t\tgic: interrupt-controller@19021000 {\n" ">>> +\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">>> +\t\t\t#interrupt-cells = <3>;\n" ">>> +\t\t\t#address-cells = <0>;\n" @@ -193,7 +206,7 @@ ">>>\n" ">>> @@ -118,17 +150,17 @@\n" ">>>\n" - ">>> \t\tuart0: serial at 18000300 {\n" + ">>> \t\tuart0: serial@18000300 {\n" ">>> \t\t\tcompatible = \"ns16550a\";\n" ">>> -\t\t\treg = <0x0300 0x100>;\n" ">>> +\t\t\treg = <0x000300 0x100>;\n" @@ -203,7 +216,7 @@ ">>> \t\t\tstatus = \"disabled\";\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\tuart1: serial at 18000400 {\n" + ">>> \t\tuart1: serial@18000400 {\n" ">>> \t\t\tcompatible = \"ns16550a\";\n" ">>> -\t\t\treg = <0x0400 0x100>;\n" ">>> +\t\t\treg = <0x000400 0x100>;\n" @@ -218,7 +231,7 @@ ">>> \t\t\tbrcm,nand-has-wp;\n" ">>> \t\t};\n" ">>> +\n" - ">>> +\t\tlcpll0: lcpll0 at 1803f100 {\n" + ">>> +\t\tlcpll0: lcpll0@1803f100 {\n" ">>\n" ">> wrong label\n" ">>\n" @@ -233,7 +246,7 @@ ">>> +\t\t\t\t\t \"ddr_phy\";\n" ">>> +\t\t};\n" ">>> +\n" - ">>> +\t\tgenpll: genpll at 1803f140 {\n" + ">>> +\t\tgenpll: genpll@1803f140 {\n" ">>\n" ">> wrong label\n" ">>\n" @@ -250,6 +263,10 @@ ">>> +\t\t};\n" ">>> \t};\n" ">>> };\n" - >>> + ">>>\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe devicetree\" in\n" + "the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -2ec364aca423832f1a7e55965f55ea401377239ca2176f02052b2723d2a83391 +399f2df0b258821a0168e760291c325d2e44f3c872b1f4716981045bb3d35ee8
diff --git a/a/1.txt b/N2/1.txt index c4b8321..d5a2e3a 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -63,21 +63,21 @@ Okay. >>> - cache-level = <2>; >>> - }; >>> - ->>> - gic: interrupt-controller at 19021000 { +>>> - gic: interrupt-controller@19021000 { >>> - compatible = "arm,cortex-a9-gic"; >>> - #interrupt-cells = <3>; >>> - #address-cells = <0>; >>> - interrupt-controller; >>> - reg = <0x1000 0x1000>, >>> - <0x0100 0x100>; ->>> + a9pll: arm_clk at 19000000 { +>>> + a9pll: arm_clk@19000000 { >>> + #clock-cells = <0>; >>> + compatible = "brcm,nsp-armpll"; >>> + clocks = <&osc>; >>> + reg = <0x00000 0x1000>; >>> }; >>> ->>> timer at 19020200 { +>>> timer@19020200 { >>> compatible = "arm,cortex-a9-global-timer"; >>> - reg = <0x0200 0x100>; >>> + reg = <0x20200 0x100>; @@ -85,7 +85,7 @@ Okay. >>> clocks = <&periph_clk>; >>> }; >>> ->>> twd-timer at 19020600 { +>>> twd-timer@19020600 { >>> compatible = "arm,cortex-a9-twd-timer"; >>> - reg = <0x0600 0x20>; >>> + reg = <0x20600 0x20>; @@ -94,7 +94,7 @@ Okay. >>> clocks = <&periph_clk>; >>> @@ -91,11 +83,27 @@ >>> ->>> twd-watchdog at 19020620 { +>>> twd-watchdog@19020620 { >>> compatible = "arm,cortex-a9-twd-wdt"; >>> - reg = <0x0620 0x20>; >>> + reg = <0x20620 0x20>; @@ -103,7 +103,7 @@ Okay. >>> clocks = <&periph_clk>; >>> }; >>> + ->>> + gic: interrupt-controller at 19021000 { +>>> + gic: interrupt-controller@19021000 { >>> + compatible = "arm,cortex-a9-gic"; >>> + #interrupt-cells = <3>; >>> + #address-cells = <0>; @@ -183,7 +183,7 @@ maintainers need to manually fix all the conflicts? >>> >>> @@ -118,17 +150,17 @@ >>> ->>> uart0: serial at 18000300 { +>>> uart0: serial@18000300 { >>> compatible = "ns16550a"; >>> - reg = <0x0300 0x100>; >>> + reg = <0x000300 0x100>; @@ -193,7 +193,7 @@ maintainers need to manually fix all the conflicts? >>> status = "disabled"; >>> }; >>> ->>> uart1: serial at 18000400 { +>>> uart1: serial@18000400 { >>> compatible = "ns16550a"; >>> - reg = <0x0400 0x100>; >>> + reg = <0x000400 0x100>; @@ -208,7 +208,7 @@ maintainers need to manually fix all the conflicts? >>> brcm,nand-has-wp; >>> }; >>> + ->>> + lcpll0: lcpll0 at 1803f100 { +>>> + lcpll0: lcpll0@1803f100 { >> >> wrong label >> @@ -223,7 +223,7 @@ Please fix >>> + "ddr_phy"; >>> + }; >>> + ->>> + genpll: genpll at 1803f140 { +>>> + genpll: genpll@1803f140 { >> >> wrong label >> diff --git a/a/content_digest b/N2/content_digest index 07c9aa4..b19f759 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -2,10 +2,22 @@ "ref\01447888430-4451-3-git-send-email-jonmason@broadcom.com\0" "ref\0564D1070.2040200@broadcom.com\0" "ref\020151119154810.GC23560@broadcom.com\0" - "From\0rjui@broadcom.com (Ray Jui)\0" - "Subject\0[PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Ray Jui <rjui@broadcom.com>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 08:25:12 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jonmason@broadcom.com>\0" + "Cc\0Florian Fainelli <f.fainelli@gmail.com>" + Hauke Mehrtens <hauke@hauke-m.de> + Rob 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> + <devicetree@vger.kernel.org> + <linux-arm-kernel@lists.infradead.org> + <linux-kernel@vger.kernel.org> + " <bcm-kernel-feedback-list@broadcom.com>\0" "\00:1\0" "b\0" "\n" @@ -73,21 +85,21 @@ ">>> -\t\t\tcache-level = <2>;\n" ">>> -\t\t};\n" ">>> -\n" - ">>> -\t\tgic: interrupt-controller at 19021000 {\n" + ">>> -\t\tgic: interrupt-controller@19021000 {\n" ">>> -\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">>> -\t\t\t#interrupt-cells = <3>;\n" ">>> -\t\t\t#address-cells = <0>;\n" ">>> -\t\t\tinterrupt-controller;\n" ">>> -\t\t\treg = <0x1000 0x1000>,\n" ">>> -\t\t\t <0x0100 0x100>;\n" - ">>> +\t\ta9pll: arm_clk at 19000000 {\n" + ">>> +\t\ta9pll: arm_clk@19000000 {\n" ">>> +\t\t\t#clock-cells = <0>;\n" ">>> +\t\t\tcompatible = \"brcm,nsp-armpll\";\n" ">>> +\t\t\tclocks = <&osc>;\n" ">>> +\t\t\treg = <0x00000 0x1000>;\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\ttimer at 19020200 {\n" + ">>> \t\ttimer@19020200 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" ">>> -\t\t\treg = <0x0200 0x100>;\n" ">>> +\t\t\treg = <0x20200 0x100>;\n" @@ -95,7 +107,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\ttwd-timer at 19020600 {\n" + ">>> \t\ttwd-timer@19020600 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" ">>> -\t\t\treg = <0x0600 0x20>;\n" ">>> +\t\t\treg = <0x20600 0x20>;\n" @@ -104,7 +116,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> @@ -91,11 +83,27 @@\n" ">>>\n" - ">>> \t\ttwd-watchdog at 19020620 {\n" + ">>> \t\ttwd-watchdog@19020620 {\n" ">>> \t\t\tcompatible = \"arm,cortex-a9-twd-wdt\";\n" ">>> -\t\t\treg = <0x0620 0x20>;\n" ">>> +\t\t\treg = <0x20620 0x20>;\n" @@ -113,7 +125,7 @@ ">>> \t\t\tclocks = <&periph_clk>;\n" ">>> \t\t};\n" ">>> +\n" - ">>> +\t\tgic: interrupt-controller at 19021000 {\n" + ">>> +\t\tgic: interrupt-controller@19021000 {\n" ">>> +\t\t\tcompatible = \"arm,cortex-a9-gic\";\n" ">>> +\t\t\t#interrupt-cells = <3>;\n" ">>> +\t\t\t#address-cells = <0>;\n" @@ -193,7 +205,7 @@ ">>>\n" ">>> @@ -118,17 +150,17 @@\n" ">>>\n" - ">>> \t\tuart0: serial at 18000300 {\n" + ">>> \t\tuart0: serial@18000300 {\n" ">>> \t\t\tcompatible = \"ns16550a\";\n" ">>> -\t\t\treg = <0x0300 0x100>;\n" ">>> +\t\t\treg = <0x000300 0x100>;\n" @@ -203,7 +215,7 @@ ">>> \t\t\tstatus = \"disabled\";\n" ">>> \t\t};\n" ">>>\n" - ">>> \t\tuart1: serial at 18000400 {\n" + ">>> \t\tuart1: serial@18000400 {\n" ">>> \t\t\tcompatible = \"ns16550a\";\n" ">>> -\t\t\treg = <0x0400 0x100>;\n" ">>> +\t\t\treg = <0x000400 0x100>;\n" @@ -218,7 +230,7 @@ ">>> \t\t\tbrcm,nand-has-wp;\n" ">>> \t\t};\n" ">>> +\n" - ">>> +\t\tlcpll0: lcpll0 at 1803f100 {\n" + ">>> +\t\tlcpll0: lcpll0@1803f100 {\n" ">>\n" ">> wrong label\n" ">>\n" @@ -233,7 +245,7 @@ ">>> +\t\t\t\t\t \"ddr_phy\";\n" ">>> +\t\t};\n" ">>> +\n" - ">>> +\t\tgenpll: genpll at 1803f140 {\n" + ">>> +\t\tgenpll: genpll@1803f140 {\n" ">>\n" ">> wrong label\n" ">>\n" @@ -252,4 +264,4 @@ ">>> };\n" >>> -2ec364aca423832f1a7e55965f55ea401377239ca2176f02052b2723d2a83391 +47fbbe8ac50000ea2d6deae94786f71779fb02ea7675c7c7cbb4c73117475824
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.