diff for duplicates of <20140117120745.GB3867@lukather> diff --git a/a/1.txt b/N1/1.txt index 963f419..f853d4c 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -6,7 +6,7 @@ On Thu, Jan 16, 2014 at 12:15:28PM -0600, Josh Cartwright 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(-) @@ -29,7 +29,7 @@ On Thu, Jan 16, 2014 at 12:15:28PM -0600, Josh Cartwright 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>; @@ -37,13 +37,13 @@ On Thu, Jan 16, 2014 at 12:15:28PM -0600, Josh Cartwright 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>; @@ -65,3 +65,10 @@ Maxime Maxime Ripard, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com +-------------- next part -------------- +A non-text attachment was scrubbed... +Name: signature.asc +Type: application/pgp-signature +Size: 836 bytes +Desc: Digital signature +URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140117/10c9df26/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index c328a99..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (GNU/Linux) - -iQIcBAEBAgAGBQJS2R0RAAoJEBx+YmzsjxAgZIMP/jSdAvtwBrXo5RfquYcPwaf/ -eRbUfbUwhBxi1TgMOodxqr/RvgKZAix8cGXAZbn/lPevwCCF+YaB5ydCJrcnb9HK -yvFjFmb0kweYpMZDkfL3KNDEkgiK5l5+ayxT0A1C6kEv6yi/oXTsVOhP6sds1rVg -p3my6L3Id/hwq/2RD9QidzSTJVyR1OURCR3Uq8RHZIg9s6znQngLLytpVVsIUg2U -x6sDA9VzGfbJJkWC9xewGrZrYtUNTNAt8LoTLcHN60hdGRrILAF+HXisyy5tdww9 -o1ZiHNnsn8M3DMABNQ2MBNMmy9CgTJqcUIIVlPkR/EyGFW4Fb4gcxT8+yTwgCfRy -Qw38N4F3W8WNpOu1OZtMy8/0J7OU5Mlkqqvygq5z9/hZ1hJVk87c/WkwpDLye25Y -oIhXE+Sv5p3n+uGaCj+rBpDtUkw8Vzyw4KrSYUC9PpOctBHO0NNEz1nVcBtrfqKy -j/DcZ8WJccfeCKb7q/7UpAGi5pe1kpCnOFdHaZlT+X0LioVeVp0rRbfPMdv9bCqo -d4FbJUAPmjVK1ECavcXdY4rMWxno9KI75SWU5yaBlQNUkFPlJFWYjasKkS55N56c -BCpTnlTg2DdBeOL7sQSZHAJGJ629H3AgiSi08B4l3n7JRvz/a61YTwfMjbofmGR/ -tuPPDWIS9SEylXuuXdq3 -=Ple6 ------END PGP SIGNATURE----- diff --git a/a/2.hdr b/a/2.hdr deleted file mode 100644 index 3237378..0000000 --- a/a/2.hdr +++ /dev/null @@ -1,2 +0,0 @@ -Content-Type: application/pgp-signature; name="signature.asc" -Content-Description: Digital signature diff --git a/a/content_digest b/N1/content_digest index 6e15804..6805d13 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,24 +1,11 @@ "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\020140116181528.GY8153@joshc.qualcomm.com\0" - "ref\020140116181528.GY8153-OP5zVEFNDbfdOxZ39nK119BPR1lH4CV8@public.gmane.org\0" - "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Subject\0Re: [PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" + "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" + "Subject\0[PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" "Date\0Fri, 17 Jan 2014 13:07:45 +0100\0" - "To\0Josh Cartwright <joshc-sgV2jX0FEOL9JmXXK+q4OQ@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" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi Josh,\n" "\n" @@ -28,7 +15,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" @@ -51,7 +38,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" @@ -59,13 +46,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" @@ -86,27 +73,13 @@ "-- \n" "Maxime Ripard, Free Electrons\n" "Embedded Linux, Kernel and Android engineering\n" - http://free-electrons.com - "\01:2\0" - "fn\0signature.asc\0" - "d\0Digital signature\0" - "b\0" - "-----BEGIN PGP SIGNATURE-----\n" - "Version: GnuPG v1.4.14 (GNU/Linux)\n" - "\n" - "iQIcBAEBAgAGBQJS2R0RAAoJEBx+YmzsjxAgZIMP/jSdAvtwBrXo5RfquYcPwaf/\n" - "eRbUfbUwhBxi1TgMOodxqr/RvgKZAix8cGXAZbn/lPevwCCF+YaB5ydCJrcnb9HK\n" - "yvFjFmb0kweYpMZDkfL3KNDEkgiK5l5+ayxT0A1C6kEv6yi/oXTsVOhP6sds1rVg\n" - "p3my6L3Id/hwq/2RD9QidzSTJVyR1OURCR3Uq8RHZIg9s6znQngLLytpVVsIUg2U\n" - "x6sDA9VzGfbJJkWC9xewGrZrYtUNTNAt8LoTLcHN60hdGRrILAF+HXisyy5tdww9\n" - "o1ZiHNnsn8M3DMABNQ2MBNMmy9CgTJqcUIIVlPkR/EyGFW4Fb4gcxT8+yTwgCfRy\n" - "Qw38N4F3W8WNpOu1OZtMy8/0J7OU5Mlkqqvygq5z9/hZ1hJVk87c/WkwpDLye25Y\n" - "oIhXE+Sv5p3n+uGaCj+rBpDtUkw8Vzyw4KrSYUC9PpOctBHO0NNEz1nVcBtrfqKy\n" - "j/DcZ8WJccfeCKb7q/7UpAGi5pe1kpCnOFdHaZlT+X0LioVeVp0rRbfPMdv9bCqo\n" - "d4FbJUAPmjVK1ECavcXdY4rMWxno9KI75SWU5yaBlQNUkFPlJFWYjasKkS55N56c\n" - "BCpTnlTg2DdBeOL7sQSZHAJGJ629H3AgiSi08B4l3n7JRvz/a61YTwfMjbofmGR/\n" - "tuPPDWIS9SEylXuuXdq3\n" - "=Ple6\n" - "-----END PGP SIGNATURE-----\n" + "http://free-electrons.com\n" + "-------------- next part --------------\n" + "A non-text attachment was scrubbed...\n" + "Name: signature.asc\n" + "Type: application/pgp-signature\n" + "Size: 836 bytes\n" + "Desc: Digital signature\n" + URL: <http://lists.infradead.org/pipermail/linux-arm-kernel/attachments/20140117/10c9df26/attachment.sig> -59b6f3603fba6ea2479843418acf635fdf17448acff82e4fbc89914f09b3d6b8 +f23a312eb40d17c74cd8af6326735eb49ce74de88dba6cb39f8a6ac824f08d2b
diff --git a/a/1.txt b/N2/1.txt index 963f419..36d5679 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -6,7 +6,7 @@ On Thu, Jan 16, 2014 at 12:15:28PM -0600, Josh Cartwright 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(-) diff --git a/a/content_digest b/N2/content_digest index 6e15804..67df5b3 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,23 +1,22 @@ "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\020140116181528.GY8153@joshc.qualcomm.com\0" - "ref\020140116181528.GY8153-OP5zVEFNDbfdOxZ39nK119BPR1lH4CV8@public.gmane.org\0" - "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" + "From\0Maxime Ripard <maxime.ripard@free-electrons.com>\0" "Subject\0Re: [PATCH 2/4] ARM: sun6i: dt: Add PLL6 and SPI module clocks\0" "Date\0Fri, 17 Jan 2014 13:07:45 +0100\0" - "To\0Josh Cartwright <joshc-sgV2jX0FEOL9JmXXK+q4OQ@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\0Josh Cartwright <joshc@codeaurora.org>\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" "\01:1\0" "b\0" "Hi Josh,\n" @@ -28,7 +27,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" @@ -109,4 +108,4 @@ "=Ple6\n" "-----END PGP SIGNATURE-----\n" -59b6f3603fba6ea2479843418acf635fdf17448acff82e4fbc89914f09b3d6b8 +dfa34e3e7598ed0a897ca2fd11fe49502a282c40dd1012787a3b8bdd8f0b692e
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.