On 17/06/2015 17:12, Gregory CLEMENT wrote:
> Hi Simon,
>
> On 17/06/2015 15:19, Simon Guinot wrote:
>> The mvneta driver supports the Ethernet IP found in the Armada 370, XP,
>> 380 and 385 SoCs. Since at least one more hardware feature is available
>> for the Armada XP SoCs then a way to identify them is needed.
>>
>> This patch introduces a new compatible string "marvell,armada-xp-neta".
>
> Let's be future proof by going further. I would like to have an compatible string
> for each SoC even if we currently we don't use them.
>
> You even don't have to use add it in the mvneta.c file if you use:
> "marvell,armada-380-neta", "marvell,armada-xp-neta"
Actually I meant:
"marvell,armada-380-neta", "marvell,armada-370-neta"
>
>
> Thanks,
>
> Gregory
>
>
>> Signed-off-by: Simon Guinot <simon.guinot@xxxxxxxxxxxx>
>> Cc: <stable@xxxxxxxxxxxxxxx> # v3.8+
>> ---
>> Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt | 2 +-
>> drivers/net/ethernet/marvell/mvneta.c | 1 +
>> 2 files changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
>> index 750d577e8083..f5a8ca29aff0 100644
>> --- a/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
>> +++ b/Documentation/devicetree/bindings/net/marvell-armada-370-neta.txt
>> @@ -1,7 +1,7 @@
>> * Marvell Armada 370 / Armada XP Ethernet Controller (NETA)
>>
>> Required properties:
>> -- compatible: should be "marvell,armada-370-neta".
>> +- compatible: "marvell,armada-370-neta" or "marvell,armada-xp-neta".
>> - reg: address and length of the register set for the device.
>> - interrupts: interrupt for the device
>> - phy: See ethernet.txt file in the same directory.
>> diff --git a/drivers/net/ethernet/marvell/mvneta.c b/drivers/net/ethernet/marvell/mvneta.c
>> index ce5f7f9cff06..aceb977b104d 100644
>> --- a/drivers/net/ethernet/marvell/mvneta.c
>> +++ b/drivers/net/ethernet/marvell/mvneta.c
>> @@ -3179,6 +3179,7 @@ static int mvneta_remove(struct platform_device *pdev)
>>
>> static const struct of_device_id mvneta_match[] = {
>> { .compatible = "marvell,armada-370-neta" },
>> + { .compatible = "marvell,armada-xp-neta" },
>> { }
>> };
>> MODULE_DEVICE_TABLE(of, mvneta_match);
>>
>
>
--
Gregory Clement, Free Electrons
Kernel, drivers, real-time and embedded Linux
development, consulting, training and support.
http://free-electrons.com
--
To unsubscribe from this list: send the line "unsubscribe stable" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html