diff for duplicates of <20140131134505.GG2950@lukather> diff --git a/a/1.txt b/N1/1.txt index e994f14..98b5e02 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,14 +1,14 @@ Hi Hans, On Wed, Jan 22, 2014 at 08:04:48PM +0100, Hans de Goede wrote: -> From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> +> From: Oliver Schinagl <oliver@schinagl.nl> > > This patch adds sunxi sata support to A10 boards that have such a connector. > Some boards also feature a regulator via a GPIO and support for this is also > added. > -> Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> -> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> +> Signed-off-by: Hans de Goede <hdegoede@redhat.com> > --- > arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ > arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ @@ -29,12 +29,12 @@ platforms we support, we can always change it back if things become too messy. > status = "okay"; > }; > -> + ahci: sata@01c18000 { +> + ahci: sata at 01c18000 { > + status = "okay"; > + }; > + -> pinctrl@01c20800 { -> mmc0_cd_pin_a1000: mmc0_cd_pin@0 { +> pinctrl at 01c20800 { +> mmc0_cd_pin_a1000: mmc0_cd_pin at 0 { > allwinner,pins = "PH1"; > diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts > index f50fb2b..6ae1110 100644 @@ -52,13 +52,13 @@ platforms we support, we can always change it back if things become too messy. > status = "okay"; > }; > -> + ahci: sata@01c18000 { +> + ahci: sata at 01c18000 { > + target-supply = <®_ahci_5v>; > + status = "okay"; > + }; > + -> pinctrl@01c20800 { -> mmc0_cd_pin_cubieboard: mmc0_cd_pin@0 { +> pinctrl at 01c20800 { +> mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 { > allwinner,pins = "PH1"; > diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi > index 4736dd2..198dcda 100644 @@ -68,7 +68,7 @@ platforms we support, we can always change it back if things become too messy. > status = "disabled"; > }; > -> + ahci: sata@01c18000 { +> + ahci: sata at 01c18000 { > + compatible = "allwinner,sun4i-a10-ahci"; To be consistent with the rest of the sun4i devices compatible, It @@ -87,7 +87,7 @@ I'll cook up some patches for the other devices. > + status = "disabled"; > + }; > + -> intc: interrupt-controller@01c20400 { +> intc: interrupt-controller at 01c20400 { > compatible = "allwinner,sun4i-ic"; > reg = <0x01c20400 0x400>; > diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -99,7 +99,7 @@ I'll cook up some patches for the other devices. > +/* > + * sunxi boards sata target power supply common code > + * -> + * Copyright 2014 - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> +> + * Copyright 2014 - Hans de Goede <hdegoede@redhat.com> > + * > + * The code contained herein is licensed under the GNU General Public > + * License. You may obtain a copy of the GNU General Public License @@ -110,8 +110,8 @@ I'll cook up some patches for the other devices. > + */ > + > +/ { -> + soc@01c00000 { -> + ahci_pwr_pin_a: ahci_pwr_pin@0 { +> + soc at 01c00000 { +> + ahci_pwr_pin_a: ahci_pwr_pin at 0 { > + allwinner,pins = "PB8"; > + allwinner,function = "gpio_out"; > + allwinner,drive = <0>; @@ -127,3 +127,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/20140131/4caca1fa/attachment.sig> diff --git a/a/2.bin b/a/2.bin deleted file mode 100644 index a213d9a..0000000 --- a/a/2.bin +++ /dev/null @@ -1,17 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1.4.14 (GNU/Linux) - -iQIcBAEBAgAGBQJS66jhAAoJEBx+YmzsjxAgnNEQAK5tzBQ5AzZSGaHwoFTjTQnF -Gjw2QspnW3cZDZ/WLRxN7fRBBC+AgyF+g0QPOC1Oe85/dq8nB3j3dOJ3wtt1sOIB -aRCL6ha1T0wario4KvzYBwhG9e9bZ07CuWdYxtzo8Weh4coAG6EiOu0M2ilYkK9f -D1qmwHWVHfB0JC1aBs24yFdvKUV+CPIodslYaSZwOM2FjsE8hnx/Xpqd6ef/VbQl -tGPgMGp0Kz5clo+j7BuVrs8uRnBvSloCG06LNGEHKpiQkKQbtGAKSu9tGUeq2DqE -0Z5q+sbdQZTLy0geUyhBqFZkXGKAGIxy4JRwe1YaY7u6u3Xw7DYrw+UjHqHWoGOJ -cYPvPYDfpqftaKyL4KF+40SZP+NCUoUpbhl6oqqBFqAfNvk99aqxcR5DfyyDm1xz -shSb9Ut9gll1VoI7PEyBvSe2uX3nXv46M54nLGlmkjF79RNtarb5EvTKSpaoEska -dki2k0K5INZQjoLf/d7slMm9CzBQnOn9oftjX46UWj2qayDrzlLItnucp5UJYNnm -U+f7WHlsW05Aj6bV0p1RBNMMmPbXtLrGrRjetKHdluQJQEt6Jf2ElkLStr92bXvL -6JLnWfS7S6PEp3dhGrsWEdv62fGTfefg3SMoeWkOQREkAdmtl52Br/1SX4DKBwVU -ScRtLoCr3xUFDz7MME2K -=aA+g ------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 957cb81..3db4d91 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,31 +1,22 @@ "ref\01390417489-5354-1-git-send-email-hdegoede@redhat.com\0" "ref\01390417489-5354-14-git-send-email-hdegoede@redhat.com\0" - "ref\01390417489-5354-14-git-send-email-hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org\0" - "From\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@public.gmane.org>\0" - "Subject\0Re: [PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support\0" + "From\0maxime.ripard@free-electrons.com (Maxime Ripard)\0" + "Subject\0[PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support\0" "Date\0Fri, 31 Jan 2014 14:45:05 +0100\0" - "To\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Cc\0Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> - Richard Zhu <Hong-Xing.Zhu-KZfg59tc24xl57MIdRCFDg@public.gmane.org> - Roger Quadros <rogerq-l0cyMroinI0@public.gmane.org> - linux-ide-u79uwXL29TY76Z2rM5mHXA@public.gmane.org - linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org - devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org> - " linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org\0" - "\01:1\0" + "To\0linux-arm-kernel@lists.infradead.org\0" + "\00:1\0" "b\0" "Hi Hans,\n" "\n" "On Wed, Jan 22, 2014 at 08:04:48PM +0100, Hans de Goede wrote:\n" - "> From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\n" + "> From: Oliver Schinagl <oliver@schinagl.nl>\n" "> \n" "> This patch adds sunxi sata support to A10 boards that have such a connector.\n" "> Some boards also feature a regulator via a GPIO and support for this is also\n" "> added.\n" "> \n" - "> Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\n" - "> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>\n" + "> Signed-off-by: Hans de Goede <hdegoede@redhat.com>\n" "> ---\n" "> arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++\n" "> arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++\n" @@ -46,12 +37,12 @@ "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> \n" - "> +\t\tahci: sata@01c18000 {\n" + "> +\t\tahci: sata at 01c18000 {\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> \t\tpinctrl@01c20800 {\n" - "> \t\t\tmmc0_cd_pin_a1000: mmc0_cd_pin@0 {\n" + "> \t\tpinctrl at 01c20800 {\n" + "> \t\t\tmmc0_cd_pin_a1000: mmc0_cd_pin at 0 {\n" "> \t\t\t\tallwinner,pins = \"PH1\";\n" "> diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n" "> index f50fb2b..6ae1110 100644\n" @@ -69,13 +60,13 @@ "> \t\t\tstatus = \"okay\";\n" "> \t\t};\n" "> \n" - "> +\t\tahci: sata@01c18000 {\n" + "> +\t\tahci: sata at 01c18000 {\n" "> +\t\t\ttarget-supply = <®_ahci_5v>;\n" "> +\t\t\tstatus = \"okay\";\n" "> +\t\t};\n" "> +\n" - "> \t\tpinctrl@01c20800 {\n" - "> \t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin@0 {\n" + "> \t\tpinctrl at 01c20800 {\n" + "> \t\t\tmmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {\n" "> \t\t\t\tallwinner,pins = \"PH1\";\n" "> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi\n" "> index 4736dd2..198dcda 100644\n" @@ -85,7 +76,7 @@ "> \t\t\tstatus = \"disabled\";\n" "> \t\t};\n" "> \n" - "> +\t\tahci: sata@01c18000 {\n" + "> +\t\tahci: sata at 01c18000 {\n" "> +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\";\n" "\n" "To be consistent with the rest of the sun4i devices compatible, It\n" @@ -104,7 +95,7 @@ "> +\t\t\tstatus = \"disabled\";\n" "> +\t\t};\n" "> +\n" - "> \t\tintc: interrupt-controller@01c20400 {\n" + "> \t\tintc: interrupt-controller at 01c20400 {\n" "> \t\t\tcompatible = \"allwinner,sun4i-ic\";\n" "> \t\t\treg = <0x01c20400 0x400>;\n" "> diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi\n" @@ -116,7 +107,7 @@ "> +/*\n" "> + * sunxi boards sata target power supply common code\n" "> + *\n" - "> + * Copyright 2014 - Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\n" + "> + * Copyright 2014 - Hans de Goede <hdegoede@redhat.com>\n" "> + *\n" "> + * The code contained herein is licensed under the GNU General Public\n" "> + * License. You may obtain a copy of the GNU General Public License\n" @@ -127,8 +118,8 @@ "> + */\n" "> +\n" "> +/ {\n" - "> +\tsoc@01c00000 {\n" - "> +\t\tahci_pwr_pin_a: ahci_pwr_pin@0 {\n" + "> +\tsoc at 01c00000 {\n" + "> +\t\tahci_pwr_pin_a: ahci_pwr_pin at 0 {\n" "> +\t\t\tallwinner,pins = \"PB8\";\n" "> +\t\t\tallwinner,function = \"gpio_out\";\n" "> +\t\t\tallwinner,drive = <0>;\n" @@ -143,27 +134,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" - "iQIcBAEBAgAGBQJS66jhAAoJEBx+YmzsjxAgnNEQAK5tzBQ5AzZSGaHwoFTjTQnF\n" - "Gjw2QspnW3cZDZ/WLRxN7fRBBC+AgyF+g0QPOC1Oe85/dq8nB3j3dOJ3wtt1sOIB\n" - "aRCL6ha1T0wario4KvzYBwhG9e9bZ07CuWdYxtzo8Weh4coAG6EiOu0M2ilYkK9f\n" - "D1qmwHWVHfB0JC1aBs24yFdvKUV+CPIodslYaSZwOM2FjsE8hnx/Xpqd6ef/VbQl\n" - "tGPgMGp0Kz5clo+j7BuVrs8uRnBvSloCG06LNGEHKpiQkKQbtGAKSu9tGUeq2DqE\n" - "0Z5q+sbdQZTLy0geUyhBqFZkXGKAGIxy4JRwe1YaY7u6u3Xw7DYrw+UjHqHWoGOJ\n" - "cYPvPYDfpqftaKyL4KF+40SZP+NCUoUpbhl6oqqBFqAfNvk99aqxcR5DfyyDm1xz\n" - "shSb9Ut9gll1VoI7PEyBvSe2uX3nXv46M54nLGlmkjF79RNtarb5EvTKSpaoEska\n" - "dki2k0K5INZQjoLf/d7slMm9CzBQnOn9oftjX46UWj2qayDrzlLItnucp5UJYNnm\n" - "U+f7WHlsW05Aj6bV0p1RBNMMmPbXtLrGrRjetKHdluQJQEt6Jf2ElkLStr92bXvL\n" - "6JLnWfS7S6PEp3dhGrsWEdv62fGTfefg3SMoeWkOQREkAdmtl52Br/1SX4DKBwVU\n" - "ScRtLoCr3xUFDz7MME2K\n" - "=aA+g\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/20140131/4caca1fa/attachment.sig> -b1f181786386eaf6dffca1a4b6ece0b0180e227036ca6896a28a9da7ec2e7dcf +3e7d332d3d44b08105cbabd7f7fe0d03ccd71e326029108c2efbd4a166b35fba
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.