diff for duplicates of <20151120151439.GA12814@broadcom.com> diff --git a/a/1.txt b/N1/1.txt index e87738a..4068b98 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -35,16 +35,16 @@ On Thu, Nov 19, 2015 at 03:40:04PM -0800, Ray Jui 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 +> timer@20200. Or is this addressed in another patch? I completely > lose track of these.... No, you are correct. The names need to be updated as well with the @@ -61,9 +61,9 @@ Jon > > 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>; @@ -73,7 +73,7 @@ Jon > > clocks = <&periph_clk>; > >@@ -75,7 +83,7 @@ > > -> > twd-watchdog at 0620 { +> > twd-watchdog@0620 { > > same here > @@ -139,7 +139,7 @@ Jon > > > >@@ -118,17 +150,17 @@ > > -> > uart0: serial at 0300 { +> > uart0: serial@0300 { > > compatible = "ns16550a"; > >- reg = <0x0300 0x100>; > >+ reg = <0x000300 0x100>; @@ -149,7 +149,7 @@ Jon > > status = "disabled"; > > }; > > -> > uart1: serial at 0400 { +> > uart1: serial@0400 { > > compatible = "ns16550a"; > >- reg = <0x0400 0x100>; > >+ reg = <0x000400 0x100>; @@ -164,7 +164,7 @@ Jon > > clock-frequency = <100000>; > > }; > >+ -> >+ lcpll0: lcpll0 at 3f100 { +> >+ lcpll0: lcpll0@3f100 { > >+ #clock-cells = <1>; > >+ compatible = "brcm,nsp-lcpll0"; > >+ reg = <0x3f100 0x14>; @@ -173,7 +173,7 @@ Jon > >+ "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 8c6c2fe..eb2aff0 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,10 +1,22 @@ "ref\01447974309-29566-1-git-send-email-jonmason@broadcom.com\0" "ref\01447974309-29566-3-git-send-email-jonmason@broadcom.com\0" "ref\0564E5DD4.2070406@broadcom.com\0" - "From\0jonmason@broadcom.com (Jon Mason)\0" - "Subject\0[PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Jon Mason <jonmason@broadcom.com>\0" + "Subject\0Re: [PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Fri, 20 Nov 2015 10:14:39 -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 Thu, Nov 19, 2015 at 03:40:04PM -0800, Ray Jui wrote:\n" @@ -44,16 +56,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\n" + "> timer@20200. Or is this addressed in another patch? I completely\n" "> lose track of these....\n" "\n" "No, you are correct. The names need to be updated as well with the\n" @@ -70,9 +82,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" @@ -82,7 +94,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" @@ -148,7 +160,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" @@ -158,7 +170,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" @@ -173,7 +185,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" @@ -182,7 +194,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" @@ -195,4 +207,4 @@ "> > };\n" > > -83d724be273f41438be96fbcf6eb58e30a661400d882c0c04e9461f684f9db21 +0eafb1bfa52b31405b4a4cc92bcf446a9d4725c6092a6454b4e0451e53359dcd
diff --git a/a/1.txt b/N2/1.txt index e87738a..4068b98 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -35,16 +35,16 @@ On Thu, Nov 19, 2015 at 03:40:04PM -0800, Ray Jui 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 +> timer@20200. Or is this addressed in another patch? I completely > lose track of these.... No, you are correct. The names need to be updated as well with the @@ -61,9 +61,9 @@ Jon > > 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>; @@ -73,7 +73,7 @@ Jon > > clocks = <&periph_clk>; > >@@ -75,7 +83,7 @@ > > -> > twd-watchdog at 0620 { +> > twd-watchdog@0620 { > > same here > @@ -139,7 +139,7 @@ Jon > > > >@@ -118,17 +150,17 @@ > > -> > uart0: serial at 0300 { +> > uart0: serial@0300 { > > compatible = "ns16550a"; > >- reg = <0x0300 0x100>; > >+ reg = <0x000300 0x100>; @@ -149,7 +149,7 @@ Jon > > status = "disabled"; > > }; > > -> > uart1: serial at 0400 { +> > uart1: serial@0400 { > > compatible = "ns16550a"; > >- reg = <0x0400 0x100>; > >+ reg = <0x000400 0x100>; @@ -164,7 +164,7 @@ Jon > > clock-frequency = <100000>; > > }; > >+ -> >+ lcpll0: lcpll0 at 3f100 { +> >+ lcpll0: lcpll0@3f100 { > >+ #clock-cells = <1>; > >+ compatible = "brcm,nsp-lcpll0"; > >+ reg = <0x3f100 0x14>; @@ -173,7 +173,7 @@ Jon > >+ "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 8c6c2fe..79c9e32 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,10 +1,22 @@ "ref\01447974309-29566-1-git-send-email-jonmason@broadcom.com\0" "ref\01447974309-29566-3-git-send-email-jonmason@broadcom.com\0" "ref\0564E5DD4.2070406@broadcom.com\0" - "From\0jonmason@broadcom.com (Jon Mason)\0" - "Subject\0[PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" + "From\0Jon Mason <jonmason@broadcom.com>\0" + "Subject\0Re: [PATCH v2 2/3] ARM: dts: enable clock support for Broadcom NSP\0" "Date\0Fri, 20 Nov 2015 10:14:39 -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 Thu, Nov 19, 2015 at 03:40:04PM -0800, Ray Jui wrote:\n" @@ -44,16 +56,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\n" + "> timer@20200. Or is this addressed in another patch? I completely\n" "> lose track of these....\n" "\n" "No, you are correct. The names need to be updated as well with the\n" @@ -70,9 +82,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" @@ -82,7 +94,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" @@ -148,7 +160,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" @@ -158,7 +170,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" @@ -173,7 +185,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" @@ -182,7 +194,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" @@ -195,4 +207,4 @@ "> > };\n" > > -83d724be273f41438be96fbcf6eb58e30a661400d882c0c04e9461f684f9db21 +ebcccf247a0182c0b6afe1c2c5d94f21799fdaa7ec5ff979b723c8adf842eecb
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.