diff for duplicates of <20140116181528.GY8153@joshc.qualcomm.com> diff --git a/a/1.txt b/N1/1.txt index 2b52415..5e81d5c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote: > module clocks and the PLL6 in the device tree to allow their use by the SPI > controllers. > -> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 48 +++++++++++++++++++++++++++++++--------- > 1 file changed, 38 insertions(+), 10 deletions(-) @@ -26,7 +26,7 @@ On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote: > - #clock-cells = <0>; > - compatible = "fixed-clock"; > - clock-frequency = <0>; -> + pll6: clk@01c20028 { +> + pll6: clk at 01c20028 { > + #clock-cells = <1>; > + compatible = "allwinner,sun6i-a31-pll6-clk"; > + reg = <0x01c20028 0x4>; @@ -34,13 +34,13 @@ On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote: > + clock-output-names = "pll6"; > }; > -> cpu: cpu@01c20050 { +> cpu: cpu at 01c20050 { > @@ -182,6 +178,38 @@ > "apb2_uart1", "apb2_uart2", "apb2_uart3", > "apb2_uart4", "apb2_uart5"; > }; > + -> + spi0_clk: clk@01c200a0 { +> + spi0_clk: clk at 01c200a0 { > + #clock-cells = <0>; > + compatible = "allwinner,sun4i-mod0-clk"; > + reg = <0x01c200a0 0x4>; @@ -55,7 +55,3 @@ documentation indicates that #clock-cells should be 0 for the pll6 node. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation --- -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/N1/content_digest index 4e8c93b..544e039 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,22 +1,9 @@ "ref\01389892285-11745-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01389892285-11745-3-git-send-email-maxime.ripard@free-electrons.com\0" - "ref\01389892285-11745-3-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" - "From\0Josh Cartwright <joshc-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" - "Subject\0Re: [PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" + "From\0joshc@codeaurora.org (Josh Cartwright)\0" + "Subject\0[PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" "Date\0Thu, 16 Jan 2014 12:15:28 -0600\0" - "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Cc\0Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - kevin.z.m.zh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org - sunny-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - shuge-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - zhuzhenhua-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote:\n" @@ -24,7 +11,7 @@ "> module clocks and the PLL6 in the device tree to allow their use by the SPI\n" "> controllers.\n" "> \n" - "> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/sun6i-a31.dtsi | 48 +++++++++++++++++++++++++++++++---------\n" "> 1 file changed, 38 insertions(+), 10 deletions(-)\n" @@ -47,7 +34,7 @@ "> -\t\t\t#clock-cells = <0>;\n" "> -\t\t\tcompatible = \"fixed-clock\";\n" "> -\t\t\tclock-frequency = <0>;\n" - "> +\t\tpll6: clk@01c20028 {\n" + "> +\t\tpll6: clk at 01c20028 {\n" "> +\t\t\t#clock-cells = <1>;\n" "> +\t\t\tcompatible = \"allwinner,sun6i-a31-pll6-clk\";\n" "> +\t\t\treg = <0x01c20028 0x4>;\n" @@ -55,13 +42,13 @@ "> +\t\t\tclock-output-names = \"pll6\";\n" "> \t\t};\n" "> \n" - "> \t\tcpu: cpu@01c20050 {\n" + "> \t\tcpu: cpu at 01c20050 {\n" "> @@ -182,6 +178,38 @@\n" "> \t\t\t\t\t\"apb2_uart1\", \"apb2_uart2\", \"apb2_uart3\",\n" "> \t\t\t\t\t\"apb2_uart4\", \"apb2_uart5\";\n" "> \t\t};\n" "> +\n" - "> +\t\tspi0_clk: clk@01c200a0 {\n" + "> +\t\tspi0_clk: clk at 01c200a0 {\n" "> +\t\t\t#clock-cells = <0>;\n" "> +\t\t\tcompatible = \"allwinner,sun4i-mod0-clk\";\n" "> +\t\t\treg = <0x01c200a0 0x4>;\n" @@ -75,10 +62,6 @@ "\n" "-- \n" "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" - "hosted by The Linux Foundation\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 + hosted by The Linux Foundation -31b3c798e4c4825a4b2f2f423c0a5730dff12741d44094af188742c0f9295c13 +1cf0cb923d134118cd06617dcfd8dba60e616818e7e36b781597c24cba22fcfc
diff --git a/a/1.txt b/N2/1.txt index 2b52415..c1a4688 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -3,7 +3,7 @@ On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote: > module clocks and the PLL6 in the device tree to allow their use by the SPI > controllers. > -> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org> +> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com> > --- > arch/arm/boot/dts/sun6i-a31.dtsi | 48 +++++++++++++++++++++++++++++++--------- > 1 file changed, 38 insertions(+), 10 deletions(-) @@ -55,7 +55,3 @@ documentation indicates that #clock-cells should be 0 for the pll6 node. -- Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum, hosted by The Linux Foundation --- -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 4e8c93b..19a3cd1 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,21 @@ "ref\01389892285-11745-1-git-send-email-maxime.ripard@free-electrons.com\0" "ref\01389892285-11745-3-git-send-email-maxime.ripard@free-electrons.com\0" - "ref\01389892285-11745-3-git-send-email-maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org\0" - "From\0Josh Cartwright <joshc-sgV2jX0FEOL9JmXXK+q4OQ@public.gmane.org>\0" + "From\0Josh Cartwright <joshc@codeaurora.org>\0" "Subject\0Re: [PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" "Date\0Thu, 16 Jan 2014 12:15:28 -0600\0" - "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Cc\0Mark Brown <broonie-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Mike Turquette <mturquette-QSEj5FYQhm4dnm+yROfE0A@public.gmane.org> - Emilio Lopez <emilio-0Z03zUJReD5OxF6Tv1QG9Q@public.gmane.org> - devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-spi-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org - kevin.z.m.zh-Re5JQEeQqe8AvxtiuMwx3w@public.gmane.org - sunny-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - shuge-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - zhuzhenhua-0TFLnhJekD6UEPyfVivIlAC/G2K4zDHf@public.gmane.org - " linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org\0" + "To\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" + "Cc\0Mark Brown <broonie@kernel.org>" + Mike Turquette <mturquette@linaro.org> + Emilio Lopez <emilio@elopez.com.ar> + devicetree@vger.kernel.org + linux-kernel@vger.kernel.org + linux-spi@vger.kernel.org + linux-sunxi@googlegroups.com + kevin.z.m.zh@gmail.com + sunny@allwinnertech.com + shuge@allwinnertech.com + zhuzhenhua@allwinnertech.com + " linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "On Thu, Jan 16, 2014 at 06:11:23PM +0100, Maxime Ripard wrote:\n" @@ -24,7 +23,7 @@ "> module clocks and the PLL6 in the device tree to allow their use by the SPI\n" "> controllers.\n" "> \n" - "> Signed-off-by: Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\n" + "> Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>\n" "> ---\n" "> arch/arm/boot/dts/sun6i-a31.dtsi | 48 +++++++++++++++++++++++++++++++---------\n" "> 1 file changed, 38 insertions(+), 10 deletions(-)\n" @@ -75,10 +74,6 @@ "\n" "-- \n" "Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,\n" - "hosted by The Linux Foundation\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 + hosted by The Linux Foundation -31b3c798e4c4825a4b2f2f423c0a5730dff12741d44094af188742c0f9295c13 +8dc7b384a8d890e37fa7e28ebf634b044d817b3dd79aee1e03839bb50f363dd2
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.