[PATCH 0/8] iMX6 SATA configuration

[PATCH 0/8] iMX6 SATA configuration

[Russell King - ARM Linux]

Another round of these patches.  I've integrated Shawn's patch to split
the documentation into this series so I can add the DT documentation
on top of it.

 .../devicetree/bindings/ata/ahci-platform.txt      |   6 -
 Documentation/devicetree/bindings/ata/imx-sata.txt |  36 ++++
 arch/arm/boot/dts/imx6q-cubox-i.dts                |   4 +
 drivers/ata/ahci_imx.c                             | 184 ++++++++++++++++++++-
 4 files changed, 216 insertions(+), 14 deletions(-)

-- 
FTTC broadband for 0.8mile line: now at 9.7Mbps down 460kbps up... slowly
improving, and getting towards what was expected from it.

[PATCH v3 1/8] dt-bindings: ata: create bindings for imx sata controller

[Russell King]

From: Shawn Guo <shawn.guo@freescale.com>
To: Tejun Heo <tj@kernel.org>,linux-ide@vger.kernel.org

The Freescale i.MX SATA controller mostly conforms to the AHCI
interface, but there are some special extensions at integration level
like clocks settings and hardware parameters.

Let's create a separate bindings doc for imx sata controller, so that
more imx specific properties can be added later without messing up the
generic ahci-platform bindings.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 .../devicetree/bindings/ata/ahci-platform.txt      |  6 -----
 Documentation/devicetree/bindings/ata/imx-sata.txt | 26 ++++++++++++++++++++++
 2 files changed, 26 insertions(+), 6 deletions(-)
 create mode 100644 Documentation/devicetree/bindings/ata/imx-sata.txt

diff --git a/Documentation/devicetree/bindings/ata/ahci-platform.txt b/Documentation/devicetree/bindings/ata/ahci-platform.txt
index c96d8dcf98fd..549ceb8cb93b 100644
--- a/Documentation/devicetree/bindings/ata/ahci-platform.txt
+++ b/Documentation/devicetree/bindings/ata/ahci-platform.txt
@@ -6,8 +6,6 @@ Each SATA controller should have its own node.
 Required properties:
 - compatible        : compatible string, one of:
   - "allwinner,sun4i-a10-ahci"
-  - "fsl,imx53-ahci"
-  - "fsl,imx6q-ahci"
   - "hisilicon,hisi-ahci"
   - "ibm,476gtr-ahci"
   - "marvell,armada-380-ahci"
@@ -22,10 +20,6 @@ Each SATA controller should have its own node.
 - clocks            : a list of phandle + clock specifier pairs
 - target-supply     : regulator for SATA target power
 
