diff for duplicates of <52EF70E2.6070803@redhat.com> diff --git a/a/1.txt b/N1/1.txt index c35a075..781330e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,14 +4,14 @@ On 01/31/2014 02:45 PM, Maxime Ripard wrote: > 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 +++++ @@ -42,12 +42,12 @@ using here for the sata supply. >> 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 @@ -65,13 +65,13 @@ using here for the sata supply. >> 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 @@ -81,7 +81,7 @@ using here for the sata supply. >> 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 @@ -107,7 +107,7 @@ Thanks. >> + 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 @@ -119,7 +119,7 @@ Thanks. >> +/* >> + * 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 @@ -130,8 +130,8 @@ Thanks. >> + */ >> + >> +/ { ->> + 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>; diff --git a/a/content_digest b/N1/content_digest index d581a31..eb89f45 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,18 +1,10 @@ "ref\01390417489-5354-1-git-send-email-hdegoede@redhat.com\0" "ref\01390417489-5354-14-git-send-email-hdegoede@redhat.com\0" "ref\020140131134505.GG2950@lukather\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support\0" "Date\0Mon, 03 Feb 2014 11:35:14 +0100\0" - "To\0Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@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" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -21,14 +13,14 @@ "> 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" @@ -59,12 +51,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" @@ -82,13 +74,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" @@ -98,7 +90,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" @@ -124,7 +116,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" @@ -136,7 +128,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" @@ -147,8 +139,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" @@ -163,4 +155,4 @@ "\n" Hans -e6fa0748c3bfa16508a596c3e6b5a33b526b0e2c570077e645a9e7cd3404e118 +b8d88b7aac0ce97074dbc5a54da9a4d24806798d82cc04535f059d9b9e7a29f4
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.