Subject: [PATCH v2 1/3] ata: sata_mv: introduce compatible string "marvell, armada-370-xp-sata"

From: [email-masked] (Gregory CLEMENT)
Date: Tue, 14 Jan 2014 15:59:35 +0100

Hi Simon, Jeff, Tejun,

On 14/01/2014 15:50, Simon Guinot wrote:
> The sata_mv driver supports the SATA IP found in several Marvell SoCs.
> As some new SATA registers have been introduced with the Armada 370/XP
> SoCs, a way to identify them is needed.
> 
> This patch introduces a new compatible string for the SATA IP found in
> Armada 370/XP SoCs.
> 
> Signed-off-by: Simon Guinot <[email-masked]>
> Cc: Thomas Petazzoni <[email-masked]>
> Cc: Jason Cooper <[email-masked]>
> Cc: Andrew Lunn <[email-masked]>
> Cc: Gregory Clement <[email-masked]>
> Cc: Sebastian Hesselbarth <[email-masked]>
> Cc: Lior Amsalem <[email-masked]>
> Cc: stable at vger.kernel.org
> ---
>  Documentation/devicetree/bindings/ata/marvell.txt | 2 +-
>  drivers/ata/sata_mv.c                             | 1 +
>  2 files changed, 2 insertions(+), 1 deletion(-)
> 
> diff --git a/Documentation/devicetree/bindings/ata/marvell.txt b/Documentation/devicetree/bindings/ata/marvell.txt
> index b5cdd20cde9c..a52a5d018042 100644
> --- a/Documentation/devicetree/bindings/ata/marvell.txt
> +++ b/Documentation/devicetree/bindings/ata/marvell.txt
> @@ -1,7 +1,7 @@
>  * Marvell Orion SATA
>  
>  Required Properties:
> -- compatibility : "marvell,orion-sata"
> +- compatibility : "marvell,orion-sata" or "marvell,armada-370-xp-sata"

Usually we try to use the name of the first SoC instead of a family name.
So here it should be "marvell,armada-370-sata"

Thanks,

Gregory

>  - reg           : Address range of controller
>  - interrupts    : Interrupt controller is using
>  - nr-ports      : Number of SATA ports in use.
> diff --git a/drivers/ata/sata_mv.c b/drivers/ata/sata_mv.c
> index 56be31819897..df35c521a141 100644
> --- a/drivers/ata/sata_mv.c
> +++ b/drivers/ata/sata_mv.c
> @@ -4209,6 +4209,7 @@ static int mv_platform_resume(struct platform_device *pdev)
>  
>  #ifdef CONFIG_OF
>  static struct of_device_id mv_sata_dt_ids[] = {
> +	{ .compatible = "marvell,armada-370-xp-sata", },
>  	{ .compatible = "marvell,orion-sata", },
>  	{},
>  };
> 

-- 
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com