diff for duplicates of <20151127134200.0df10f37@xhacker> diff --git a/a/1.txt b/N1/1.txt index 5c47837..ad33459 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -27,7 +27,7 @@ Maxime Ripard wrote: > > > "usb_phy2", "usb_hsic_12M"; > > > }; > > > -> > > + pll3: clk@06000008 { +> > > + pll3: clk at 06000008 { > > > + /* placeholder until implemented */ > > > + #clock-cells = <0>; > > > + compatible = "fixed-clock"; @@ -35,7 +35,7 @@ Maxime Ripard wrote: > > > + clock-output-names = "pll3"; > > > + }; > > > + -> > > pll4: clk@0600000c { +> > > pll4: clk at 0600000c { > > > #clock-cells = <0>; > > > compatible = "allwinner,sun9i-a80-pll4-clk"; > > > @@ -350,6 +358,68 @@ @@ -43,7 +43,7 @@ Maxime Ripard wrote: > > > "apb1_uart4", "apb1_uart5"; > > > }; > > > + -> > > + cpus_clk: clk@08001410 { +> > > + cpus_clk: clk at 08001410 { > > > + compatible = "allwinner,sun9i-a80-cpus-clk"; > > > + reg = <0x08001410 0x4>; > > > + #clock-cells = <0>; diff --git a/a/content_digest b/N1/content_digest index a681c54..b254b1e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,24 +2,10 @@ "ref\01448357536-26613-5-git-send-email-wens@csie.org\0" "ref\020151124182709.7671f12f@xhacker\0" "ref\020151126200942.GQ32142@lukather\0" - "From\0Jisheng Zhang <jszhang@marvell.com>\0" - "Subject\0Re: [PATCH v3 4/5] ARM: dts: sun9i: Add A80 PRCM clocks and reset control nodes\0" + "From\0jszhang@marvell.com (Jisheng Zhang)\0" + "Subject\0[PATCH v3 4/5] ARM: dts: sun9i: Add A80 PRCM clocks and reset control nodes\0" "Date\0Fri, 27 Nov 2015 13:42:00 +0800\0" - "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" - "Cc\0Chen-Yu Tsai <wens@csie.org>" - Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com> - " Antoine T\303\251nart <antoine.tenart@free-electrons.com>" - Michael Turquette <mturquette@baylibre.com> - Stephen Boyd <sboyd@codeaurora.org> - 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> - linux-sunxi@googlegroups.com - linux-clk@vger.kernel.org - linux-arm-kernel@lists.infradead.org - " linux-kernel@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Dear Maxime,\n" @@ -51,7 +37,7 @@ "> > > \t\t\t\t\t \"usb_phy2\", \"usb_hsic_12M\";\n" "> > > \t\t};\n" "> > > \n" - "> > > +\t\tpll3: clk@06000008 {\n" + "> > > +\t\tpll3: clk at 06000008 {\n" "> > > +\t\t\t/* placeholder until implemented */\n" "> > > +\t\t\t#clock-cells = <0>;\n" "> > > +\t\t\tcompatible = \"fixed-clock\";\n" @@ -59,7 +45,7 @@ "> > > +\t\t\tclock-output-names = \"pll3\";\n" "> > > +\t\t};\n" "> > > +\n" - "> > > \t\tpll4: clk@0600000c {\n" + "> > > \t\tpll4: clk at 0600000c {\n" "> > > \t\t\t#clock-cells = <0>;\n" "> > > \t\t\tcompatible = \"allwinner,sun9i-a80-pll4-clk\";\n" "> > > @@ -350,6 +358,68 @@\n" @@ -67,7 +53,7 @@ "> > > \t\t\t\t\t\"apb1_uart4\", \"apb1_uart5\";\n" "> > > \t\t};\n" "> > > +\n" - "> > > +\t\tcpus_clk: clk@08001410 {\n" + "> > > +\t\tcpus_clk: clk at 08001410 {\n" "> > > +\t\t\tcompatible = \"allwinner,sun9i-a80-cpus-clk\";\n" "> > > +\t\t\treg = <0x08001410 0x4>;\n" "> > > +\t\t\t#clock-cells = <0>;\n" @@ -143,4 +129,4 @@ "Thank you,\n" Jisheng -71ac36508079c9a7079a99e78c35d3b6b4fc6efeb5cb552417308b2bb8e1df87 +af88e552109583fdceabce7d82dda46177e2e93b1016031fe46dbb7671e7f8bd
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.