[PATCH 0/3] ARM: shmobile: sata_rcar updates

[PATCH 0/3] ARM: shmobile: sata_rcar updates

[Geert Uytterhoeven]

	Hi Tejun, Simon, Magnus,

This patch series improves DT bindings documentation and usage for the
sata_rcar driver.

The first patch was sent before by Valentine Barshak a while ago, but never
updated according to the review comments.

Thanks for applying!

Geert Uytterhoeven (2):
  sata_rcar: Document deprecated "renesas,rcar-sata"
  ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property

Valentine Barshak (1):
  sata_rcar: Add clocks to sata_rcar bindings

 Documentation/devicetree/bindings/ata/sata_rcar.txt | 11 +++++++----
 arch/arm/boot/dts/r8a7779.dtsi                      |  2 +-
 2 files changed, 8 insertions(+), 5 deletions(-)

-- 
1.9.1

Gr{oetje,eeting}s,

						Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
							    -- Linus Torvalds

[PATCH 1/3] sata_rcar: Add clocks to sata_rcar bindings

[Geert Uytterhoeven]

From: Valentine Barshak <valentine.barshak@cogentembedded.com>

Now that the clocks are available in the R-Car Gen2 DT,
add clocks property description to the sata_rcar bindings.
The clocks have been tested on r8a7791 so we use that
as an example of the R-Car SATA node.

Signed-off-by: Valentine Barshak <valentine.barshak@cogentembedded.com>
[geert: Reworded clocks property]
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/ata/sata_rcar.txt | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 1e6111333fa88f86..12d9de915ebd6cbf 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -7,12 +7,14 @@ Required properties:
 			  - "renesas,sata-r8a7791" for R-Car M2
 - reg			: address and length of the SATA registers;
 - interrupts		: must consist of one interrupt specifier.
+- clocks		: must contain a reference to the functional clock.
 
 Example:
 
