You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
128 lines
3.6 KiB
128 lines
3.6 KiB
11 years ago
|
From c7b99b7afc3882c1b38a15da8d1625dd448c6fee Mon Sep 17 00:00:00 2001
|
||
|
|
From: Hans de Goede <hdegoede@redhat.com>
|
||
|
|
Date: Fri, 3 Jan 2014 10:27:51 +0100
|
||
|
|
Subject: [PATCH] ARM: sun7i: dt: Add ahci / sata support
|
||
|
|
|
||
|
|
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@01c00000 {
|
||
|
|
+ ahci: sata@01c18000 {
|
||
|
|
+ target-supply = <®_ahci_5v>;
|
||
|
|
+ status = "okay";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
pinctrl@01c20800 {
|
||
|
|
led_pins_cubieboard2: led_pins@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@01c00000 {
|
||
|
|
+ ahci: sata@01c18000 {
|
||
|
|
+ target-supply = <®_ahci_5v>;
|
||
|
|
+ status = "okay";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
pinctrl@01c20800 {
|
||
|
|
+ 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";
|
||
|
|
@@ -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@01c00000 {
|
||
|
|
+ ahci: sata@01c18000 {
|
||
|
|
+ target-supply = <®_ahci_5v>;
|
||
|
|
+ status = "okay";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
pinctrl@01c20800 {
|
||
|
|
led_pins_olinuxino: led_pins@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@01c18000 {
|
||
|
|
+ compatible = "allwinner,sun4i-a10-ahci";
|
||
|
|
+ reg = <0x01c18000 0x1000>;
|
||
|
|
+ interrupts = <0 56 4>;
|
||
|
|
+ clocks = <&pll6 0>, <&ahb_gates 25>;
|
||
|
|
+ status = "disabled";
|
||
|
|
+ };
|
||
|
|
+
|
||
|
|
pio: pinctrl@01c20800 {
|
||
|
|
compatible = "allwinner,sun7i-a20-pinctrl";
|
||
|
|
reg = <0x01c20800 0x400>;
|
||
|
|
--
|
||
|
|
1.8.5.5
|
||
|
|
|