diff mbox

[v2,1/2] ARM: mvebu: use armada-370-sata for SATA on Armada 375

Message ID 1455121756-20804-1-git-send-email-thomas.petazzoni@free-electrons.com (mailing list archive)
State New, archived
Headers show

Commit Message

Thomas Petazzoni Feb. 10, 2016, 4:29 p.m. UTC
From: Lior Amsalem <alior@marvell.com>

The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which
requires the PHY speed to be set in the LP_PHY_CTL register for SATA
hotplug to work.

Therefore, this commit updates the compatible string used to describe
the SATA IP in Armada 375 from marvell,orion-sata to
marvell,armada-370-sata.

Fixes: 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")
Cc: <stable@vger.kernel.org>
Signed-off-by: Lior Amsalem <alior@marvell.com>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
---
Changes since v1:
 - Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.
---
 arch/arm/boot/dts/armada-375.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Andrew Lunn Feb. 10, 2016, 5:17 p.m. UTC | #1
On Wed, Feb 10, 2016 at 05:29:15PM +0100, Thomas Petazzoni wrote:
> From: Lior Amsalem <alior@marvell.com>
> 
> The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which
> requires the PHY speed to be set in the LP_PHY_CTL register for SATA
> hotplug to work.
> 
> Therefore, this commit updates the compatible string used to describe
> the SATA IP in Armada 375 from marvell,orion-sata to
> marvell,armada-370-sata.
> 
> Fixes: 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Lior Amsalem <alior@marvell.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Reviewed-by: Andrew Lunn <andrew@lunn.ch>

Thanks for adding the tags,
       
       Andrew

> ---
> Changes since v1:
>  - Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.
> ---
>  arch/arm/boot/dts/armada-375.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
> index 7ccce75..cc952cf 100644
> --- a/arch/arm/boot/dts/armada-375.dtsi
> +++ b/arch/arm/boot/dts/armada-375.dtsi
> @@ -529,7 +529,7 @@
>  			};
>  
>  			sata@a0000 {
> -				compatible = "marvell,orion-sata";
> +				compatible = "marvell,armada-370-sata";
>  				reg = <0xa0000 0x5000>;
>  				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&gateclk 14>, <&gateclk 20>;
> -- 
> 2.6.4
>
Gregory CLEMENT Feb. 12, 2016, 4:49 p.m. UTC | #2
Hi Thomas,
 
 On mer., févr. 10 2016, Thomas Petazzoni <thomas.petazzoni@free-electrons.com> wrote:

> From: Lior Amsalem <alior@marvell.com>
>
> The Armada 375 has the same SATA IP as Armada 370 and Armada XP, which
> requires the PHY speed to be set in the LP_PHY_CTL register for SATA
> hotplug to work.
>
> Therefore, this commit updates the compatible string used to describe
> the SATA IP in Armada 375 from marvell,orion-sata to
> marvell,armada-370-sata.
>
> Fixes: 4de59085091f753d08c8429d756b46756ab94665 ("ARM: mvebu: add Device Tree description of the Armada 375 SoC")
> Cc: <stable@vger.kernel.org>
> Signed-off-by: Lior Amsalem <alior@marvell.com>
> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

Applied on mvebu/dt, I renamed the patch to: " ARM: dts: armada-375: use
armada-370-sata for SATA" to unify the way we labl the dt related patch.
I also adde the reviwed-by tag from Andrew.

Thanks,

Gregory

> ---
> Changes since v1:
>  - Add Fixes: tag, and add stable@ in Cc, as suggested by Andrew Lunn.
> ---
>  arch/arm/boot/dts/armada-375.dtsi | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
> index 7ccce75..cc952cf 100644
> --- a/arch/arm/boot/dts/armada-375.dtsi
> +++ b/arch/arm/boot/dts/armada-375.dtsi
> @@ -529,7 +529,7 @@
>  			};
>  
>  			sata@a0000 {
> -				compatible = "marvell,orion-sata";
> +				compatible = "marvell,armada-370-sata";
>  				reg = <0xa0000 0x5000>;
>  				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
>  				clocks = <&gateclk 14>, <&gateclk 20>;
> -- 
> 2.6.4
>
diff mbox

Patch

diff --git a/arch/arm/boot/dts/armada-375.dtsi b/arch/arm/boot/dts/armada-375.dtsi
index 7ccce75..cc952cf 100644
--- a/arch/arm/boot/dts/armada-375.dtsi
+++ b/arch/arm/boot/dts/armada-375.dtsi
@@ -529,7 +529,7 @@ 
 			};
 
 			sata@a0000 {
-				compatible = "marvell,orion-sata";
+				compatible = "marvell,armada-370-sata";
 				reg = <0xa0000 0x5000>;
 				interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
 				clocks = <&gateclk 14>, <&gateclk 20>;