ahci: library-ise ahci_platform, add sunxi driver and cleanup imx driver

ahci_probe consists of 3 steps:
1) Get resources (get mmio, clks, regulator)
2) Enable resources, handled by ahci_platform_enable_resouces
3) The more or less standard ahci-host controller init sequence

This commit refactors step 1 and 3 into separate functions, so the platform drivers for AHCI implementations which need a specific order in step 2, and / or need to do some custom register poking at some time, can re-use ahci-platform.c code without needing to copy and paste it.

Note that ahci_platform_init_host's prototype takes the 3 non function members of ahci_platform_data as arguments, the idea is that drivers using the new exported utility functions will not use ahci_platform_data at all, and hopefully in the future ahci_platform_data can go away entirely.

Signed-off-by Hans de Goede <[email protected]>

---
 drivers/ata/ahci_platform.c   | 158 ++++++++++++++++++++++++------------------
 include/linux/ahci_platform.h |  14 ++++
 2 files changed, 106 insertions(+), 66 deletions(-)

drivers/ata/ahci_platform.c +92 -66

index 1cce7a2..b260ebe 100644
@@ -150,60 +150,31 @@ void ahci_platform_disable_resources(struct ahci_host_priv *hpriv)
 EXPORT_SYMBOL_GPL(ahci_platform_disable_resources);
 
 