-"fsl,imx53-ahci", "fsl,imx6q-ahci" required properties:
-- clocks            : must contain the sata, sata_ref and ahb clocks
-- clock-names       : must contain "ahb" for the ahb clock
-
 Examples:
         sata@ffe08000 {
 		compatible = "snps,spear-ahci";
diff --git a/Documentation/devicetree/bindings/ata/imx-sata.txt b/Documentation/devicetree/bindings/ata/imx-sata.txt
new file mode 100644
index 000000000000..aeb99dd986b0
--- /dev/null
+++ b/Documentation/devicetree/bindings/ata/imx-sata.txt
@@ -0,0 +1,26 @@
+* Freescale i.MX AHCI SATA Controller
+
+The Freescale i.MX SATA controller mostly conforms to the AHCI interface
+with some special extensions at integration level.
+
+Required properties:
+- compatible : should be one of the following:
+   - "fsl,imx53-ahci" for i.MX53 SATA controller
+   - "fsl,imx6q-ahci" for i.MX6Q SATA controller
+- interrupts : interrupt mapping for SATA IRQ
+- reg : registers mapping
+- clocks : list of clock specifiers, must contain an entry for each
+  required entry in clock-names
+- clock-names : should include "sata", "sata_ref" and "ahb" entries
+
+Examples:
+
+sata@02200000 {
+	compatible = "fsl,imx6q-ahci";
+	reg = <0x02200000 0x4000>;
+	interrupts = <0 39 IRQ_TYPE_LEVEL_HIGH>;
+	clocks = <&clks IMX6QDL_CLK_SATA>,
+		 <&clks IMX6QDL_CLK_SATA_REF_100M>,
+		 <&clks IMX6QDL_CLK_AHB>;
+	clock-names = "sata", "sata_ref", "ahb";
+};
-- 
1.8.3.1

[PATCH v3 4/8] dt-bindings: ata: add ahci_imx electrical properties

[Russell King]

Add the documentation for the electrical properties for the iMX SATA
controller.  There are many values for these, and listing them would
be error prone.  Refer readers to the device documentation and driver
source code for these details.

Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
---
 Documentation/devicetree/bindings/ata/imx-sata.txt | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/Documentation/devicetree/bindings/ata/imx-sata.txt b/Documentation/devicetree/bindings/ata/imx-sata.txt
index aeb99dd986b0..a13f0f603776 100644
--- a/Documentation/devicetree/bindings/ata/imx-sata.txt
+++ b/Documentation/devicetree/bindings/ata/imx-sata.txt
@@ -13,6 +13,14 @@ with some special extensions at integration level.
   required entry in clock-names
 - clock-names : should include "sata", "sata_ref" and "ahb" entries
 
+Optional properties:
+- fsl,transmit-level-mV : transmit voltage level, in millivolts.
+- fsl,transmit-boost-mdB : transmit boost level, in milli-decibels
+- fsl,transmit-atten-16ths : transmit attenuation, in 16ths
+- fsl,receive-eq-mdB : receive equalisation, in milli-decibels
+  Please refer to the technical documentation or the driver source code
+  for the list of legal values for these options.
+
 Examples:
 
 sata@02200000 {
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCH v3 7/8] ARM: dts: cubox-i: add eSATA DT configuration

[Russell King]

Add the transmit level, boost and attenuation parameters necessary for
the eSATA interface on Cubox-i to work.

Signed-off-by: Russell King <rmk+kernel-lFZ/pmaqli7XmaaqVzeoHQ@public.gmane.org>
---
 arch/arm/boot/dts/imx6q-cubox-i.dts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
index bc5f31e3e892..941365d7ee65 100644
--- a/arch/arm/boot/dts/imx6q-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -13,4 +13,7 @@
 
 &sata {
 	status = "okay";
+	fsl,transmit-level-mV = <1104>;
+	fsl,transmit-boost-mdB = <0>;
+	fsl,transmit-atten-16ths = <9>;
 };
-- 
1.8.3.1

--
To unsubscribe from this list: send the line "unsubscribe devicetree" in
the body of a message to majordomo-u79uwXL29TY76Z2rM5mHXA@public.gmane.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Re: [PATCH v3 7/8] ARM: dts: cubox-i: add eSATA DT configuration

[Shawn Guo]

On Tue, Jun 24, 2014 at 11:19:58AM +0100, Russell King wrote:
> Add the transmit level, boost and attenuation parameters necessary for
> the eSATA interface on Cubox-i to work.
> 
> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>

Applied #7 and #8, thanks.

[PATCH v3 6/8] dt-bindings: ata: document ability to disable spread-spectrum clock

[Russell King]

Add documentation of the fsl,no-spread-spectrum option.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 Documentation/devicetree/bindings/ata/imx-sata.txt | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Documentation/devicetree/bindings/ata/imx-sata.txt b/Documentation/devicetree/bindings/ata/imx-sata.txt
index a13f0f603776..fa511db18408 100644
--- a/Documentation/devicetree/bindings/ata/imx-sata.txt
+++ b/Documentation/devicetree/bindings/ata/imx-sata.txt
@@ -20,6 +20,8 @@ with some special extensions at integration level.
 - fsl,receive-eq-mdB : receive equalisation, in milli-decibels
   Please refer to the technical documentation or the driver source code
   for the list of legal values for these options.
+- fsl,no-spread-spectrum : disable spread-spectrum clocking on the SATA
+  link.
 
 Examples:
 
-- 
1.8.3.1

[PATCH v3 8/8] ARM: dts: cubox-i: disable spread-spectrum for Cubox-i eSATA

[Russell King]

Spread-spectrum doesn't work with Cubox-i hardware.  eSATA devices are
detected, but then fail on normal IO.  Therefore, disable this feature.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
---
 arch/arm/boot/dts/imx6q-cubox-i.dts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/arch/arm/boot/dts/imx6q-cubox-i.dts b/arch/arm/boot/dts/imx6q-cubox-i.dts
index 941365d7ee65..9efd8b0c8011 100644
--- a/arch/arm/boot/dts/imx6q-cubox-i.dts
+++ b/arch/arm/boot/dts/imx6q-cubox-i.dts
@@ -16,4 +16,5 @@
 	fsl,transmit-level-mV = <1104>;
 	fsl,transmit-boost-mdB = <0>;
 	fsl,transmit-atten-16ths = <9>;
+	fsl,no-spread-spectrum;
 };
