diff for duplicates of <53087755.3090608@redhat.com> diff --git a/a/1.txt b/N1/1.txt index 8b77f21..ebf6528 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,14 +4,14 @@ On 02/21/2014 07:15 PM, Maxime Ripard wrote: > Hi Hans, > > On Wed, Feb 19, 2014 at 01:01:59PM +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 +++++ @@ -28,12 +28,12 @@ On 02/21/2014 07:15 PM, Maxime Ripard wrote: >> }; >> }; >> ->> + ahci: sata@01c18000 { +>> + ahci: sata at 01c18000 { >> + status = "okay"; >> + }; >> + ->> pinctrl@01c20800 { ->> emac_power_pin_a1000: emac_power_pin@0 { +>> pinctrl at 01c20800 { +>> emac_power_pin_a1000: emac_power_pin at 0 { >> allwinner,pins = "PH15"; >> diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts >> index b139ee6..6df237d8 100644 @@ -51,13 +51,13 @@ On 02/21/2014 07:15 PM, Maxime Ripard wrote: >> }; >> }; >> ->> + ahci: sata@01c18000 { +>> + ahci: sata at 01c18000 { >> + target-supply = <®_ahci_5v>; >> + status = "okay"; >> + }; >> + ->> pinctrl@01c20800 { ->> led_pins_cubieboard: led_pins@0 { +>> pinctrl at 01c20800 { +>> led_pins_cubieboard: led_pins at 0 { >> allwinner,pins = "PH20", "PH21"; >> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi >> index 336dbec..454077a 100644 @@ -67,7 +67,7 @@ On 02/21/2014 07:15 PM, Maxime Ripard wrote: >> #size-cells = <0>; >> }; >> ->> + ahci: sata@01c18000 { +>> + ahci: sata at 01c18000 { >> + compatible = "allwinner,sun4i-a10-ahci"; >> + reg = <0x01c18000 0x1000>; >> + interrupts = <56>; @@ -75,7 +75,7 @@ On 02/21/2014 07:15 PM, Maxime Ripard wrote: >> + 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 @@ -100,7 +100,7 @@ tree you will see separate dtsi files for both ahci and usb regulators, another advantage of having these separate is that the gpio controlling the regulator can be pre-populated with the reference design gpio which is used in most boards, so that the ahci specific code in the dts -becomes only the ahci: sata@... node. +becomes only the ahci: sata at ... node. Regards, diff --git a/a/content_digest b/N1/content_digest index 29ed5fc..dd08f05 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,19 +1,10 @@ "ref\01392811320-3132-1-git-send-email-hdegoede@redhat.com\0" "ref\01392811320-3132-18-git-send-email-hdegoede@redhat.com\0" "ref\020140221181519.GC3931@lukather\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH v6 17/18] ARM: sun4i: dt: Add ahci / sata support\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH v6 17/18] ARM: sun4i: dt: Add ahci / sata support\0" "Date\0Sat, 22 Feb 2014 11:09:25 +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> - Lee Jones <lee.jones-QSEj5FYQhm4dnm+yROfE0A@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 Maxime,\n" @@ -22,14 +13,14 @@ "> Hi Hans,\n" ">\n" "> On Wed, Feb 19, 2014 at 01:01:59PM +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\t};\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\temac_power_pin_a1000: emac_power_pin@0 {\n" + ">> \t\tpinctrl at 01c20800 {\n" + ">> \t\t\temac_power_pin_a1000: emac_power_pin at 0 {\n" ">> \t\t\t\tallwinner,pins = \"PH15\";\n" ">> diff --git a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts\n" ">> index b139ee6..6df237d8 100644\n" @@ -69,13 +60,13 @@ ">> \t\t\t};\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\tled_pins_cubieboard: led_pins@0 {\n" + ">> \t\tpinctrl at 01c20800 {\n" + ">> \t\t\tled_pins_cubieboard: led_pins at 0 {\n" ">> \t\t\t\tallwinner,pins = \"PH20\", \"PH21\";\n" ">> diff --git a/arch/arm/boot/dts/sun4i-a10.dtsi b/arch/arm/boot/dts/sun4i-a10.dtsi\n" ">> index 336dbec..454077a 100644\n" @@ -85,7 +76,7 @@ ">> \t\t\t#size-cells = <0>;\n" ">> \t\t};\n" ">>\n" - ">> +\t\tahci: sata@01c18000 {\n" + ">> +\t\tahci: sata at 01c18000 {\n" ">> +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\";\n" ">> +\t\t\treg = <0x01c18000 0x1000>;\n" ">> +\t\t\tinterrupts = <56>;\n" @@ -93,7 +84,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" @@ -118,10 +109,10 @@ "another advantage of having these separate is that the gpio controlling\n" "the regulator can be pre-populated with the reference design gpio which\n" "is used in most boards, so that the ahci specific code in the dts\n" - "becomes only the ahci: sata@... node.\n" + "becomes only the ahci: sata at ... node.\n" "\n" "Regards,\n" "\n" Hans -ce42f67dc89f5d3718ac4ccacc22202c349af2932f79afcaa999968ba4cd1e1e +71bf60d442d221a07c8a588537b531193adf017ba16011683eba2f267458f058
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.