-static void ahci_put_clks(struct ahci_host_priv *hpriv)
-{
-	int c;
-
-	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)
-		clk_put(hpriv->clks[c]);
-}
-
-static int ahci_probe(struct platform_device *pdev)
+struct ahci_host_priv *ahci_platform_get_resources(
+	struct platform_device *pdev)
 {
 	struct device *dev = &pdev->dev;
-	struct ahci_platform_data *pdata = dev_get_platdata(dev);
-	const struct platform_device_id *id = platform_get_device_id(pdev);
-	struct ata_port_info pi = ahci_port_info[id ? id->driver_data : 0];
-	const struct ata_port_info *ppi[] = { &pi, NULL };
 	struct ahci_host_priv *hpriv;
-	struct ata_host *host;
-	struct resource *mem;
 	struct clk *clk;
-	int i, irq, max_clk, n_ports, rc;
-
-	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
-	if (!mem) {
-		dev_err(dev, "no mmio space\n");
-		return -EINVAL;
-	}
-
-	irq = platform_get_irq(pdev, 0);
-	if (irq <= 0) {
-		dev_err(dev, "no irq\n");
-		return -EINVAL;
-	}
-
-	if (pdata && pdata->ata_port_info)
-		pi = *pdata->ata_port_info;
+	int i, max_clk, rc;
 
 	hpriv = devm_kzalloc(dev, sizeof(*hpriv), GFP_KERNEL);
 	if (!hpriv) {
 		dev_err(dev, "can't alloc ahci_host_priv\n");
-		return -ENOMEM;
+		return ERR_PTR(-ENOMEM);
 	}
 
-	hpriv->flags |= (unsigned long)pi.private_data;
-
-	hpriv->mmio = devm_ioremap(dev, mem->start, resource_size(mem));
+	hpriv->mmio = devm_ioremap_resource(dev,
+			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
 	if (!hpriv->mmio) {
-		dev_err(dev, "can't map %pR\n", mem);
-		return -ENOMEM;
+		dev_err(dev, "no mmio space\n");
+		return ERR_PTR(-EINVAL);
 	}
 
 	hpriv->target_pwr = devm_regulator_get_optional(dev, "target");
 	if (IS_ERR(hpriv->target_pwr)) {
 		if (PTR_ERR(hpriv->target_pwr) == -EPROBE_DEFER)
-			return -EPROBE_DEFER;
+			return ERR_PTR(-EPROBE_DEFER);
 		hpriv->target_pwr = NULL;
 	}
 

@@ -223,27 +194,48 @@ static int ahci_probe(struct platform_device *pdev)
 		hpriv->clks[i] = clk;
 	}
 
-	rc = ahci_platform_enable_resources(hpriv);
-	if (rc)
-		goto free_clk;
+	return hpriv;
 
-	/*
-	 * Some platforms might need to prepare for mmio region access,
-	 * which could be done in the following init call. So, the mmio
-	 * region shouldn't be accessed before init (if provided) has
-	 * returned successfully.
-	 */
-	if (pdata && pdata->init) {
-		rc = pdata->init(dev, hpriv);
-		if (rc)
-			goto disable_resources;
-	}
+free_clk:
+	while (--i >= 0)
+		clk_put(hpriv->clks[i]);
+	return ERR_PTR(rc);
+}
+EXPORT_SYMBOL_GPL(ahci_platform_get_resources);
+
+void ahci_platform_put_resources(struct ahci_host_priv *hpriv)
+{
+	int c;
+
+	for (c = 0; c < AHCI_MAX_CLKS && hpriv->clks[c]; c++)
+		clk_put(hpriv->clks[c]);
+}
+EXPORT_SYMBOL_GPL(ahci_platform_put_resources);
+
+
+int ahci_platform_init_host(struct platform_device *pdev,
+			    struct ahci_host_priv *hpriv,
+			    const struct ata_port_info *pi_template,
+			    unsigned int force_port_map,
+			    unsigned int mask_port_map)
+{
+	struct device *dev = &pdev->dev;
+	struct ata_port_info pi = *pi_template;
+	const struct ata_port_info *ppi[] = { &pi, NULL };
+	struct ata_host *host;
+	int i, irq, n_ports, rc;
 
-	ahci_save_initial_config(dev, hpriv,
-		pdata ? pdata->force_port_map : 0,
-		pdata ? pdata->mask_port_map  : 0);
+	irq = platform_get_irq(pdev, 0);
+	if (irq <= 0) {
+		dev_err(dev, "no irq\n");
+		return -EINVAL;
+	}
 
 	/* prepare host */
+	hpriv->flags |= (unsigned long)pi.private_data;
+
+	ahci_save_initial_config(dev, hpriv, force_port_map, mask_port_map);
+
 	if (hpriv->cap & HOST_CAP_NCQ)
 		pi.flags |= ATA_FLAG_NCQ;
 

@@ -260,10 +252,8 @@ static int ahci_probe(struct platform_device *pdev)
 	n_ports = max(ahci_nr_ports(hpriv->cap), fls(hpriv->port_map));
 
 	host = ata_host_alloc_pinfo(dev, ppi, n_ports);
-	if (!host) {
-		rc = -ENOMEM;
-		goto pdata_exit;
-	}
+	if (!host)
+		return -ENOMEM;
 
 	host->private_data = hpriv;
 

@@ -278,7 +268,8 @@ static int ahci_probe(struct platform_device *pdev)
 	for (i = 0; i < host->n_ports; i++) {
 		struct ata_port *ap = host->ports[i];
 
-		ata_port_desc(ap, "mmio %pR", mem);
+		ata_port_desc(ap, "mmio %pR",
+			      platform_get_resource(pdev, IORESOURCE_MEM, 0));
 		ata_port_desc(ap, "port 0x%x", 0x100 + ap->port_no * 0x80);
 
 		/* set enclosure management message type */

@@ -292,13 +283,48 @@ static int ahci_probe(struct platform_device *pdev)
 
 	rc = ahci_reset_controller(host);
 	if (rc)
-		goto pdata_exit;
+		return rc;
 
 	ahci_init_controller(host);
 	ahci_print_info(host, "platform");
 
-	rc = ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
-			       &ahci_platform_sht);
+	return ata_host_activate(host, irq, ahci_interrupt, IRQF_SHARED,
+				 &ahci_platform_sht);
+}
+EXPORT_SYMBOL_GPL(ahci_platform_init_host);
+
+static int ahci_probe(struct platform_device *pdev)
+{
+	struct device *dev = &pdev->dev;
+	struct ahci_platform_data *pdata = dev_get_platdata(dev);
+	const struct platform_device_id *id = platform_get_device_id(pdev);
+	struct ahci_host_priv *hpriv;
+	int rc;
+
+	hpriv = ahci_platform_get_resources(pdev);
+	if (IS_ERR(hpriv))
+		return PTR_ERR(hpriv);
+
+	rc = ahci_platform_enable_resources(hpriv);
+	if (rc)
+		goto put_resources;
+
+	/*
+	 * Some platforms might need to prepare for mmio region access,
+	 * which could be done in the following init call. So, the mmio
+	 * region shouldn't be accessed before init (if provided) has
+	 * returned successfully.
+	 */
+	if (pdata && pdata->init) {
+		rc = pdata->init(dev, hpriv);
+		if (rc)
+			goto disable_resources;
+	}
+
+	rc = ahci_platform_init_host(pdev, hpriv,
+				     &ahci_port_info[id ? id->driver_data : 0],
+				     pdata ? pdata->force_port_map : 0,
+				     pdata ? pdata->mask_port_map  : 0);
 	if (rc)
 		goto pdata_exit;
 

@@ -308,8 +334,8 @@ pdata_exit:
 		pdata->exit(dev);
 disable_resources:
 	ahci_platform_disable_resources(hpriv);
-free_clk:
-	ahci_put_clks(hpriv);
+put_resources:
+	ahci_platform_put_resources(hpriv);
 	return rc;
 }
 

