diff for duplicates of <20151001122555.GV3214@x1> diff --git a/a/1.txt b/N1/1.txt index e562919..790bfe1 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -68,7 +68,7 @@ Nit: Please use correct multi-line comment formatting. > reg = <0x7e100000 0x28>; > }; > -> + clocks: cprman@7e101000 { +> + clocks: cprman at 7e101000 { > + compatible = "brcm,bcm2835-cprman"; > + #clock-cells = <1>; > + reg = <0x7e101000 0x2000>; @@ -82,7 +82,7 @@ As above. > + clocks = <&clk_osc>; > + }; > + -> rng@7e104000 { +> rng at 7e104000 { > compatible = "brcm,bcm2835-rng"; > reg = <0x7e104000 0x10>; > @@ -96,7 +112,9 @@ @@ -136,7 +136,7 @@ As above. > #address-cells = <1>; > #size-cells = <0>; > -> - clk_mmc: clock@0 { +> - clk_mmc: clock at 0 { > - compatible = "fixed-clock"; > - reg = <0>; > - #clock-cells = <0>; @@ -144,9 +144,9 @@ As above. > - clock-frequency = <100000000>; > - }; > - -> - clk_i2c: clock@1 { +> - clk_i2c: clock at 1 { > + /* The oscillator is the root of the clock tree. */ -> + clk_osc: clock@3 { +> + clk_osc: clock at 3 { > compatible = "fixed-clock"; > - reg = <1>; > + reg = <3>; @@ -157,7 +157,7 @@ As above. > + clock-frequency = <19200000>; > }; > -> - clk_spi: clock@2 { +> - clk_spi: clock at 2 { > - compatible = "fixed-clock"; > - reg = <2>; > - #clock-cells = <0>; diff --git a/a/content_digest b/N1/content_digest index 47f4cc8..053f162 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,17 +1,9 @@ "ref\01443475325-22270-1-git-send-email-eric@anholt.net\0" "ref\01443475325-22270-4-git-send-email-eric@anholt.net\0" - "From\0Lee Jones <lee@kernel.org>\0" - "Subject\0Re: [PATCH v3 4/4] ARM: bcm2835: Switch to using the new clock driver support.\0" + "From\0lee@kernel.org (Lee Jones)\0" + "Subject\0[PATCH v3 4/4] ARM: bcm2835: Switch to using the new clock driver support.\0" "Date\0Thu, 1 Oct 2015 13:25:55 +0100\0" - "To\0Eric Anholt <eric@anholt.net>\0" - "Cc\0linux-clk@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-rpi-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - Stephen Warren <swarren@wwwdotorg.org> - Stephen Boyd <sboyd@codeaurora.org> - Mike Turquette <mturquette@baylibre.com> - " devicetree@vger.kernel.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Mon, 28 Sep 2015, Eric Anholt wrote:\n" @@ -84,7 +76,7 @@ "> \t\t\treg = <0x7e100000 0x28>;\n" "> \t\t};\n" "> \n" - "> +\t\tclocks: cprman@7e101000 {\n" + "> +\t\tclocks: cprman at 7e101000 {\n" "> +\t\t\tcompatible = \"brcm,bcm2835-cprman\";\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\treg = <0x7e101000 0x2000>;\n" @@ -98,7 +90,7 @@ "> +\t\t\tclocks = <&clk_osc>;\n" "> +\t\t};\n" "> +\n" - "> \t\trng@7e104000 {\n" + "> \t\trng at 7e104000 {\n" "> \t\t\tcompatible = \"brcm,bcm2835-rng\";\n" "> \t\t\treg = <0x7e104000 0x10>;\n" "> @@ -96,7 +112,9 @@\n" @@ -152,7 +144,7 @@ "> \t\t#address-cells = <1>;\n" "> \t\t#size-cells = <0>;\n" "> \n" - "> -\t\tclk_mmc: clock@0 {\n" + "> -\t\tclk_mmc: clock at 0 {\n" "> -\t\t\tcompatible = \"fixed-clock\";\n" "> -\t\t\treg = <0>;\n" "> -\t\t\t#clock-cells = <0>;\n" @@ -160,9 +152,9 @@ "> -\t\t\tclock-frequency = <100000000>;\n" "> -\t\t};\n" "> -\n" - "> -\t\tclk_i2c: clock@1 {\n" + "> -\t\tclk_i2c: clock at 1 {\n" "> +\t\t/* The oscillator is the root of the clock tree. */\n" - "> +\t\tclk_osc: clock@3 {\n" + "> +\t\tclk_osc: clock at 3 {\n" "> \t\t\tcompatible = \"fixed-clock\";\n" "> -\t\t\treg = <1>;\n" "> +\t\t\treg = <3>;\n" @@ -173,7 +165,7 @@ "> +\t\t\tclock-frequency = <19200000>;\n" "> \t\t};\n" "> \n" - "> -\t\tclk_spi: clock@2 {\n" + "> -\t\tclk_spi: clock at 2 {\n" "> -\t\t\tcompatible = \"fixed-clock\";\n" "> -\t\t\treg = <2>;\n" "> -\t\t\t#clock-cells = <0>;\n" @@ -183,4 +175,4 @@ "> \t};\n" > }; -af4832d0838c2143821af4d8761a696ee29c743e8afce939047db88ef83d02f5 +f5802984ce38bd59f56741b0b2b089208b7c9374d05e1af9d5ba016f93b9e461
diff --git a/a/1.txt b/N2/1.txt index e562919..52d0591 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -21,8 +21,8 @@ On Mon, 28 Sep 2015, Eric Anholt wrote: > clock rate if the user configures the boot-time core clock speed using > config.txt. > -> Signed-off-by: Eric Anholt <eric@anholt.net> -> Acked-by: Stephen Warren <swarren@wwwdotorg.org> +> Signed-off-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org> +> Acked-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> > --- > arch/arm/boot/dts/bcm2835.dtsi | 52 +++++++++++++++++++++++------------------- > 1 file changed, 28 insertions(+), 24 deletions(-) @@ -166,3 +166,7 @@ As above. > - }; > }; > }; +-- +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/N2/content_digest index 47f4cc8..620802c 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,17 +1,18 @@ "ref\01443475325-22270-1-git-send-email-eric@anholt.net\0" "ref\01443475325-22270-4-git-send-email-eric@anholt.net\0" - "From\0Lee Jones <lee@kernel.org>\0" + "ref\01443475325-22270-4-git-send-email-eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org\0" + "From\0Lee Jones <lee-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>\0" "Subject\0Re: [PATCH v3 4/4] ARM: bcm2835: Switch to using the new clock driver support.\0" "Date\0Thu, 1 Oct 2015 13:25:55 +0100\0" - "To\0Eric Anholt <eric@anholt.net>\0" - "Cc\0linux-clk@vger.kernel.org" - linux-arm-kernel@lists.infradead.org - linux-rpi-kernel@lists.infradead.org - linux-kernel@vger.kernel.org - Stephen Warren <swarren@wwwdotorg.org> - Stephen Boyd <sboyd@codeaurora.org> - Mike Turquette <mturquette@baylibre.com> - " devicetree@vger.kernel.org\0" + "To\0Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>\0" + "Cc\0linux-clk-u79uwXL29TY76Z2rM5mHXA@public.gmane.org" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-rpi-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org> + Stephen Boyd <sboyd-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org> + Mike Turquette <mturquette-rdvid1DuHRBWk0Htik3J/w@public.gmane.org> + " devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "On Mon, 28 Sep 2015, Eric Anholt wrote:\n" @@ -37,8 +38,8 @@ "> clock rate if the user configures the boot-time core clock speed using\n" "> config.txt.\n" "> \n" - "> Signed-off-by: Eric Anholt <eric@anholt.net>\n" - "> Acked-by: Stephen Warren <swarren@wwwdotorg.org>\n" + "> Signed-off-by: Eric Anholt <eric-WhKQ6XTQaPysTnJN9+BGXg@public.gmane.org>\n" + "> Acked-by: Stephen Warren <swarren-3lzwWm7+Weoh9ZMKESR00Q@public.gmane.org>\n" "> ---\n" "> arch/arm/boot/dts/bcm2835.dtsi | 52 +++++++++++++++++++++++-------------------\n" "> 1 file changed, 28 insertions(+), 24 deletions(-)\n" @@ -181,6 +182,10 @@ "> -\t\t\tclock-frequency = <250000000>;\n" "> -\t\t};\n" "> \t};\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 -af4832d0838c2143821af4d8761a696ee29c743e8afce939047db88ef83d02f5 +8d222d37980152f09997494a981453f88adb93153b823925193c890651371b8d
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.