diff for duplicates of <20140219060643.22529.44045@quantum> diff --git a/a/1.txt b/N1/1.txt index b756db0..81d5047 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ Quoting Chen-Yu Tsai (2014-02-10 02:35:47) > and interface type of the GMAC ethernet controller. Model this as > a single clock for GMAC drivers to use. > -> Signed-off-by: Chen-Yu Tsai <wens@csie.org> +> Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org> Looks good to me. @@ -37,26 +37,26 @@ Mike > Clock consumers should specify the desired clocks they use with a > "clocks" phandle cell. Consumers that are using a gated clock should > provide an additional ID in their clock property. This ID is the -> @@ -96,3 +100,29 @@ mmc0_clk: clk at 01c20088 { +> @@ -96,3 +100,29 @@ mmc0_clk: clk@01c20088 { > clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; > clock-output-names = "mmc0"; > }; > + -> +mii_phy_tx_clk: clk at 2 { +> +mii_phy_tx_clk: clk@2 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <25000000>; > + clock-output-names = "mii_phy_tx"; > +}; > + -> +gmac_int_tx_clk: clk at 3 { +> +gmac_int_tx_clk: clk@3 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <125000000>; > + clock-output-names = "gmac_int_tx"; > +}; > + -> +gmac_clk: clk at 01c20164 { +> +gmac_clk: clk@01c20164 { > + #clock-cells = <0>; > + compatible = "allwinner,sun7i-a20-gmac-clk"; > + reg = <0x01c20164 0x4>; diff --git a/a/content_digest b/N1/content_digest index 463475e..15f7d0c 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,9 +1,16 @@ "ref\01392028554-32545-1-git-send-email-wens@csie.org\0" "ref\01392028554-32545-2-git-send-email-wens@csie.org\0" - "From\0mturquette@linaro.org (Mike Turquette)\0" - "Subject\0[PATCH v4 1/8] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit\0" + "ref\01392028554-32545-2-git-send-email-wens-jdAy2FN1RRM@public.gmane.org\0" + "From\0Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org>\0" + "Subject\0Re: [PATCH v4 1/8] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit\0" "Date\0Tue, 18 Feb 2014 22:06:43 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>" + " Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org>\0" + "Cc\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>" + linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org + linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org + devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org + " linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org\0" "\00:1\0" "b\0" "Quoting Chen-Yu Tsai (2014-02-10 02:35:47)\n" @@ -11,7 +18,7 @@ "> and interface type of the GMAC ethernet controller. Model this as\n" "> a single clock for GMAC drivers to use.\n" "> \n" - "> Signed-off-by: Chen-Yu Tsai <wens@csie.org>\n" + "> Signed-off-by: Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>\n" "\n" "Looks good to me.\n" "\n" @@ -45,26 +52,26 @@ "> Clock consumers should specify the desired clocks they use with a\n" "> \"clocks\" phandle cell. Consumers that are using a gated clock should\n" "> provide an additional ID in their clock property. This ID is the\n" - "> @@ -96,3 +100,29 @@ mmc0_clk: clk at 01c20088 {\n" + "> @@ -96,3 +100,29 @@ mmc0_clk: clk@01c20088 {\n" "> clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;\n" "> clock-output-names = \"mmc0\";\n" "> };\n" "> +\n" - "> +mii_phy_tx_clk: clk at 2 {\n" + "> +mii_phy_tx_clk: clk@2 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"fixed-clock\";\n" "> + clock-frequency = <25000000>;\n" "> + clock-output-names = \"mii_phy_tx\";\n" "> +};\n" "> +\n" - "> +gmac_int_tx_clk: clk at 3 {\n" + "> +gmac_int_tx_clk: clk@3 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"fixed-clock\";\n" "> + clock-frequency = <125000000>;\n" "> + clock-output-names = \"gmac_int_tx\";\n" "> +};\n" "> +\n" - "> +gmac_clk: clk at 01c20164 {\n" + "> +gmac_clk: clk@01c20164 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"allwinner,sun7i-a20-gmac-clk\";\n" "> + reg = <0x01c20164 0x4>;\n" @@ -187,4 +194,4 @@ "> 1.9.rc1\n" > -5dd7f9996836535933da578cac618be6e114e5602324b3e8dabd7618d73520b8 +eb1e3897c3ab7f6a2ee745990f3ca060e22ba64518073edf7d8d166ac3501e52
diff --git a/a/1.txt b/N2/1.txt index b756db0..b2bcbe4 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -37,26 +37,26 @@ Mike > Clock consumers should specify the desired clocks they use with a > "clocks" phandle cell. Consumers that are using a gated clock should > provide an additional ID in their clock property. This ID is the -> @@ -96,3 +100,29 @@ mmc0_clk: clk at 01c20088 { +> @@ -96,3 +100,29 @@ mmc0_clk: clk@01c20088 { > clocks = <&osc24M>, <&pll6 1>, <&pll5 1>; > clock-output-names = "mmc0"; > }; > + -> +mii_phy_tx_clk: clk at 2 { +> +mii_phy_tx_clk: clk@2 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <25000000>; > + clock-output-names = "mii_phy_tx"; > +}; > + -> +gmac_int_tx_clk: clk at 3 { +> +gmac_int_tx_clk: clk@3 { > + #clock-cells = <0>; > + compatible = "fixed-clock"; > + clock-frequency = <125000000>; > + clock-output-names = "gmac_int_tx"; > +}; > + -> +gmac_clk: clk at 01c20164 { +> +gmac_clk: clk@01c20164 { > + #clock-cells = <0>; > + compatible = "allwinner,sun7i-a20-gmac-clk"; > + reg = <0x01c20164 0x4>; diff --git a/a/content_digest b/N2/content_digest index 463475e..450bc74 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,9 +1,16 @@ "ref\01392028554-32545-1-git-send-email-wens@csie.org\0" "ref\01392028554-32545-2-git-send-email-wens@csie.org\0" - "From\0mturquette@linaro.org (Mike Turquette)\0" - "Subject\0[PATCH v4 1/8] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit\0" + "From\0Mike Turquette <mturquette@linaro.org>\0" + "Subject\0Re: [PATCH v4 1/8] clk: sunxi: Add Allwinner A20/A31 GMAC clock unit\0" "Date\0Tue, 18 Feb 2014 22:06:43 -0800\0" - "To\0linux-arm-kernel@lists.infradead.org\0" + "To\0Chen-Yu Tsai <wens@csie.org>" + Maxime Ripard <maxime.ripard@free-electrons.com> + " Emilio Lopez <emilio@elopez.com.ar>\0" + "Cc\0Chen-Yu Tsai <wens@csie.org>" + linux-arm-kernel@lists.infradead.org + linux-sunxi@googlegroups.com + devicetree@vger.kernel.org + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Quoting Chen-Yu Tsai (2014-02-10 02:35:47)\n" @@ -45,26 +52,26 @@ "> Clock consumers should specify the desired clocks they use with a\n" "> \"clocks\" phandle cell. Consumers that are using a gated clock should\n" "> provide an additional ID in their clock property. This ID is the\n" - "> @@ -96,3 +100,29 @@ mmc0_clk: clk at 01c20088 {\n" + "> @@ -96,3 +100,29 @@ mmc0_clk: clk@01c20088 {\n" "> clocks = <&osc24M>, <&pll6 1>, <&pll5 1>;\n" "> clock-output-names = \"mmc0\";\n" "> };\n" "> +\n" - "> +mii_phy_tx_clk: clk at 2 {\n" + "> +mii_phy_tx_clk: clk@2 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"fixed-clock\";\n" "> + clock-frequency = <25000000>;\n" "> + clock-output-names = \"mii_phy_tx\";\n" "> +};\n" "> +\n" - "> +gmac_int_tx_clk: clk at 3 {\n" + "> +gmac_int_tx_clk: clk@3 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"fixed-clock\";\n" "> + clock-frequency = <125000000>;\n" "> + clock-output-names = \"gmac_int_tx\";\n" "> +};\n" "> +\n" - "> +gmac_clk: clk at 01c20164 {\n" + "> +gmac_clk: clk@01c20164 {\n" "> + #clock-cells = <0>;\n" "> + compatible = \"allwinner,sun7i-a20-gmac-clk\";\n" "> + reg = <0x01c20164 0x4>;\n" @@ -187,4 +194,4 @@ "> 1.9.rc1\n" > -5dd7f9996836535933da578cac618be6e114e5602324b3e8dabd7618d73520b8 +34ecd2ad8b2918d1a88cad219fb51db891b0e7fc8de5797e51e2e9a271d62a1a
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.