diff for duplicates of <5308F63E.3070300@redhat.com> diff --git a/a/1.txt b/N1/1.txt index f0f336e..e96a2b5 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -11,23 +11,23 @@ On 02/22/2014 06: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> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi +>>>> 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 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi >>>> >>>> diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index cbd2e13..d6ec839 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -35,6 +35,10 @@ }; }; >>>> ->>>> + ahci: sata@01c18000 { + status = "okay"; + }; + pinctrl@01c20800 { emac_power_pin_a1000: emac_power_pin@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 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -12,6 +12,7 @@ +>>>> + ahci: sata at 01c18000 { + status = "okay"; + }; + 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 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -12,6 +12,7 @@ >>>> >>>> /dts-v1/; /include/ "sun4i-a10.dtsi" +/include/ "sunxi-ahci-reg.dtsi" >>>> >>>> / { model = "Cubietech Cubieboard"; @@ -33,6 +34,11 @@ }; }; >>>> ->>>> + ahci: sata@01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl@01c20800 { led_pins_cubieboard: led_pins@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 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -338,6 +338,14 @@ #size-cells = <0>; }; +>>>> + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + 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 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -338,6 +338,14 @@ #size-cells = <0>; }; >>>> ->>>> + ahci: sata@01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + intc: interrupt-controller@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 new file mode 100644 index 0000000..7072af1 --- /dev/null +++ b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code +>>>> + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <56>; + clocks = <&pll6 0>, <&ahb_gates 25>; + status = "disabled"; + }; + 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 new file mode 100644 index 0000000..7072af1 --- /dev/null +++ b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code >>> >>> >>> Since IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators? @@ -40,7 +40,7 @@ On 02/22/2014 06:15 PM, Maxime Ripard wrote: > > And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator. > ->> 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. +>> 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 at ... node. > > I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having "topics" regulators DTSI. @@ -53,7 +53,7 @@ for a board using the reference design gpio: ... - ahci: sata@01c18000 { + ahci: sata at 01c18000 { target-supply = <®_ahci_5v>; status = "okay"; }; @@ -66,7 +66,7 @@ boards don't have it, so things would change into: ... - ahci: sata@01c18000 { + ahci: sata at 01c18000 { target-supply = <®_ahci_5v>; status = "okay"; }; @@ -139,8 +139,3 @@ iEYEARECAAYFAlMI9jgACgkQF3VEtJrzE/tkEQCgm1V2Nga+RxsTELQUJxIl2Go3 4dkAnRK0CjK1YEapqN0anp2iltgp7smc =fBXT -----END PGP SIGNATURE----- - --- -You received this message because you are subscribed to the Google Groups "linux-sunxi" group. -To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org -For more options, visit https://groups.google.com/groups/opt_out. diff --git a/a/content_digest b/N1/content_digest index fb0876a..2cecedc 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -3,19 +3,10 @@ "ref\020140221181519.GC3931@lukather\0" "ref\053087755.3090608@redhat.com\0" "ref\020140222171516.GA3610@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 20:10:54 +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" "-----BEGIN PGP SIGNED MESSAGE-----\n" @@ -31,23 +22,23 @@ ">>> 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. Some boards also feature a regulator via a GPIO and support for this is also added.\n" ">>>> \n" - ">>>> Signed-off-by: Olliver Schinagl <oliver-dxLnbx3+1qmEVqv0pETR8A@public.gmane.org> Signed-off-by: Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org> --- arch/arm/boot/dts/sun4i-a10-a1000.dts | 4 ++++ arch/arm/boot/dts/sun4i-a10-cubieboard.dts | 6 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi\n" + ">>>> 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 +++++ arch/arm/boot/dts/sun4i-a10.dtsi | 8 +++++++ arch/arm/boot/dts/sunxi-ahci-reg.dtsi | 36 ++++++++++++++++++++++++++++++ 4 files changed, 54 insertions(+) create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi\n" ">>>> \n" ">>>> diff --git a/arch/arm/boot/dts/sun4i-a10-a1000.dts b/arch/arm/boot/dts/sun4i-a10-a1000.dts index cbd2e13..d6ec839 100644 --- a/arch/arm/boot/dts/sun4i-a10-a1000.dts +++ b/arch/arm/boot/dts/sun4i-a10-a1000.dts @@ -35,6 +35,10 @@ }; };\n" ">>>> \n" - ">>>> +\t\tahci: sata@01c18000 { +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl@01c20800 { emac_power_pin_a1000: emac_power_pin@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 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -12,6 +12,7 @@\n" + ">>>> +\t\tahci: sata at 01c18000 { +\t\t\tstatus = \"okay\"; +\t\t}; + 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 --- a/arch/arm/boot/dts/sun4i-a10-cubieboard.dts +++ b/arch/arm/boot/dts/sun4i-a10-cubieboard.dts @@ -12,6 +12,7 @@\n" ">>>> \n" ">>>> /dts-v1/; /include/ \"sun4i-a10.dtsi\" +/include/ \"sunxi-ahci-reg.dtsi\"\n" ">>>> \n" ">>>> / { model = \"Cubietech Cubieboard\"; @@ -33,6 +34,11 @@ }; };\n" ">>>> \n" - ">>>> +\t\tahci: sata@01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl@01c20800 { led_pins_cubieboard: led_pins@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 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -338,6 +338,14 @@ #size-cells = <0>; };\n" + ">>>> +\t\tahci: sata at 01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + 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 --- a/arch/arm/boot/dts/sun4i-a10.dtsi +++ b/arch/arm/boot/dts/sun4i-a10.dtsi @@ -338,6 +338,14 @@ #size-cells = <0>; };\n" ">>>> \n" - ">>>> +\t\tahci: sata@01c18000 { +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\"; +\t\t\treg = <0x01c18000 0x1000>; +\t\t\tinterrupts = <56>; +\t\t\tclocks = <&pll6 0>, <&ahb_gates 25>; +\t\t\tstatus = \"disabled\"; +\t\t}; + intc: interrupt-controller@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 new file mode 100644 index 0000000..7072af1 --- /dev/null +++ b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code\n" + ">>>> +\t\tahci: sata at 01c18000 { +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\"; +\t\t\treg = <0x01c18000 0x1000>; +\t\t\tinterrupts = <56>; +\t\t\tclocks = <&pll6 0>, <&ahb_gates 25>; +\t\t\tstatus = \"disabled\"; +\t\t}; + 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 new file mode 100644 index 0000000..7072af1 --- /dev/null +++ b/arch/arm/boot/dts/sunxi-ahci-reg.dtsi @@ -0,0 +1,36 @@ +/* + * sunxi boards sata target power supply common code\n" ">>> \n" ">>> \n" ">>> Since IIRC we have pretty much the same needs for the USB, can't we just drop the SATA specific mention and use it as the common DTSI for the usual regulators?\n" @@ -60,7 +51,7 @@ "> \n" "> And this is precisely what I don't understand. Why do you *need* different DTSI files. If there's common regulators, that are used on most boards, fine, create a common regulators files. But why do you have to create a DTSI to define only one regulator.\n" "> \n" - ">> 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.\n" + ">> 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 at ... node.\n" "> \n" "> I understand very well the advantages of what having a reference regulators bring. What I don't understand is the benefits of having \"topics\" regulators DTSI.\n" "\n" @@ -73,7 +64,7 @@ "\n" "...\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" @@ -86,7 +77,7 @@ "\n" "...\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" @@ -158,11 +149,6 @@ "iEYEARECAAYFAlMI9jgACgkQF3VEtJrzE/tkEQCgm1V2Nga+RxsTELQUJxIl2Go3\n" "4dkAnRK0CjK1YEapqN0anp2iltgp7smc\n" "=fBXT\n" - "-----END PGP SIGNATURE-----\n" - "\n" - "-- \n" - "You received this message because you are subscribed to the Google Groups \"linux-sunxi\" group.\n" - "To unsubscribe from this group and stop receiving emails from it, send an email to linux-sunxi+unsubscribe-/JYPxA39Uh5TLH3MbocFF+G/Ez6ZCGd0@public.gmane.org\n" - For more options, visit https://groups.google.com/groups/opt_out. + -----END PGP SIGNATURE----- -347bd792db006333be8b4bff23d43aa7b44011ee9d010736559ed539f33536cf +ecd38935e208989864008bb3d6f232ce89bea3e5b03cd605c54d16e539ac588f
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.