From: hdegoede@redhat.com (Hans de Goede)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v5 14/14] ARM: sun7i: dts: Add ahci / sata support
Date: Wed, 22 Jan 2014 20:04:49 +0100 [thread overview]
Message-ID: <1390417489-5354-15-git-send-email-hdegoede@redhat.com> (raw)
In-Reply-To: <1390417489-5354-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 | 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 @@
/dts-v1/;
/include/ "sun7i-a20.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
/ {
model = "Cubietech Cubieboard2";
@@ -28,6 +29,11 @@
status = "okay";
};
+ 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 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 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 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 at 01c18000 {
+ compatible = "allwinner,sun4i-a10-ahci";
+ reg = <0x01c18000 0x1000>;
+ interrupts = <0 56 1>;
+ clocks = <&pll6 0>, <&ahb_gates 25>;
+ status = "disabled";
+ };
+
pio: pinctrl at 01c20800 {
compatible = "allwinner,sun7i-a20-pinctrl";
reg = <0x01c20800 0x400>;
--
1.8.5.3
next prev parent reply other threads:[~2014-01-22 19:04 UTC|newest]
Thread overview: 31+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-01-22 19:04 [PATCH v5 00/14] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Hans de Goede
2014-01-22 19:04 ` [PATCH v5 01/14] libahci: Allow drivers to override start_engine Hans de Goede
2014-01-22 19:04 ` [PATCH v5 02/14] libahci: Move ahci_host_priv declaration to include/linux/ahci.h Hans de Goede
2014-01-22 19:04 ` [PATCH v5 03/14] ahci-platform: Pass ahci_host_priv ptr to ahci_platform_data init method Hans de Goede
2014-01-22 19:04 ` [PATCH v5 04/14] ahci-platform: Add support for devices with more then 1 clock Hans de Goede
2014-01-22 19:04 ` [PATCH v5 05/14] ahci-platform: Add support for an optional regulator for sata-target power Hans de Goede
2014-01-22 19:04 ` [PATCH v5 06/14] ahci-platform: Add enable_ / disable_resources helper functions Hans de Goede
2014-01-22 19:04 ` [PATCH v5 07/14] ahci-platform: "Library-ise" ahci_probe functionality Hans de Goede
2014-01-27 10:39 ` Roger Quadros
2014-01-27 10:51 ` Hans de Goede
2014-01-27 11:03 ` Roger Quadros
2014-01-27 11:28 ` Hans de Goede
2014-01-27 14:27 ` Roger Quadros
2014-01-22 19:04 ` [PATCH v5 08/14] ahci-platform: "Library-ise" suspend / resume functionality Hans de Goede
2014-02-03 14:53 ` Arnd Bergmann
2014-02-04 10:20 ` Hans de Goede
2014-01-22 19:04 ` [PATCH v5 09/14] ARM: sunxi: Add support for Allwinner SUNXi SoCs sata to ahci_platform Hans de Goede
2014-01-22 19:04 ` [PATCH v5 10/14] ahci-imx: Port to library-ised ahci_platform Hans de Goede
2014-01-22 19:04 ` [PATCH v5 11/14] ahci-imx: Add imx_ahci_phy_init / _exit helpers Hans de Goede
2014-01-22 19:04 ` [PATCH v5 12/14] ahci-imx: Fix link not coming back up after suspend / resume Hans de Goede
2014-01-22 19:04 ` [PATCH v5 13/14] ARM: sun4i: dts: Add ahci / sata support Hans de Goede
2014-01-23 8:34 ` [linux-sunxi] " Chen-Yu Tsai
2014-01-23 14:48 ` Hans de Goede
2014-01-31 13:45 ` Maxime Ripard
2014-02-03 10:35 ` Hans de Goede
2014-02-04 9:44 ` Maxime Ripard
2014-01-22 19:04 ` Hans de Goede [this message]
2014-01-31 13:46 ` [PATCH v5 14/14] ARM: sun7i: " Maxime Ripard
2014-02-03 22:10 ` Hans de Goede
2014-02-03 16:09 ` [PATCH v5 00/14] ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver Tejun Heo
2014-02-03 22:07 ` Hans de Goede
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=1390417489-5354-15-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).