diff for duplicates of <564E5DD4.2070406@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index 3b0c85b..1d94fcb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -34,16 +34,16 @@ On 11/19/2015 3:05 PM, Jon Mason wrote: > }; > }; > -> + a9pll: arm_clk at 0000 { +> + a9pll: arm_clk@0000 { > + #clock-cells = <0>; > + compatible = "brcm,nsp-armpll"; > + clocks = <&osc>; > + reg = <0x0000 0x1000>; > + }; > + -> timer at 0200 { +> timer@0200 { -timer at 20200. Or is this addressed in another patch? I completely lose +timer@20200. Or is this addressed in another patch? I completely lose track of these.... > compatible = "arm,cortex-a9-global-timer"; @@ -53,9 +53,9 @@ track of these.... > clocks = <&periph_clk>; > }; > -> twd-timer at 0600 { +> twd-timer@0600 { -twd-timer at 20600 +twd-timer@20600 > compatible = "arm,cortex-a9-twd-timer"; > - reg = <0x0600 0x20>; @@ -65,7 +65,7 @@ twd-timer at 20600 > clocks = <&periph_clk>; > @@ -75,7 +83,7 @@ > -> twd-watchdog at 0620 { +> twd-watchdog@0620 { same here @@ -131,7 +131,7 @@ same here > > @@ -118,17 +150,17 @@ > -> uart0: serial at 0300 { +> uart0: serial@0300 { > compatible = "ns16550a"; > - reg = <0x0300 0x100>; > + reg = <0x000300 0x100>; @@ -141,7 +141,7 @@ same here > status = "disabled"; > }; > -> uart1: serial at 0400 { +> uart1: serial@0400 { > compatible = "ns16550a"; > - reg = <0x0400 0x100>; > + reg = <0x000400 0x100>; @@ -156,7 +156,7 @@ same here > clock-frequency = <100000>; > }; > + -> + lcpll0: lcpll0 at 3f100 { +> + lcpll0: lcpll0@3f100 { > + #clock-cells = <1>; > + compatible = "brcm,nsp-lcpll0"; > + reg = <0x3f100 0x14>; @@ -165,7 +165,7 @@ same here > + "ddr_phy"; > + }; > + -> + genpll: genpll at 3f140 { +> + genpll: genpll@3f140 { > + #clock-cells = <1>; > + compatible = "brcm,nsp-genpll"; > + reg = <0x3f140 0x24>; diff --git a/a/content_digest b/N1/content_digest index fa9acf3..c349d0f 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,21 @@ "ref\01447974309-29566-1-git-send-email-jonmason@broadcom.com\0" "ref\01447974309-29566-3-git-send-email-jonmason@broadcom.com\0" - "From\0rjui@broadcom.com (Ray Jui)\0" - "Subject\0[PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Ray Jui <rjui@broadcom.com>\0" + "Subject\0Re: [PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 15:40:04 -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\0devicetree@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" @@ -42,16 +54,16 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\ta9pll: arm_clk at 0000 {\n" + "> +\t\ta9pll: arm_clk@0000 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"brcm,nsp-armpll\";\n" "> +\t\t\tclocks = <&osc>;\n" "> +\t\t\treg = <0x0000 0x1000>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer at 0200 {\n" + "> \t\ttimer@0200 {\n" "\n" - "timer at 20200. Or is this addressed in another patch? I completely lose \n" + "timer@20200. Or is this addressed in another patch? I completely lose \n" "track of these....\n" "\n" "> \t\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" @@ -61,9 +73,9 @@ "> \t\t\tclocks = <&periph_clk>;\n" "> \t\t};\n" ">\n" - "> \t\ttwd-timer at 0600 {\n" + "> \t\ttwd-timer@0600 {\n" "\n" - "twd-timer at 20600\n" + "twd-timer@20600\n" "\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> -\t\t\treg = <0x0600 0x20>;\n" @@ -73,7 +85,7 @@ "> \t\t\tclocks = <&periph_clk>;\n" "> @@ -75,7 +83,7 @@\n" ">\n" - "> \t\ttwd-watchdog at 0620 {\n" + "> \t\ttwd-watchdog@0620 {\n" "\n" "same here\n" "\n" @@ -139,7 +151,7 @@ ">\n" "> @@ -118,17 +150,17 @@\n" ">\n" - "> \t\tuart0: serial at 0300 {\n" + "> \t\tuart0: serial@0300 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> -\t\t\treg = <0x0300 0x100>;\n" "> +\t\t\treg = <0x000300 0x100>;\n" @@ -149,7 +161,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" ">\n" - "> \t\tuart1: serial at 0400 {\n" + "> \t\tuart1: serial@0400 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> -\t\t\treg = <0x0400 0x100>;\n" "> +\t\t\treg = <0x000400 0x100>;\n" @@ -164,7 +176,7 @@ "> \t\t\tclock-frequency = <100000>;\n" "> \t\t};\n" "> +\n" - "> +\t\tlcpll0: lcpll0 at 3f100 {\n" + "> +\t\tlcpll0: lcpll0@3f100 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"brcm,nsp-lcpll0\";\n" "> +\t\t\treg = <0x3f100 0x14>;\n" @@ -173,7 +185,7 @@ "> +\t\t\t\t\t \"ddr_phy\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tgenpll: genpll at 3f140 {\n" + "> +\t\tgenpll: genpll@3f140 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"brcm,nsp-genpll\";\n" "> +\t\t\treg = <0x3f140 0x24>;\n" @@ -186,4 +198,4 @@ "> };\n" > -4194236118988a5945abae5ca68c5f9b41b5afa953449e1d6cda3cd7a408ea86 +ece067fb25ae03b9ff0a21ae7418451d34a421471a6d470c897cb1149428d8a3
diff --git a/a/1.txt b/N2/1.txt index 3b0c85b..1d94fcb 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -34,16 +34,16 @@ On 11/19/2015 3:05 PM, Jon Mason wrote: > }; > }; > -> + a9pll: arm_clk at 0000 { +> + a9pll: arm_clk@0000 { > + #clock-cells = <0>; > + compatible = "brcm,nsp-armpll"; > + clocks = <&osc>; > + reg = <0x0000 0x1000>; > + }; > + -> timer at 0200 { +> timer@0200 { -timer at 20200. Or is this addressed in another patch? I completely lose +timer@20200. Or is this addressed in another patch? I completely lose track of these.... > compatible = "arm,cortex-a9-global-timer"; @@ -53,9 +53,9 @@ track of these.... > clocks = <&periph_clk>; > }; > -> twd-timer at 0600 { +> twd-timer@0600 { -twd-timer at 20600 +twd-timer@20600 > compatible = "arm,cortex-a9-twd-timer"; > - reg = <0x0600 0x20>; @@ -65,7 +65,7 @@ twd-timer at 20600 > clocks = <&periph_clk>; > @@ -75,7 +83,7 @@ > -> twd-watchdog at 0620 { +> twd-watchdog@0620 { same here @@ -131,7 +131,7 @@ same here > > @@ -118,17 +150,17 @@ > -> uart0: serial at 0300 { +> uart0: serial@0300 { > compatible = "ns16550a"; > - reg = <0x0300 0x100>; > + reg = <0x000300 0x100>; @@ -141,7 +141,7 @@ same here > status = "disabled"; > }; > -> uart1: serial at 0400 { +> uart1: serial@0400 { > compatible = "ns16550a"; > - reg = <0x0400 0x100>; > + reg = <0x000400 0x100>; @@ -156,7 +156,7 @@ same here > clock-frequency = <100000>; > }; > + -> + lcpll0: lcpll0 at 3f100 { +> + lcpll0: lcpll0@3f100 { > + #clock-cells = <1>; > + compatible = "brcm,nsp-lcpll0"; > + reg = <0x3f100 0x14>; @@ -165,7 +165,7 @@ same here > + "ddr_phy"; > + }; > + -> + genpll: genpll at 3f140 { +> + genpll: genpll@3f140 { > + #clock-cells = <1>; > + compatible = "brcm,nsp-genpll"; > + reg = <0x3f140 0x24>; diff --git a/a/content_digest b/N2/content_digest index fa9acf3..456ec73 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,21 @@ "ref\01447974309-29566-1-git-send-email-jonmason@broadcom.com\0" "ref\01447974309-29566-3-git-send-email-jonmason@broadcom.com\0" - "From\0rjui@broadcom.com (Ray Jui)\0" - "Subject\0[PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Ray Jui <rjui@broadcom.com>\0" + "Subject\0Re: [PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Thu, 19 Nov 2015 15:40:04 -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" "\n" @@ -42,16 +54,16 @@ "> \t\t\t};\n" "> \t\t};\n" ">\n" - "> +\t\ta9pll: arm_clk at 0000 {\n" + "> +\t\ta9pll: arm_clk@0000 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"brcm,nsp-armpll\";\n" "> +\t\t\tclocks = <&osc>;\n" "> +\t\t\treg = <0x0000 0x1000>;\n" "> +\t\t};\n" "> +\n" - "> \t\ttimer at 0200 {\n" + "> \t\ttimer@0200 {\n" "\n" - "timer at 20200. Or is this addressed in another patch? I completely lose \n" + "timer@20200. Or is this addressed in another patch? I completely lose \n" "track of these....\n" "\n" "> \t\t\tcompatible = \"arm,cortex-a9-global-timer\";\n" @@ -61,9 +73,9 @@ "> \t\t\tclocks = <&periph_clk>;\n" "> \t\t};\n" ">\n" - "> \t\ttwd-timer at 0600 {\n" + "> \t\ttwd-timer@0600 {\n" "\n" - "twd-timer at 20600\n" + "twd-timer@20600\n" "\n" "> \t\t\tcompatible = \"arm,cortex-a9-twd-timer\";\n" "> -\t\t\treg = <0x0600 0x20>;\n" @@ -73,7 +85,7 @@ "> \t\t\tclocks = <&periph_clk>;\n" "> @@ -75,7 +83,7 @@\n" ">\n" - "> \t\ttwd-watchdog at 0620 {\n" + "> \t\ttwd-watchdog@0620 {\n" "\n" "same here\n" "\n" @@ -139,7 +151,7 @@ ">\n" "> @@ -118,17 +150,17 @@\n" ">\n" - "> \t\tuart0: serial at 0300 {\n" + "> \t\tuart0: serial@0300 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> -\t\t\treg = <0x0300 0x100>;\n" "> +\t\t\treg = <0x000300 0x100>;\n" @@ -149,7 +161,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" ">\n" - "> \t\tuart1: serial at 0400 {\n" + "> \t\tuart1: serial@0400 {\n" "> \t\t\tcompatible = \"ns16550a\";\n" "> -\t\t\treg = <0x0400 0x100>;\n" "> +\t\t\treg = <0x000400 0x100>;\n" @@ -164,7 +176,7 @@ "> \t\t\tclock-frequency = <100000>;\n" "> \t\t};\n" "> +\n" - "> +\t\tlcpll0: lcpll0 at 3f100 {\n" + "> +\t\tlcpll0: lcpll0@3f100 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"brcm,nsp-lcpll0\";\n" "> +\t\t\treg = <0x3f100 0x14>;\n" @@ -173,7 +185,7 @@ "> +\t\t\t\t\t \"ddr_phy\";\n" "> +\t\t};\n" "> +\n" - "> +\t\tgenpll: genpll at 3f140 {\n" + "> +\t\tgenpll: genpll@3f140 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"brcm,nsp-genpll\";\n" "> +\t\t\treg = <0x3f140 0x24>;\n" @@ -186,4 +198,4 @@ "> };\n" > -4194236118988a5945abae5ca68c5f9b41b5afa953449e1d6cda3cd7a408ea86 +a7acb789c179fda41e10a3109112529a08410851701f07c397d5bad9432a533a
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.