diff for duplicates of <20151119154810.GC23560@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index cc49429..9570342 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -57,21 +57,21 @@ needs to be adjusted. > >- 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>; @@ -79,7 +79,7 @@ needs to be adjusted. > > clocks = <&periph_clk>; > > }; > > -> > twd-timer at 19020600 { +> > twd-timer@19020600 { > > compatible = "arm,cortex-a9-twd-timer"; > >- reg = <0x0600 0x20>; > >+ reg = <0x20600 0x20>; @@ -88,7 +88,7 @@ needs to be adjusted. > > 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>; @@ -97,7 +97,7 @@ needs to be adjusted. > > clocks = <&periph_clk>; > > }; > >+ -> >+ gic: interrupt-controller at 19021000 { +> >+ gic: interrupt-controller@19021000 { > >+ compatible = "arm,cortex-a9-gic"; > >+ #interrupt-cells = <3>; > >+ #address-cells = <0>; @@ -170,7 +170,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > > >@@ -118,17 +150,17 @@ > > -> > uart0: serial at 18000300 { +> > uart0: serial@18000300 { > > compatible = "ns16550a"; > >- reg = <0x0300 0x100>; > >+ reg = <0x000300 0x100>; @@ -180,7 +180,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > status = "disabled"; > > }; > > -> > uart1: serial at 18000400 { +> > uart1: serial@18000400 { > > compatible = "ns16550a"; > >- reg = <0x0400 0x100>; > >+ reg = <0x000400 0x100>; @@ -195,7 +195,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > brcm,nand-has-wp; > > }; > >+ -> >+ lcpll0: lcpll0 at 1803f100 { +> >+ lcpll0: lcpll0@1803f100 { > > wrong label > @@ -207,7 +207,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > >+ "ddr_phy"; > >+ }; > >+ -> >+ genpll: genpll at 1803f140 { +> >+ genpll: genpll@1803f140 { > > wrong label > diff --git a/a/content_digest b/N1/content_digest index e33bd65..153f448 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,22 @@ "ref\01447888430-4451-1-git-send-email-jonmason@broadcom.com\0" "ref\01447888430-4451-3-git-send-email-jonmason@broadcom.com\0" "ref\0564D1070.2040200@broadcom.com\0" - "From\0jonmason@broadcom.com (Jon Mason)\0" - "Subject\0[PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Jon Mason <jonmason@broadcom.com>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 10:48:10 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ray Jui <rjui@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" "On Wed, Nov 18, 2015 at 03:57:36PM -0800, Ray Jui wrote:\n" @@ -66,21 +78,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" @@ -88,7 +100,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" @@ -97,7 +109,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" @@ -106,7 +118,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" @@ -179,7 +191,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" @@ -189,7 +201,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" @@ -204,7 +216,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" @@ -216,7 +228,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" @@ -232,4 +244,4 @@ "> > };\n" > > -69ca1e235c368e6f3b5dcb03d9dcb162daf74f87a9f3beeaed11048af6a23c7f +79a4f8bbc399600de9df260de80c070cb5a8434db8a36c11e02a04650ee93f13
diff --git a/a/1.txt b/N2/1.txt index cc49429..9570342 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -57,21 +57,21 @@ needs to be adjusted. > >- 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>; @@ -79,7 +79,7 @@ needs to be adjusted. > > clocks = <&periph_clk>; > > }; > > -> > twd-timer at 19020600 { +> > twd-timer@19020600 { > > compatible = "arm,cortex-a9-twd-timer"; > >- reg = <0x0600 0x20>; > >+ reg = <0x20600 0x20>; @@ -88,7 +88,7 @@ needs to be adjusted. > > 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>; @@ -97,7 +97,7 @@ needs to be adjusted. > > clocks = <&periph_clk>; > > }; > >+ -> >+ gic: interrupt-controller at 19021000 { +> >+ gic: interrupt-controller@19021000 { > >+ compatible = "arm,cortex-a9-gic"; > >+ #interrupt-cells = <3>; > >+ #address-cells = <0>; @@ -170,7 +170,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > > >@@ -118,17 +150,17 @@ > > -> > uart0: serial at 18000300 { +> > uart0: serial@18000300 { > > compatible = "ns16550a"; > >- reg = <0x0300 0x100>; > >+ reg = <0x000300 0x100>; @@ -180,7 +180,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > status = "disabled"; > > }; > > -> > uart1: serial at 18000400 { +> > uart1: serial@18000400 { > > compatible = "ns16550a"; > >- reg = <0x0400 0x100>; > >+ reg = <0x000400 0x100>; @@ -195,7 +195,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > > brcm,nand-has-wp; > > }; > >+ -> >+ lcpll0: lcpll0 at 1803f100 { +> >+ lcpll0: lcpll0@1803f100 { > > wrong label > @@ -207,7 +207,7 @@ http://www.spinics.net/lists/arm-kernel/msg451580.html > >+ "ddr_phy"; > >+ }; > >+ -> >+ genpll: genpll at 1803f140 { +> >+ genpll: genpll@1803f140 { > > wrong label > diff --git a/a/content_digest b/N2/content_digest index e33bd65..d8ce06f 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,22 @@ "ref\01447888430-4451-1-git-send-email-jonmason@broadcom.com\0" "ref\01447888430-4451-3-git-send-email-jonmason@broadcom.com\0" "ref\0564D1070.2040200@broadcom.com\0" - "From\0jonmason@broadcom.com (Jon Mason)\0" - "Subject\0[PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Jon Mason <jonmason@broadcom.com>\0" + "Subject\0Re: [PATCH 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 10:48:10 -0500\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Ray Jui <rjui@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" "On Wed, Nov 18, 2015 at 03:57:36PM -0800, Ray Jui wrote:\n" @@ -66,21 +78,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" @@ -88,7 +100,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" @@ -97,7 +109,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" @@ -106,7 +118,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" @@ -179,7 +191,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" @@ -189,7 +201,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" @@ -204,7 +216,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" @@ -216,7 +228,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" @@ -232,4 +244,4 @@ "> > };\n" > > -69ca1e235c368e6f3b5dcb03d9dcb162daf74f87a9f3beeaed11048af6a23c7f +66caa6ec39d7c3fce3218562894f025cb2b8edf8362a912a1b665a43ac062326
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.