-sata: sata@fc600000 {
-	compatible = "renesas,sata-r8a7779";
-	reg = <0xfc600000 0x2000>;
+sata0: sata@ee300000 {
+	compatible = "renesas,sata-r8a7791";
+	reg = <0 0xee300000 0 0x2000>;
 	interrupt-parent = <&gic>;
-	interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
+	interrupts = <0 105 IRQ_TYPE_LEVEL_HIGH>;
+	clocks = <&mstp8_clks R8A7791_CLK_SATA0>;
 };
-- 
1.9.1

[PATCH 2/3] sata_rcar: Document deprecated "renesas,rcar-sata"

[Geert Uytterhoeven]

Commit e67adb4e669db834 ("sata_rcar: Add R-Car Gen2 SATA PHY support")
deprecated "renesas,rcar-sata" in favor of "renesas,sata-r8a7779", but
the deprecated value was never documented in the binding documentation,
while it is still in active use.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 Documentation/devicetree/bindings/ata/sata_rcar.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Documentation/devicetree/bindings/ata/sata_rcar.txt b/Documentation/devicetree/bindings/ata/sata_rcar.txt
index 12d9de915ebd6cbf..ed266c87ce106f20 100644
--- a/Documentation/devicetree/bindings/ata/sata_rcar.txt
+++ b/Documentation/devicetree/bindings/ata/sata_rcar.txt
@@ -3,6 +3,7 @@
 Required properties:
 - compatible		: should contain one of the following:
 			  - "renesas,sata-r8a7779" for R-Car H1
+			    ("renesas,rcar-sata" is deprecated)
 			  - "renesas,sata-r8a7790" for R-Car H2
 			  - "renesas,sata-r8a7791" for R-Car M2
 - reg			: address and length of the SATA registers;
-- 
1.9.1

Re: [PATCH 2/3] sata_rcar: Document deprecated "renesas,rcar-sata"

[Tejun Heo]

On Wed, Oct 29, 2014 at 02:58:50PM +0100, Geert Uytterhoeven wrote:
> Commit e67adb4e669db834 ("sata_rcar: Add R-Car Gen2 SATA PHY support")
> deprecated "renesas,rcar-sata" in favor of "renesas,sata-r8a7779", but
> the deprecated value was never documented in the binding documentation,
> while it is still in active use.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

This one doesn't apply anymore.  Can you please refresh it against
libata/for-3.19.

Thanks.

-- 
tejun

[PATCH 3/3] ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property

[Geert Uytterhoeven]

The SATA node used the generic compatible property only, which was
deprecated by commit e67adb4e669db834 ("sata_rcar: Add R-Car Gen2 SATA
PHY support"). Add the SoC-specific one introduced by that commit.

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
---
 arch/arm/boot/dts/r8a7779.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
index fda814ed191d1531..a8845328827a3f0c 100644
--- a/arch/arm/boot/dts/r8a7779.dtsi
+++ b/arch/arm/boot/dts/r8a7779.dtsi
@@ -303,7 +303,7 @@
 	};
 
 	sata: sata@fc600000 {
-		compatible = "renesas,rcar-sata";
+		compatible = "renesas,sata-r8a7779", "renesas,rcar-sata";
 		reg = <0xfc600000 0x2000>;
 		interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
 		clocks = <&mstp1_clks R8A7779_CLK_SATA>;
-- 
1.9.1

Re: [PATCH 3/3] ARM: shmobile: r8a7779 dtsi: Add SoC-specific SATA compatible property

[Simon Horman]

On Wed, Oct 29, 2014 at 02:58:51PM +0100, Geert Uytterhoeven wrote:
> The SATA node used the generic compatible property only, which was
> deprecated by commit e67adb4e669db834 ("sata_rcar: Add R-Car Gen2 SATA
> PHY support"). Add the SoC-specific one introduced by that commit.
> 
> Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>

Thanks, I have queued this up.

> ---
>  arch/arm/boot/dts/r8a7779.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/r8a7779.dtsi b/arch/arm/boot/dts/r8a7779.dtsi
> index fda814ed191d1531..a8845328827a3f0c 100644
> --- a/arch/arm/boot/dts/r8a7779.dtsi
> +++ b/arch/arm/boot/dts/r8a7779.dtsi
> @@ -303,7 +303,7 @@
>  	};
>  
>  	sata: sata@fc600000 {
> -		compatible = "renesas,rcar-sata";
> +		compatible = "renesas,sata-r8a7779", "renesas,rcar-sata";
>  		reg = <0xfc600000 0x2000>;
>  		interrupts = <0 100 IRQ_TYPE_LEVEL_HIGH>;
>  		clocks = <&mstp1_clks R8A7779_CLK_SATA>;
> -- 
> 1.9.1
> 

Re: [PATCH 0/3] ARM: shmobile: sata_rcar updates

[Tejun Heo]

On Wed, Oct 29, 2014 at 02:58:48PM +0100, Geert Uytterhoeven wrote:
> 	Hi Tejun, Simon, Magnus,
> 
> This patch series improves DT bindings documentation and usage for the
> sata_rcar driver.
> 
> The first patch was sent before by Valentine Barshak a while ago, but never
> updated according to the review comments.

I can route these through libata tree once Simon acks them.  Please
let me know thorugh which tree these should be routed.

Thanks.

-- 
tejun

Re: [PATCH 0/3] ARM: shmobile: sata_rcar updates

[Geert Uytterhoeven]

Hi Tejun,

On Wed, Oct 29, 2014 at 3:51 PM, Tejun Heo <tj@kernel.org> wrote:
> On Wed, Oct 29, 2014 at 02:58:48PM +0100, Geert Uytterhoeven wrote:
>> This patch series improves DT bindings documentation and usage for the
>> sata_rcar driver.
>>
>> The first patch was sent before by Valentine Barshak a while ago, but never
>> updated according to the review comments.
>
> I can route these through libata tree once Simon acks them.  Please
> let me know thorugh which tree these should be routed.

I think the first two, tagged "sata_rcar", should go through your tree.
The third one, tagged "ARM: shmobile", should go through Simon's tree.

Thanks!

Gr{oetje,eeting}s,

                        Geert

--
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org

In personal conversations with technical people, I call myself a hacker. But
when I'm talking to journalists I just say "programmer" or something like that.
                                -- Linus Torvalds

Re: [PATCH 0/3] ARM: shmobile: sata_rcar updates

[Simon Horman]

On Wed, Oct 29, 2014 at 03:58:11PM +0100, Geert Uytterhoeven wrote:
> Hi Tejun,
> 
> On Wed, Oct 29, 2014 at 3:51 PM, Tejun Heo <tj@kernel.org> wrote:
> > On Wed, Oct 29, 2014 at 02:58:48PM +0100, Geert Uytterhoeven wrote:
> >> This patch series improves DT bindings documentation and usage for the
> >> sata_rcar driver.
> >>
> >> The first patch was sent before by Valentine Barshak a while ago, but never
> >> updated according to the review comments.
> >
> > I can route these through libata tree once Simon acks them.  Please
> > let me know thorugh which tree these should be routed.
> 
> I think the first two, tagged "sata_rcar", should go through your tree.
> The third one, tagged "ARM: shmobile", should go through Simon's tree.

Yes, I think so too.

For the first two patches:

Acked-by: Simon Horman <horms+renesas@verge.net.au>

I'll pick up the last patch myself.