@@ -323,7 +349,7 @@ static void ahci_host_stop(struct ata_host *host)
 		pdata->exit(dev);
 
 	ahci_platform_disable_resources(hpriv);
-	ahci_put_clks(hpriv);
+	ahci_platform_put_resources(hpriv);
 }
 
 #ifdef CONFIG_PM_SLEEP

include/linux/ahci_platform.h +6 -0

index 5e5f85e..1dc7602 100644
@@ -20,7 +20,13 @@
 struct device;
 struct ata_port_info;
 struct ahci_host_priv;
+struct platform_device;
 
+/*
+ * Note ahci_platform_data is deprecated. New drivers which need to override
+ * any of these, should instead declare there own platform_driver struct, and
+ * use ahci_platform* functions in their own probe, suspend and resume methods.
+ */
 struct ahci_platform_data {
 	int (*init)(struct device *dev, struct ahci_host_priv *hpriv);
 	void (*exit)(struct device *dev);

Hi,

On 01/22/2014 09:04 PM, Hans de Goede wrote:

Quoted 8 lines

include/linux/ahci_platform.h +1 -0

@@ -20,7 +20,13 @@
  struct device;
  struct ata_port_info;
  struct ahci_host_priv;
+struct platform_device;
 

Quoted 9 lines

include/linux/ahci_platform.h +5 -0

+/*
+ * Note ahci_platform_data is deprecated. New drivers which need to override
+ * any of these, should instead declare there own platform_driver struct, and
+ * use ahci_platform* functions in their own probe, suspend and resume methods.
+ */
  struct ahci_platform_data {
  	int (*init)(struct device *dev, struct ahci_host_priv *hpriv);
  	void (*exit)(struct device *dev);

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 45

Quoted 5 lines

include/linux/ahci_platform.h +2 -0

@@ -35,5 +41,13 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
  void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
  int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
  void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
+struct ahci_host_priv *ahci_platform_get_resources(
+	struct platform_device *pdev);

Why not use 'struct device' as the argument?

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 46

Quoted 1 line

include/linux/ahci_platform.h +1 -0

+void ahci_platform_put_resources(struct ahci_host_priv *hpriv);

Can we have 'struct device' as the argument? Else it becomes impossible to get 'struct device' from 'hpriv' if we need to call e.g. pm_runtime_*() APIs.

Hi,

Quoted 3 lines · Roger Quadros

Hi,

On 01/22/2014 09:04 PM, Hans de Goede wrote:

<snip>

Quoted 8 lines

Quoted 8 lines

include/linux/ahci_platform.h +1 -0

@@ -20,7 +20,13 @@
  struct device;
  struct ata_port_info;
  struct ahci_host_priv;
+struct platform_device;
 

Quoted 16 lines

Quoted 9 lines

include/linux/ahci_platform.h +5 -0

+/*
+ * Note ahci_platform_data is deprecated. New drivers which need to override
+ * any of these, should instead declare there own platform_driver struct, and
+ * use ahci_platform* functions in their own probe, suspend and resume methods.
+ */
  struct ahci_platform_data {
      int (*init)(struct device *dev, struct ahci_host_priv *hpriv);
      void (*exit)(struct device *dev);

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 45

Quoted 5 lines

include/linux/ahci_platform.h +2 -0

@@ -35,5 +41,13 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
  void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
  int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
  void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
+struct ahci_host_priv *ahci_platform_get_resources(
+    struct platform_device *pdev);

Why not use 'struct device' as the argument?

Because of calls to platform_get_resource inside the function.

Quoted 2 lines

Quoted 1 line

include/linux/ahci_platform.h +1 -0

+void ahci_platform_put_resources(struct ahci_host_priv *hpriv);

Quoted 3 lines

Can we have 'struct device' as the argument? Else it becomes impossible to get 'struct device' from 'hpriv' if we need to call e.g. pm_runtime_*() APIs.

The plan for is for this function to go away once we have a devm version of of_clk_get, so if you need to put pm_runtime_calls somewhere, please don't put them here. This sounds like something which should go in enable / disable resources instead ?

Quoted 42 lines · Hans de Goede

Hi,

Quoted 3 lines · Roger Quadros

Hi,

On 01/22/2014 09:04 PM, Hans de Goede wrote:

<snip>

Quoted 8 lines

Quoted 8 lines

include/linux/ahci_platform.h +1 -0

@@ -20,7 +20,13 @@
   struct device;
   struct ata_port_info;
   struct ahci_host_priv;
+struct platform_device;
 

Quoted 16 lines

Quoted 9 lines

include/linux/ahci_platform.h +5 -0

+/*
+ * Note ahci_platform_data is deprecated. New drivers which need to override
+ * any of these, should instead declare there own platform_driver struct, and
+ * use ahci_platform* functions in their own probe, suspend and resume methods.
+ */
   struct ahci_platform_data {
       int (*init)(struct device *dev, struct ahci_host_priv *hpriv);
       void (*exit)(struct device *dev);

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 45

Quoted 5 lines

include/linux/ahci_platform.h +2 -0

@@ -35,5 +41,13 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
   void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
   int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
   void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
+struct ahci_host_priv *ahci_platform_get_resources(
+    struct platform_device *pdev);

Why not use 'struct device' as the argument?

Because of calls to platform_get_resource inside the function.

Quoted 5 lines

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 46

Quoted 1 line

include/linux/ahci_platform.h +1 -0

+void ahci_platform_put_resources(struct ahci_host_priv *hpriv);

Can we have 'struct device' as the argument? Else it becomes impossible to get 'struct device' from 'hpriv' if we need to call e.g. pm_runtime_*() APIs.

Quoted 4 lines

The plan for is for this function to go away once we have a devm version of of_clk_get, so if you need to put pm_runtime_calls somewhere, please don't put them here. This sounds like something which should go in enable / disable resources instead ?

OK. I need to add pm_runtime_enable() + pm_runtime_get_sync() during initialization and pm_runtime_put_sync() + pm_runtime_disable() during cleanup.

If ahci_platform_enable/disable_resources is the right place then we must be able to access struct device from there.

Is it a good to add 'struct device *dev' into the 'struct ahci_host_priv'? Then you can leave this series as is and i'll add a new patch for that.

Hi,

Quoted 43 lines · Roger Quadros

Quoted 42 lines · Hans de Goede

Hi,

Quoted 3 lines · Roger Quadros

Hi,

On 01/22/2014 09:04 PM, Hans de Goede wrote:

<snip>

Quoted 8 lines

Quoted 8 lines

include/linux/ahci_platform.h +1 -0

@@ -20,7 +20,13 @@
   struct device;
   struct ata_port_info;
   struct ahci_host_priv;
+struct platform_device;
 

Quoted 16 lines

Quoted 9 lines

include/linux/ahci_platform.h +5 -0

+/*
+ * Note ahci_platform_data is deprecated. New drivers which need to override
+ * any of these, should instead declare there own platform_driver struct, and
+ * use ahci_platform* functions in their own probe, suspend and resume methods.
+ */
   struct ahci_platform_data {
       int (*init)(struct device *dev, struct ahci_host_priv *hpriv);
       void (*exit)(struct device *dev);

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 45

Quoted 5 lines

include/linux/ahci_platform.h +2 -0

@@ -35,5 +41,13 @@ int ahci_platform_enable_clks(struct ahci_host_priv *hpriv);
   void ahci_platform_disable_clks(struct ahci_host_priv *hpriv);
   int ahci_platform_enable_resources(struct ahci_host_priv *hpriv);
   void ahci_platform_disable_resources(struct ahci_host_priv *hpriv);
+struct ahci_host_priv *ahci_platform_get_resources(
+    struct platform_device *pdev);

Why not use 'struct device' as the argument?

Because of calls to platform_get_resource inside the function.

Quoted 5 lines

include/linux/ahci_platform.h int ahci_platform_enable_clks(struct ahci_host_priv *hpriv); · line 46

Quoted 1 line

include/linux/ahci_platform.h +1 -0

+void ahci_platform_put_resources(struct ahci_host_priv *hpriv);

Can we have 'struct device' as the argument? Else it becomes impossible to get 'struct device' from 'hpriv' if we need to call e.g. pm_runtime_*() APIs.

Quoted 7 lines

Quoted 4 lines

The plan for is for this function to go away once we have a devm version of of_clk_get, so if you need to put pm_runtime_calls somewhere, please don't put them here. This sounds like something which should go in enable / disable resources instead ?

OK. I need to add pm_runtime_enable() + pm_runtime_get_sync() during initialization and pm_runtime_put_sync() + pm_runtime_disable() during cleanup.

Note that enable / disable resources will get called by (the default implementations of) suspend / resume too.

If that is undesirable then I take back what I said before and ahci_platform_put_resources' prototype should be changed to:

void ahci_platform_put_resources(struct device *dev, struct ahci_host_priv *hpriv);

And we will need to keep it around even after we get devm_of_clk_get.

Quoted 2 lines

If ahci_platform_enable/disable_resources is the right place then we must be able to access struct device from there.

Right, and if not we need to access it from ahci_platform_put_resources(), which is in essence the same problem.

Quoted 2 lines

Is it a good to add 'struct device *dev' into the 'struct ahci_host_priv'? Then you can leave this series as is and i'll add a new patch for that.

Normally we get a device * as argument, and get to hpriv like this:

        struct ata_host *host = dev_get_drvdata(dev);
        struct ahci_host_priv *hpriv = host->private_data;

So having a dev * in hpriv is normally not useful.

But the ata_host gets allocated after the first ahci_platform_enable_resources call, so we cannot use this there. Likewise disable_resources / put_resources is used in error handling paths in probe where we don't have an ata_host yet, so my vote goes to adding a "struct device *dev" as first argument, like I suggested above for ahci_platform_put_resources.

This can be done as an add-on patch (if you do don't forget to also fix ahci_sunxi.c and ahci_imx.c), or I can respin my series to have this from day one.

If you want me to do a respin, please let me know which fix you'll need (the put_resources or the enable/disable one).

Quoted 6 lines · Hans de Goede

include/linux/ahci_platform.h +0 -0

@@ -50,4 +50,11 @@ int ahci_platform_init_host(struct platform_device *pdev,
                            unsigned int force_port_map,
                            unsigned int mask_port_map);
 

include/linux/ahci_platform.h int ahci_platform_init_host(struct platform_device *pdev, · line 59

Quoted 7 lines

include/linux/ahci_platform.h +7 -0

+#ifdef CONFIG_PM_SLEEP
+int ahci_platform_suspend_host(struct device *dev);
+int ahci_platform_resume_host(struct device *dev);
+int ahci_platform_suspend(struct device *dev);
+int ahci_platform_resume(struct device *dev);
+#endif
+

Not sure if the #ifdef does any good here. Normally, we don't hide declarations so we can do stuff like

From: Oliver Schinagl <[email protected]>

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 <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
 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      | 38 ++++++++++++++++++++++++++++++
 4 files changed, 56 insertions(+)
 create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi

arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0

index aef8207..3fb7305 100644
@@ -48,6 +48,10 @@
                        status = "okay";
                };
 
+               ahci: sata at 01c18000 {
+                       status = "okay";
+               };
+
                pinctrl at 01c20800 {
                        mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
                                allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0

index f50fb2b..6ae1110 100644
@@ -12,6 +12,7 @@
 
 /dts-v1/;
 /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
        model = "Cubietech Cubieboard";

@@ -51,6 +52,11 @@
                        status = "okay";
                };
 
+               ahci: sata at 01c18000 {
+                       target-supply = <&reg_ahci_5v>;
+                       status = "okay";
+               };
+
                pinctrl at 01c20800 {
                        mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
                                allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

index 4736dd2..198dcda 100644
@@ -331,6 +331,14 @@
                        status = "disabled";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

                intc: interrupt-controller at 01c20400 {
                        compatible = "allwinner,sun4i-ic";
                        reg = <0x01c20400 0x400>;

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +5 -0

new file mode 100644
index 0000000..955b197
@@ -0,0 +1,38 @@
+/*
+ * sunxi boards sata target power supply common code
+ *
+ * Copyright 2014 - Hans de Goede <[email protected]>
+ *

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +17 -1

+       };
+
+       regulators {
+               compatible = "simple-bus";
+               pinctrl-names = "default";
+
+               reg_ahci_5v: ahci-5v {
+                       compatible = "regulator-fixed";
+                       regulator-name = "ahci-5v";
+                       regulator-min-microvolt = <5000000>;
+                       regulator-max-microvolt = <5000000>;
+                       pinctrl-0 = <&ahci_pwr_pin_a>;
+                       gpio = <&pio 1 8 0>;
+                       enable-active-high;
+               };
+       };
+};
--

1.8.5.3

Hi,

Quoted 61 lines · Hans de Goede

From: Oliver Schinagl <[email protected]>

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 <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
  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      | 38 ++++++++++++++++++++++++++++++
  4 files changed, 56 insertions(+)

create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi

arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0

index aef8207..3fb7305 100644
@@ -48,6 +48,10 @@
                         status = "okay";
                 };
 
+               ahci: sata at 01c18000 {
+                       status = "okay";
+               };
+
                 pinctrl at 01c20800 {
                         mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
                                 allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0

index f50fb2b..6ae1110 100644
@@ -12,6 +12,7 @@
 
  /dts-v1/;
  /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
  / {
         model = "Cubietech Cubieboard";

@@ -51,6 +52,11 @@
                         status = "okay";
                 };
 
+               ahci: sata at 01c18000 {
+                       target-supply = <&reg_ahci_5v>;
+                       status = "okay";
+               };
+
                 pinctrl at 01c20800 {
                         mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
                                 allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

index 4736dd2..198dcda 100644
@@ -331,6 +331,14 @@
                         status = "disabled";

arch/arm/boot/dts/sun4i-a10.dtsi line 341

Quoted 10 lines

arch/arm/boot/dts/sun4i-a10.dtsi +8 -0

                 };
 
+               ahci: sata at 01c18000 {
+                       compatible = "allwinner,sun4i-a10-ahci";
+                       reg = <0x01c18000 0x1000>;
+                       interrupts = <56>;
+                       clocks = <&pll6 0>, <&ahb_gates 25>;
+                       status = "disabled";
+               };
+

Consider adding

     pinctrl-names = "default";

in the ahci node to suppress "default pin state not found" warnings. Same goes for sun7i-a20.dtsi.

Quoted 15 lines

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

                 intc: interrupt-controller at 01c20400 {
                         compatible = "allwinner,sun4i-ic";
                         reg = <0x01c20400 0x400>;

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +5 -0

new file mode 100644
index 0000000..955b197
@@ -0,0 +1,38 @@
+/*
+ * sunxi boards sata target power supply common code
+ *
+ * Copyright 2014 - Hans de Goede <[email protected]>
+ *

arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 15

Quoted 10 lines

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +10 -0

+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/ {
+       soc at 01c00000 {

This block needs to be under

     pinctrl at 01c20800 {

arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 21

Quoted 6 lines

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +6 -0

+               ahci_pwr_pin_a: ahci_pwr_pin at 0 {
+                       allwinner,pins = "PB8";
+                       allwinner,function = "gpio_out";
+                       allwinner,drive = <0>;
+                       allwinner,pull = <0>;
+               };

     };

From: Oliver Schinagl <[email protected]>

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 <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
 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      | 38 ++++++++++++++++++++++++++++++

 4 files changed, 56 insertions(+)
 create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi

arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0

index aef8207..3fb7305 100644
@@ -48,6 +48,10 @@
 			status = "okay";
 		};
 
+		ahci: sata at 01c18000 {
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0

index f50fb2b..6ae1110 100644
@@ -12,6 +12,7 @@
 
 /dts-v1/;
 /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
 	model = "Cubietech Cubieboard";

@@ -51,6 +52,11 @@
 			status = "okay";
 		};
 
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

index 4736dd2..198dcda 100644

arch/arm/boot/dts/sun4i-a10.dtsi +6 -0

+			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>;

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +11 -0

new file mode 100644
index 0000000..955b197
@@ -0,0 +1,38 @@
+/*
+ * sunxi boards sata target power supply common code
+ *
+ * Copyright 2014 - Hans de Goede <[email protected]>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html

Hi Hans,

Quoted 6 lines · Hans de Goede

From: Oliver Schinagl <[email protected]>

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.

Quoted 7 lines

Signed-off-by Olliver Schinagl <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
  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      | 38 ++++++++++++++++++++++++++++++

I'm still half convinced about this at the moment, given the number of platforms we support, we can always change it back if things become too messy.

Quoted 48 lines

  4 files changed, 56 insertions(+)

create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi

arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0

index aef8207..3fb7305 100644
@@ -48,6 +48,10 @@
  			status = "okay";
  		};
 
+		ahci: sata at 01c18000 {
+			status = "okay";
+		};
+
  		pinctrl at 01c20800 {
  			mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
  				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0

index f50fb2b..6ae1110 100644
@@ -12,6 +12,7 @@
 
  /dts-v1/;
  /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
  / {
  	model = "Cubietech Cubieboard";

@@ -51,6 +52,11 @@
  			status = "okay";
  		};
 
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
  		pinctrl at 01c20800 {
  			mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
  				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

index 4736dd2..198dcda 100644

arch/arm/boot/dts/sun4i-a10.dtsi line 335

Quoted 5 lines

arch/arm/boot/dts/sun4i-a10.dtsi +2 -0

@@ -331,6 +331,14 @@
  			status = "disabled";
  		};
 
+		ahci: sata at 01c18000 {
+			compatible = "allwinner,sun4i-a10-ahci";

To be consistent with the rest of the sun4i devices compatible, It should be sun4i-ahci.

However, since these devices don't use the same compatible pattern as their own machine compatible, and are consisent with the rest of the compatibles for the other SoCs, we can probably make this a go to transition progressively to this pattern.

I'll cook up some patches for the other devices.

Quoted 31 lines

arch/arm/boot/dts/sun4i-a10.dtsi +6 -0

+			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>;

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +15 -0

new file mode 100644
index 0000000..955b197
@@ -0,0 +1,38 @@
+/*
+ * sunxi boards sata target power supply common code
+ *
+ * Copyright 2014 - Hans de Goede <[email protected]>
+ *
+ * The code contained herein is licensed under the GNU General Public
+ * License. You may obtain a copy of the GNU General Public License
+ * Version 2 or later at the following locations:
+ *
+ * http://www.opensource.org/licenses/gpl-license.html
+ * http://www.gnu.org/copyleft/gpl.html
+ */
+
+/ {
+	soc at 01c00000 {

arch/arm/boot/dts/sunxi-ahci-reg.dtsi line 21

Quoted 6 lines

arch/arm/boot/dts/sunxi-ahci-reg.dtsi new file +6 -0

+		ahci_pwr_pin_a: ahci_pwr_pin at 0 {
+			allwinner,pins = "PB8";
+			allwinner,function = "gpio_out";
+			allwinner,drive = <0>;
+			allwinner,pull = <0>;
+		};

This should be under the pinctrl node.

Hi,

Quoted 17 lines · Maxime Ripard

Hi Hans,

Quoted 13 lines · Hans de Goede

From: Oliver Schinagl <[email protected]>

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 <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
 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      | 38 ++++++++++++++++++++++++++++++

Quoted 2 lines

I'm still half convinced about this at the moment, given the number of platforms we support, we can always change it back if things become too messy.

I assume that this == sunxi-ahci-reg.dtsi ? To be sure I understand you correctly, you're ok with going this route for now, right ?

How about the same for the usb ohci/ehci controller dts patches ? Currently they are still using the put a regulator node in each dts file model, which leads to a lot of boilerplate code. So I would like to move to the same model as I'm using here for the sata supply.

Quoted 56 lines

Quoted 47 lines

 4 files changed, 56 insertions(+)
 create mode 100644 arch/arm/boot/dts/sunxi-ahci-reg.dtsi

arch/arm/boot/dts/sun4i-a10-a1000.dts +4 -0

index aef8207..3fb7305 100644
@@ -48,6 +48,10 @@
 			status = "okay";
 		};
 
+		ahci: sata at 01c18000 {
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_a1000: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10-cubieboard.dts +6 -0

index f50fb2b..6ae1110 100644
@@ -12,6 +12,7 @@
 
 /dts-v1/;
 /include/ "sun4i-a10.dtsi"
+/include/ "sunxi-ahci-reg.dtsi"
 
 / {
 	model = "Cubietech Cubieboard";

@@ -51,6 +52,11 @@
 			status = "okay";
 		};
 
+		ahci: sata at 01c18000 {
+			target-supply = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_cubieboard: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun4i-a10.dtsi +0 -0

index 4736dd2..198dcda 100644

arch/arm/boot/dts/sun4i-a10.dtsi line 335

Quoted 5 lines

arch/arm/boot/dts/sun4i-a10.dtsi +2 -0

@@ -331,6 +331,14 @@
 			status = "disabled";
 		};
 
+		ahci: sata at 01c18000 {
+			compatible = "allwinner,sun4i-a10-ahci";

To be consistent with the rest of the sun4i devices compatible, It should be sun4i-ahci.

Quoted 4 lines

However, since these devices don't use the same compatible pattern as their own machine compatible, and are consisent with the rest of the compatibles for the other SoCs, we can probably make this a go to transition progressively to this pattern.

Ack, I think it would be good to be consistent and try to use sun?i-aXX-foo everywhere. I noticed that we already use that in various places, so I thought it would be good to do that for all new dts bindings.

Quoted 1 line

I'll cook up some patches for the other devices.

Thanks.

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 <[email protected]>

Signed-off-by Hans de Goede <[email protected]>

---
 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(+)

arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +6 -0

index 48777cd..1cab521 100644
@@ -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 = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_cubieboard2: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun7i-a20-cubietruck.dts +20 -0

index 2684f27..1247ea1 100644
@@ -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 = <&reg_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>;
+		};
+	};
 };

arch/arm/boot/dts/sun7i-a20-olinuxino-micro.dts +6 -0

index bf6f6c8..f135886 100644
@@ -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 = <&reg_ahci_5v>;
+			status = "okay";
+		};
+
 		pinctrl at 01c20800 {
 			mmc0_cd_pin_olinuxinom: mmc0_cd_pin at 0 {
 				allwinner,pins = "PH1";

arch/arm/boot/dts/sun7i-a20.dtsi +0 -0

index c9c123a..0657bad 100644

Quoted 23 lines · Hans de Goede

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 <[email protected]> Signed-off-by: Hans de Goede <[email protected]> --- 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(+)

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 @@ renamed from arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +0 -0

/dts-v1/; /include/ "sun7i-a20.dtsi" +/include/ "sunxi-ahci-reg.dtsi"

/ { model = "Cubietech Cubieboard2"; @@ -28,6 +29,11 @@ status = "okay"; };

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 @@ renamed from arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +1 -0

+		ahci: sata at 01c18000 { +			target-supply = <&reg_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"; };

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 @@ renamed from arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +2 -0

+		ahci: sata at 01c18000 { +			target-supply = <&reg_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"

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 @@

Quoted 5 lines

/ { model = "Olimex A20-Olinuxino Micro"; @@ -37,6 +38,11 @@ status = "okay"; };

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 @@ renamed from arch/arm/boot/dts/sun7i-a20-cubieboard2.dts +2 -0

+		ahci: sata at 01c18000 { +			target-supply = <&reg_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>;

This is supposed to be a level triggered interrupt, not an edge triggered one.

Here is v4 of my patchset for adding ahci-sunxi support. It has grown quite a bit since I've been going for a more generic approach this time and I've also cleaned up the ahci-imx driver to use the same generic approach.

Hello,

Quoted 3 lines · Hans de Goede

Here is v4 of my patchset for adding ahci-sunxi support. It has grown quite a bit since I've been going for a more generic approach this time and I've also cleaned up the ahci-imx driver to use the same generic approach.

On top of which tree were these patches generated? They don't apply to 3.14-rc1.