diff for duplicates of <564D1070.2040200@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index 4a11602..f7ebd6a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -10,7 +10,7 @@ On 11/18/2015 3:13 PM, 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(-) @@ -51,21 +51,21 @@ separate patch? > - 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>; @@ -73,7 +73,7 @@ separate patch? > clocks = <&periph_clk>; > }; > -> twd-timer at 19020600 { +> twd-timer@19020600 { > compatible = "arm,cortex-a9-twd-timer"; > - reg = <0x0600 0x20>; > + reg = <0x20600 0x20>; @@ -82,7 +82,7 @@ separate patch? > 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>; @@ -91,7 +91,7 @@ separate patch? > clocks = <&periph_clk>; > }; > + -> + gic: interrupt-controller at 19021000 { +> + gic: interrupt-controller@19021000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; @@ -158,7 +158,7 @@ dependency work with the other patches that you are about to send out? > > @@ -118,17 +150,17 @@ > -> uart0: serial at 18000300 { +> uart0: serial@18000300 { > compatible = "ns16550a"; > - reg = <0x0300 0x100>; > + reg = <0x000300 0x100>; @@ -168,7 +168,7 @@ dependency work with the other patches that you are about to send out? > status = "disabled"; > }; > -> uart1: serial at 18000400 { +> uart1: serial@18000400 { > compatible = "ns16550a"; > - reg = <0x0400 0x100>; > + reg = <0x000400 0x100>; @@ -183,7 +183,7 @@ dependency work with the other patches that you are about to send out? > brcm,nand-has-wp; > }; > + -> + lcpll0: lcpll0 at 1803f100 { +> + lcpll0: lcpll0@1803f100 { wrong label @@ -195,7 +195,7 @@ wrong label > + "ddr_phy"; > + }; > + -> + genpll: genpll at 1803f140 { +> + genpll: genpll@1803f140 { wrong label @@ -210,3 +210,7 @@ wrong label > }; > }; > +-- +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 9a5c5f0..4ee37c5 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,22 @@ "ref\01447888430-4451-1-git-send-email-jonmason@broadcom.com\0" "ref\01447888430-4451-3-git-send-email-jonmason@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\01447888430-4451-3-git-send-email-jonmason-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\0Wed, 18 Nov 2015 15:57:36 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jonmason-dY08KVG/lbpWk0Htik3J/w@public.gmane.org>" + Florian 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>\0" + "Cc\0devicetree-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" "Would this patch merge properly with the other NSP DT clean up patch + \n" @@ -18,7 +31,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" @@ -59,21 +72,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" @@ -81,7 +94,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" @@ -90,7 +103,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" @@ -99,7 +112,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" @@ -166,7 +179,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" @@ -176,7 +189,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" @@ -191,7 +204,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" @@ -203,7 +216,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" @@ -217,6 +230,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 -f7b3469c977d961cd1352c41d85652cf6d408c02c27f2a712230ebee88586800 +0c2aade70979d2c1f7f8ede4657258f304bb155fb2811441cf8d7aa9e0a2c5eb
diff --git a/a/1.txt b/N2/1.txt index 4a11602..acc0b31 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -51,21 +51,21 @@ separate patch? > - 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>; @@ -73,7 +73,7 @@ separate patch? > clocks = <&periph_clk>; > }; > -> twd-timer at 19020600 { +> twd-timer@19020600 { > compatible = "arm,cortex-a9-twd-timer"; > - reg = <0x0600 0x20>; > + reg = <0x20600 0x20>; @@ -82,7 +82,7 @@ separate patch? > 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>; @@ -91,7 +91,7 @@ separate patch? > clocks = <&periph_clk>; > }; > + -> + gic: interrupt-controller at 19021000 { +> + gic: interrupt-controller@19021000 { > + compatible = "arm,cortex-a9-gic"; > + #interrupt-cells = <3>; > + #address-cells = <0>; @@ -158,7 +158,7 @@ dependency work with the other patches that you are about to send out? > > @@ -118,17 +150,17 @@ > -> uart0: serial at 18000300 { +> uart0: serial@18000300 { > compatible = "ns16550a"; > - reg = <0x0300 0x100>; > + reg = <0x000300 0x100>; @@ -168,7 +168,7 @@ dependency work with the other patches that you are about to send out? > status = "disabled"; > }; > -> uart1: serial at 18000400 { +> uart1: serial@18000400 { > compatible = "ns16550a"; > - reg = <0x0400 0x100>; > + reg = <0x000400 0x100>; @@ -183,7 +183,7 @@ dependency work with the other patches that you are about to send out? > brcm,nand-has-wp; > }; > + -> + lcpll0: lcpll0 at 1803f100 { +> + lcpll0: lcpll0@1803f100 { wrong label @@ -195,7 +195,7 @@ wrong label > + "ddr_phy"; > + }; > + -> + genpll: genpll at 1803f140 { +> + genpll: genpll@1803f140 { wrong label diff --git a/a/content_digest b/N2/content_digest index 9a5c5f0..0655642 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01447888430-4451-1-git-send-email-jonmason@broadcom.com\0" "ref\01447888430-4451-3-git-send-email-jonmason@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\0Wed, 18 Nov 2015 15:57:36 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Jon Mason <jonmason@broadcom.com>" + Florian 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>\0" + "Cc\0<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" "Would this patch merge properly with the other NSP DT clean up patch + \n" @@ -59,21 +71,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" @@ -81,7 +93,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" @@ -90,7 +102,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" @@ -99,7 +111,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" @@ -166,7 +178,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" @@ -176,7 +188,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" @@ -191,7 +203,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" @@ -203,7 +215,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" @@ -219,4 +231,4 @@ "> };\n" > -f7b3469c977d961cd1352c41d85652cf6d408c02c27f2a712230ebee88586800 +663cc7b3267e8720747432c938a0e0204053bbf51ed9e1594f9d313a02cfbe54
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.