diff for duplicates of <52E12BA0.4050003@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 456c2b2..38e027e 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,15 +3,15 @@ Hi, On 01/23/2014 09:34 AM, Chen-Yu Tsai wrote: > Hi, > -> On Thu, Jan 23, 2014 at 3:04 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote: ->> From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> +> On Thu, Jan 23, 2014 at 3:04 AM, Hans de Goede <hdegoede@redhat.com> wrote: +>> 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 +++++ @@ -28,12 +28,12 @@ On 01/23/2014 09:34 AM, Chen-Yu Tsai wrote: >> 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 @@ -51,13 +51,13 @@ On 01/23/2014 09:34 AM, Chen-Yu Tsai wrote: >> 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 @@ -67,7 +67,7 @@ On 01/23/2014 09:34 AM, Chen-Yu Tsai wrote: >> status = "disabled"; >> }; >> ->> + ahci: sata@01c18000 { +>> + ahci: sata at 01c18000 { >> + compatible = "allwinner,sun4i-a10-ahci"; >> + reg = <0x01c18000 0x1000>; >> + interrupts = <56>; @@ -87,7 +87,7 @@ ahci does not use pinctrl, the ahci (and usb) phys have dedicated pins, since they don't use pinctrl at all no such warnings are issued. > ->> 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 @@ since they don't use pinctrl at all no such warnings are issued. >> +/* >> + * 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,13 +110,13 @@ since they don't use pinctrl at all no such warnings are issued. >> + */ >> + >> +/ { ->> + soc@01c00000 { +>> + soc at 01c00000 { > > This block needs to be under > -> pinctrl@01c20800 { +> pinctrl at 01c20800 { > ->> + ahci_pwr_pin_a: ahci_pwr_pin@0 { +>> + 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 2b4c9b1..e4ebc51 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,20 +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\0CAGb2v65mYK7Lo_KC+sGvYG7P2kDOy7CZgGane2eY8+-pMvH1mw@mail.gmail.com\0" - "ref\0CAGb2v65mYK7Lo_KC+sGvYG7P2kDOy7CZgGane2eY8+-pMvH1mw-JsoAwUIsXosN+BqQ9rBEUg@public.gmane.org\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[linux-sunxi] [PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support\0" "Date\0Thu, 23 Jan 2014 15:48:00 +0100\0" - "To\0Chen-Yu Tsai <wens-jdAy2FN1RRM@public.gmane.org>" - " linux-sunxi <linux-sunxi-/JYPxA39Uh5TLH3MbocFFw@public.gmane.org>\0" - "Cc\0Tejun Heo <tj-DgEjT+Ai2ygdnm+yROfE0A@public.gmane.org>" - Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> - Maxime Ripard <maxime.ripard-wi1+55ScJUtKEb57/3fJTNBPR1lH4CV8@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 <linux-arm-kernel-IAPFreCvJWM7uuMidbF8XUB+6BGkLq7r@public.gmane.org> - " devicetree <devicetree-u79uwXL29TY76Z2rM5mHXA@public.gmane.org>\0" + "To\0linux-arm-kernel@lists.infradead.org\0" "\00:1\0" "b\0" "Hi,\n" @@ -22,15 +12,15 @@ "On 01/23/2014 09:34 AM, Chen-Yu Tsai wrote:\n" "> Hi,\n" ">\n" - "> On Thu, Jan 23, 2014 at 3:04 AM, Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> wrote:\n" - ">> From: Oliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org>\n" + "> On Thu, Jan 23, 2014 at 3:04 AM, Hans de Goede <hdegoede@redhat.com> wrote:\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" @@ -47,12 +37,12 @@ ">> status = \"okay\";\n" ">> };\n" ">>\n" - ">> + ahci: sata@01c18000 {\n" + ">> + ahci: sata at 01c18000 {\n" ">> + status = \"okay\";\n" ">> + };\n" ">> +\n" - ">> pinctrl@01c20800 {\n" - ">> mmc0_cd_pin_a1000: mmc0_cd_pin@0 {\n" + ">> pinctrl at 01c20800 {\n" + ">> mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {\n" ">> allwinner,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" @@ -70,13 +60,13 @@ ">> status = \"okay\";\n" ">> };\n" ">>\n" - ">> + ahci: sata@01c18000 {\n" + ">> + ahci: sata at 01c18000 {\n" ">> + target-supply = <®_ahci_5v>;\n" ">> + status = \"okay\";\n" ">> + };\n" ">> +\n" - ">> pinctrl@01c20800 {\n" - ">> mmc0_cd_pin_cubieboard: mmc0_cd_pin@0 {\n" + ">> pinctrl at 01c20800 {\n" + ">> mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {\n" ">> allwinner,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" @@ -86,7 +76,7 @@ ">> status = \"disabled\";\n" ">> };\n" ">>\n" - ">> + ahci: sata@01c18000 {\n" + ">> + ahci: sata at 01c18000 {\n" ">> + compatible = \"allwinner,sun4i-a10-ahci\";\n" ">> + reg = <0x01c18000 0x1000>;\n" ">> + interrupts = <56>;\n" @@ -106,7 +96,7 @@ "since they don't use pinctrl at all no such warnings are issued.\n" "\n" ">\n" - ">> intc: interrupt-controller@01c20400 {\n" + ">> intc: interrupt-controller at 01c20400 {\n" ">> compatible = \"allwinner,sun4i-ic\";\n" ">> reg = <0x01c20400 0x400>;\n" ">> diff --git a/arch/arm/boot/dts/sunxi-ahci-reg.dtsi b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi\n" @@ -118,7 +108,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" @@ -129,13 +119,13 @@ ">> + */\n" ">> +\n" ">> +/ {\n" - ">> + soc@01c00000 {\n" + ">> + soc at 01c00000 {\n" ">\n" "> This block needs to be under\n" ">\n" - "> pinctrl@01c20800 {\n" + "> pinctrl at 01c20800 {\n" ">\n" - ">> + ahci_pwr_pin_a: ahci_pwr_pin@0 {\n" + ">> + ahci_pwr_pin_a: ahci_pwr_pin at 0 {\n" ">> + allwinner,pins = \"PB8\";\n" ">> + allwinner,function = \"gpio_out\";\n" ">> + allwinner,drive = <0>;\n" @@ -150,4 +140,4 @@ "\n" Hans -e574270a973469d8c1f89007dc50f5265b21aa22e6a26891643269d276f1f6ca +08cd8ff6526d52c01823dcc69344e0edc87f1d7a9159ff4bf9146c89ffd70ba0
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.