diff for duplicates of <52F013EB.4050900@redhat.com> diff --git a/a/1.txt b/N1/1.txt index fa846a8..97eb337 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -7,7 +7,7 @@ On 01/31/2014 02:46 PM, Maxime Ripard wrote: > On Wed, Jan 22, 2014 at 08:04:49PM +0100, Hans de Goede wrote: >> This patch adds sunxi sata support to A20 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/sun7i-a20-cubieboard2.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 4 files changed, 40 insertions(+) +>> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 4 files changed, 40 insertions(+) >> >> diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 48777cd..1cab521 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts @@ -13,6 +13,7 @@ >> @@ -15,24 +15,24 @@ On 01/31/2014 02:46 PM, Maxime Ripard wrote: >> >> / { model = "Cubietech Cubieboard2"; @@ -28,6 +29,11 @@ status = "okay"; }; >> ->> + ahci: sata@01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl@01c20800 { mmc0_cd_pin_cubieboard2: mmc0_cd_pin@0 { allwinner,pins = "PH1"; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 2684f27..1247ea1 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -13,6 +13,7 @@ +>> + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { mmc0_cd_pin_cubieboard2: mmc0_cd_pin at 0 { allwinner,pins = "PH1"; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 2684f27..1247ea1 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -13,6 +13,7 @@ >> >> /dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi" >> >> / { model = "Cubietech Cubietruck"; @@ -28,6 +29,11 @@ status = "okay"; }; >> ->> + ahci: sata@01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl@01c20800 { mmc0_cd_pin_cubietruck: mmc0_cd_pin@0 { allwinner,pins = "PH1"; @@ -36,6 +42,13 @@ allwinner,pull = <0>; }; +>> + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { mmc0_cd_pin_cubietruck: mmc0_cd_pin at 0 { allwinner,pins = "PH1"; @@ -36,6 +42,13 @@ allwinner,pull = <0>; }; >> ->> + ahci_pwr_pin_cubietruck: ahci_pwr_pin@1 { + allwinner,pins = "PH12"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + led_pins_cubietruck: led_pins@0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out"; @@ -84,4 +97,11 @@ gpios = <&pio 7 7 0>; }; }; + + regulators { + reg_ahci_5v: ahci-5v { + pinctrl-0 = <&ahci_pwr_pin_cubietruck>; + gpio = <&pio 7 12 0>; + }; + }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index +>> + ahci_pwr_pin_cubietruck: ahci_pwr_pin at 1 { + allwinner,pins = "PH12"; + allwinner,function = "gpio_out"; + allwinner,drive = <0>; + allwinner,pull = <0>; + }; + led_pins_cubietruck: led_pins at 0 { allwinner,pins = "PH7", "PH11", "PH20", "PH21"; allwinner,function = "gpio_out"; @@ -84,4 +97,11 @@ gpios = <&pio 7 7 0>; }; }; + + regulators { + reg_ahci_5v: ahci-5v { + pinctrl-0 = <&ahci_pwr_pin_cubietruck>; + gpio = <&pio 7 12 0>; + }; + }; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index >> bf6f6c8..f135886 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -13,6 +13,7 @@ >> >> /dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi" >> >> / { model = "Olimex A20-Olinuxino Micro"; @@ -37,6 +38,11 @@ status = "okay"; }; >> ->> + ahci: sata@01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl@01c20800 { mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { allwinner,pins = "PH1"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index c9c123a..0657bad 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -347,6 +347,14 @@ status = "disabled"; }; +>> + ahci: sata at 01c18000 { + target-supply = <®_ahci_5v>; + status = "okay"; + }; + pinctrl at 01c20800 { mmc0_cd_pin_olinuxinom: mmc0_cd_pin at 0 { allwinner,pins = "PH1"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index c9c123a..0657bad 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -347,6 +347,14 @@ status = "disabled"; }; >> ->> + ahci: sata@01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <0 56 1>; +>> + ahci: sata at 01c18000 { + compatible = "allwinner,sun4i-a10-ahci"; + reg = <0x01c18000 0x1000>; + interrupts = <0 56 1>; > > This is supposed to be a level triggered interrupt, not an edge triggered one. @@ -49,8 +49,3 @@ iEYEARECAAYFAlLwE+sACgkQF3VEtJrzE/tKaACgmEEVd28Oubd7hEy5chG3/XM9 0x0AmwctbAFVFC9OCBaNZix8cX3d/CAI =otiv -----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 3b414aa..52195a2 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-15-git-send-email-hdegoede@redhat.com\0" "ref\020140131134638.GH2950@lukather\0" - "From\0Hans de Goede <hdegoede-H+wXaHxf7aLQT0dZR+AlfA@public.gmane.org>\0" - "Subject\0Re: [PATCH v5 14/14] ARM: sun7i: dts: Add ahci / sata support\0" + "From\0hdegoede@redhat.com (Hans de Goede)\0" + "Subject\0[PATCH v5 14/14] ARM: sun7i: dts: Add ahci / sata support\0" "Date\0Mon, 03 Feb 2014 23:10:51 +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" "-----BEGIN PGP SIGNED MESSAGE-----\n" @@ -24,7 +16,7 @@ "> On Wed, Jan 22, 2014 at 08:04:49PM +0100, Hans de Goede wrote:\n" ">> This patch adds sunxi sata support to A20 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/sun7i-a20-cubieboard2.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 4 files changed, 40 insertions(+)\n" + ">> Signed-off-by: Olliver Schinagl <oliver@schinagl.nl> Signed-off-by: Hans de Goede <hdegoede@redhat.com> --- arch/arm/boot/dts/sun7i-a20-cubieboard2.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20-cubietruck.dts | 20 ++++++++++++++++++++ arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts | 6 ++++++ arch/arm/boot/dts/sun7i-a20.dtsi | 8 ++++++++ 4 files changed, 40 insertions(+)\n" ">> \n" ">> diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts index 48777cd..1cab521 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts @@ -13,6 +13,7 @@\n" ">> \n" @@ -32,24 +24,24 @@ ">> \n" ">> / { model = \"Cubietech Cubieboard2\"; @@ -28,6 +29,11 @@ status = \"okay\"; };\n" ">> \n" - ">> +\t\tahci: sata@01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl@01c20800 { mmc0_cd_pin_cubieboard2: mmc0_cd_pin@0 { allwinner,pins = \"PH1\"; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 2684f27..1247ea1 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -13,6 +13,7 @@\n" + ">> +\t\tahci: sata at 01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl at 01c20800 { mmc0_cd_pin_cubieboard2: mmc0_cd_pin at 0 { allwinner,pins = \"PH1\"; diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts index 2684f27..1247ea1 100644 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts @@ -13,6 +13,7 @@\n" ">> \n" ">> /dts-v1/; /include/ \"sun7i-a20.dtsi\" +/include/ \"sunxi-ahci-reg.dtsi\"\n" ">> \n" ">> / { model = \"Cubietech Cubietruck\"; @@ -28,6 +29,11 @@ status = \"okay\"; };\n" ">> \n" - ">> +\t\tahci: sata@01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl@01c20800 { mmc0_cd_pin_cubietruck: mmc0_cd_pin@0 { allwinner,pins = \"PH1\"; @@ -36,6 +42,13 @@ allwinner,pull = <0>; };\n" + ">> +\t\tahci: sata at 01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl at 01c20800 { mmc0_cd_pin_cubietruck: mmc0_cd_pin at 0 { allwinner,pins = \"PH1\"; @@ -36,6 +42,13 @@ allwinner,pull = <0>; };\n" ">> \n" - ">> +\t\t\tahci_pwr_pin_cubietruck: ahci_pwr_pin@1 { +\t\t\t\tallwinner,pins = \"PH12\"; +\t\t\t\tallwinner,function = \"gpio_out\"; +\t\t\t\tallwinner,drive = <0>; +\t\t\t\tallwinner,pull = <0>; +\t\t\t}; + led_pins_cubietruck: led_pins@0 { allwinner,pins = \"PH7\", \"PH11\", \"PH20\", \"PH21\"; allwinner,function = \"gpio_out\"; @@ -84,4 +97,11 @@ gpios = <&pio 7 7 0>; }; }; + +\tregulators { +\t\treg_ahci_5v: ahci-5v { +\t\t\tpinctrl-0 = <&ahci_pwr_pin_cubietruck>; +\t\t\tgpio = <&pio 7 12 0>; +\t\t}; +\t}; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index\n" + ">> +\t\t\tahci_pwr_pin_cubietruck: ahci_pwr_pin at 1 { +\t\t\t\tallwinner,pins = \"PH12\"; +\t\t\t\tallwinner,function = \"gpio_out\"; +\t\t\t\tallwinner,drive = <0>; +\t\t\t\tallwinner,pull = <0>; +\t\t\t}; + led_pins_cubietruck: led_pins at 0 { allwinner,pins = \"PH7\", \"PH11\", \"PH20\", \"PH21\"; allwinner,function = \"gpio_out\"; @@ -84,4 +97,11 @@ gpios = <&pio 7 7 0>; }; }; + +\tregulators { +\t\treg_ahci_5v: ahci-5v { +\t\t\tpinctrl-0 = <&ahci_pwr_pin_cubietruck>; +\t\t\tgpio = <&pio 7 12 0>; +\t\t}; +\t}; }; diff --git a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts index\n" ">> bf6f6c8..f135886 100644 --- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts @@ -13,6 +13,7 @@\n" ">> \n" ">> /dts-v1/; /include/ \"sun7i-a20.dtsi\" +/include/ \"sunxi-ahci-reg.dtsi\"\n" ">> \n" ">> / { model = \"Olimex A20-Olinuxino Micro\"; @@ -37,6 +38,11 @@ status = \"okay\"; };\n" ">> \n" - ">> +\t\tahci: sata@01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl@01c20800 { mmc0_cd_pin_olinuxinom: mmc0_cd_pin@0 { allwinner,pins = \"PH1\"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index c9c123a..0657bad 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -347,6 +347,14 @@ status = \"disabled\"; };\n" + ">> +\t\tahci: sata at 01c18000 { +\t\t\ttarget-supply = <®_ahci_5v>; +\t\t\tstatus = \"okay\"; +\t\t}; + pinctrl at 01c20800 { mmc0_cd_pin_olinuxinom: mmc0_cd_pin at 0 { allwinner,pins = \"PH1\"; diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi index c9c123a..0657bad 100644 --- a/arch/arm/boot/dts/sun7i-a20.dtsi +++ b/arch/arm/boot/dts/sun7i-a20.dtsi @@ -347,6 +347,14 @@ status = \"disabled\"; };\n" ">> \n" - ">> +\t\tahci: sata@01c18000 { +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\"; +\t\t\treg = <0x01c18000 0x1000>; +\t\t\tinterrupts = <0 56 1>;\n" + ">> +\t\tahci: sata at 01c18000 { +\t\t\tcompatible = \"allwinner,sun4i-a10-ahci\"; +\t\t\treg = <0x01c18000 0x1000>; +\t\t\tinterrupts = <0 56 1>;\n" "> \n" "> This is supposed to be a level triggered interrupt, not an edge triggered one.\n" "\n" @@ -65,11 +57,6 @@ "iEYEARECAAYFAlLwE+sACgkQF3VEtJrzE/tKaACgmEEVd28Oubd7hEy5chG3/XM9\n" "0x0AmwctbAFVFC9OCBaNZix8cX3d/CAI\n" "=otiv\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----- -535a04311a91b6c837081324845958481901c170970b99bcd5d26278c140b605 +e66b00157c43d9882e6e7f782926ff62dd835a86b80e3535ef6480740eae8383
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.