-- 
1.8.3.1

Re: [PATCH 0/8] iMX6 SATA configuration

[Rob Herring]

On Tue, Jun 24, 2014 at 5:19 AM, Russell King - ARM Linux
<linux@arm.linux.org.uk> wrote:
> Another round of these patches.  I've integrated Shawn's patch to split
> the documentation into this series so I can add the DT documentation
> on top of it.
>
>  .../devicetree/bindings/ata/ahci-platform.txt      |   6 -
>  Documentation/devicetree/bindings/ata/imx-sata.txt |  36 ++++
>  arch/arm/boot/dts/imx6q-cubox-i.dts                |   4 +
>  drivers/ata/ahci_imx.c                             | 184 ++++++++++++++++++++-
>  4 files changed, 216 insertions(+), 14 deletions(-)

For patches 1, 4, and 6:

Acked-by: Rob Herring <robh@kernel.org>

Rob

Re: [PATCH 0/8] iMX6 SATA configuration

[Tejun Heo]

On Tue, Jun 24, 2014 at 11:19:01AM +0100, Russell King - ARM Linux wrote:
> Another round of these patches.  I've integrated Shawn's patch to split
> the documentation into this series so I can add the DT documentation
> on top of it.
> 
>  .../devicetree/bindings/ata/ahci-platform.txt      |   6 -
>  Documentation/devicetree/bindings/ata/imx-sata.txt |  36 ++++
>  arch/arm/boot/dts/imx6q-cubox-i.dts                |   4 +
>  drivers/ata/ahci_imx.c                             | 184 ++++++++++++++++++++-
>  4 files changed, 216 insertions(+), 14 deletions(-)

Patches look good to me.  Shawn, can you please review the ahci_imx
portion?  How should the patches be routed?  Should I pick only the
ata parts or apply the whole thing?

Thanks.

-- 
tejun

Re: [PATCH 0/8] iMX6 SATA configuration

[Shawn Guo]

On Tue, Jun 24, 2014 at 06:09:58PM -0400, Tejun Heo wrote:
> On Tue, Jun 24, 2014 at 11:19:01AM +0100, Russell King - ARM Linux wrote:
> > Another round of these patches.  I've integrated Shawn's patch to split
> > the documentation into this series so I can add the DT documentation
> > on top of it.
> > 
> >  .../devicetree/bindings/ata/ahci-platform.txt      |   6 -
> >  Documentation/devicetree/bindings/ata/imx-sata.txt |  36 ++++
> >  arch/arm/boot/dts/imx6q-cubox-i.dts                |   4 +
> >  drivers/ata/ahci_imx.c                             | 184 ++++++++++++++++++++-
> >  4 files changed, 216 insertions(+), 14 deletions(-)
> 
> Patches look good to me.  Shawn, can you please review the ahci_imx
> portion?

Reviewed-by: Shawn Guo <shawn.guo@freescale.com>

I also tested the series on imx6q-sabresd board and nothing breaks
regarding SATA support on the board.

> How should the patches be routed?  Should I pick only the
> ata parts or apply the whole thing?

I will apply the last two dts patches via IMX tree, and please apply
the first 6 patches through your tree.

Shawn

Re: [PATCH 0/8] iMX6 SATA configuration

[Tejun Heo]

On Wed, Jun 25, 2014 at 11:29:14PM +0800, Shawn Guo wrote:
> I will apply the last two dts patches via IMX tree, and please apply
> the first 6 patches through your tree.

Alright, applied the rest to libata/for-3.17.

Thanks.

-- 
tejun