linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: hdegoede@redhat.com (Hans de Goede)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v6 18/18] ARM: sun7i: dt: Add ahci / sata support
Date: Wed, 19 Feb 2014 13:02:00 +0100	[thread overview]
Message-ID: <1392811320-3132-19-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1392811320-3132-1-git-send-email-hdegoede@redhat.com>

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@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      | 18 ++++++++++++++++++
 arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts |  6 ++++++
 arch/arm/boot/dts/sun7i-a20.dtsi                |  8 ++++++++
 4 files changed, 38 insertions(+)

diff --git a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
index 7bf4935..07823c2 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubieboard2.dts
@@ -13,12 +13,18 @@
 
 /dts-v1/;
 /include/ "sun7i-a20.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
 	model = "Cubietech Cubieboard2";
 	compatible = "cubietech,cubieboard2", "allwinner,sun7i-a20";
 
 	soc at 01c00000 {
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			led_pins_cubieboard2: led_pins at 0 {
 				allwinner,pins = "PH20", "PH21";
diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
index 025ce52..403bd2e 100644
--- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
+++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
@@ -13,13 +13,26 @@
 
 /dts-v1/;
 /include/ "sun7i-a20.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
 	model = "Cubietech Cubietruck";
 	compatible = "cubietech,cubietruck", "allwinner,sun7i-a20";
 
 	soc at 01c00000 {
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
+			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";
@@ -90,4 +103,9 @@
 			gpios = <&pio 7 7 0>;
 		};
 	};
+
+	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 b02a796..d5c6799 100644
--- a/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
+++ b/arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts
@@ -13,12 +13,18 @@
 
 /dts-v1/;
 /include/ "sun7i-a20.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
 	model = "Olimex A20-Olinuxino Micro";
 	compatible = "olimex,a20-olinuxino-micro", "allwinner,sun7i-a20";
 
 	soc at 01c00000 {
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			led_pins_olinuxino: led_pins at 0 {
 				allwinner,pins = "PH2";
diff --git a/arch/arm/boot/dts/sun7i-a20.dtsi b/arch/arm/boot/dts/sun7i-a20.dtsi
index daaafd0..3385994 100644
--- a/arch/arm/boot/dts/sun7i-a20.dtsi
+++ b/arch/arm/boot/dts/sun7i-a20.dtsi
@@ -392,6 +392,14 @@
 			#size-cells = <0>;
 		};
 
+		ahci: sata at 01c18000 {
+			compatible = "allwinner,sun4i-a10-ahci";
+			reg = <0x01c18000 0x1000>;
+			interrupts = <0 56 4>;
+			clocks = <&pll6 0>, <&ahb_gates 25>;
+			status = "disabled";
+		};
+
 		pio: pinctrl at 01c20800 {
 			compatible = "allwinner,sun7i-a20-pinctrl";
 			reg = <0x01c20800 0x400>;
-- 
1.8.5.3

  parent reply	other threads:[~2014-02-19 12:02 UTC|newest]

Thread overview: 36+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-02-19 12:01 [PATCH v6 00/18] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Hans de Goede
2014-02-19 12:01 ` [PATCH v6 01/18] libahci: Allow drivers to override start_engine Hans de Goede
2014-02-19 14:42   ` Tejun Heo
2014-02-19 12:01 ` [PATCH v6 02/18] libahci: Move ahci_host_priv declaration to include/linux/ahci.h Hans de Goede
2014-02-19 12:01 ` [PATCH v6 03/18] ahci-platform: Pass ahci_host_priv ptr to ahci_platform_data init method Hans de Goede
2014-02-19 12:01 ` [PATCH v6 04/18] ahci-platform: Add support for devices with more then 1 clock Hans de Goede
2014-02-19 14:52   ` Tejun Heo
2014-03-20 12:28     ` Ben Dooks
2014-02-19 12:01 ` [PATCH v6 05/18] ahci-platform: Add support for an optional regulator for sata-target power Hans de Goede
2014-02-19 14:53   ` Tejun Heo
2014-02-19 12:01 ` [PATCH v6 06/18] ahci-platform: Add enable_ / disable_resources helper functions Hans de Goede
2014-02-19 14:55   ` Tejun Heo
2014-02-19 12:01 ` [PATCH v6 07/18] ahci-platform: "Library-ise" ahci_probe functionality Hans de Goede
2014-02-19 14:58   ` Tejun Heo
2014-02-19 12:01 ` [PATCH v6 08/18] ahci-platform: "Library-ise" suspend / resume functionality Hans de Goede
2014-02-19 12:01 ` [PATCH v6 09/18] ARM: sunxi: Add support for Allwinner SUNXi SoCs sata to ahci_platform Hans de Goede
2014-02-19 12:01 ` [PATCH v6 10/18] ahci-imx: Port to library-ised ahci_platform Hans de Goede
2014-02-19 12:01 ` [PATCH v6 11/18] ata: ahci_platform: Add DT compatible for Synopsis DWC AHCI controller Hans de Goede
2014-02-19 12:01 ` [PATCH v6 12/18] ata: ahci_platform: Update DT compatible list Hans de Goede
2014-02-19 12:01 ` [PATCH v6 13/18] ata: ahci_platform: Manage SATA PHY Hans de Goede
2014-02-19 12:01 ` [PATCH v6 14/18] ata: ahci_platform: Add 'struct device' argument to ahci_platform_put_resources() Hans de Goede
2014-02-19 12:01 ` [PATCH v6 15/18] ata: ahci_platform: runtime resume the device before use Hans de Goede
2014-02-19 12:01 ` [PATCH v6 16/18] ARM: sun4i: dt: Remove grouping + simple-bus compatible for regulators Hans de Goede
2014-02-19 12:01 ` [PATCH v6 17/18] ARM: sun4i: dt: Add ahci / sata support Hans de Goede
2014-02-21 18:15   ` Maxime Ripard
2014-02-22 10:09     ` Hans de Goede
2014-02-22 17:15       ` Maxime Ripard
2014-02-22 19:10         ` Hans de Goede
2014-03-03  9:33           ` Maxime Ripard
2014-03-03 10:07             ` Hans de Goede
2014-02-19 12:02 ` Hans de Goede [this message]
2014-02-19 15:02 ` [PATCH v6 00/18] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Tejun Heo
2014-02-19 15:26   ` Hans de Goede
2014-02-19 16:25     ` Tejun Heo
2014-02-19 17:18       ` Hans de Goede
2014-02-19 17:42         ` Tejun Heo

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1392811320-3132-19-git-send-email-hdegoede@redhat.com \
    --to=hdegoede@redhat.com \
    --cc=linux-arm-kernel@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).