2015-06-18 10:18:15

by Nicolas Ferre

Subject: [PATCH] net/macb: add config for Atmel sama5d2 SoCs

From: Cyrille Pitchen <[email protected]>

Add the compatible string for Atmel sama5d2 SoC family as the configuration
options differ from other instances of the GEM.

Signed-off-by: Cyrille Pitchen <[email protected]>
Signed-off-by: Nicolas Ferre <[email protected]>
---
drivers/net/ethernet/cadence/macb.c | 8 ++++++++
1 file changed, 8 insertions(+)

diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
index 740d04fd2223..caeb39561567 100644
--- a/drivers/net/ethernet/cadence/macb.c
+++ b/drivers/net/ethernet/cadence/macb.c
@@ -2713,6 +2713,13 @@ static const struct macb_config pc302gem_config = {
.init = macb_init,
};

+static const struct macb_config sama5d2_config = {
+ .caps = 0,
+ .dma_burst_length = 16,
+ .clk_init = macb_clk_init,
+ .init = macb_init,
+};
+
static const struct macb_config sama5d3_config = {
.caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
.dma_burst_length = 16,
@@ -2756,6 +2763,7 @@ static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,macb" },
{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
{ .compatible = "cdns,gem", .data = &pc302gem_config },
+ { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
{ .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
{ .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
{ .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
--
2.1.3

2015-06-18 13:30:29

by Alexandre Belloni

Subject: Re: [PATCH] net/macb: add config for Atmel sama5d2 SoCs

On 18/06/2015 at 12:18:19 +0200, Nicolas Ferre wrote :
> From: Cyrille Pitchen <[email protected]>
>
> Add the compatible string for Atmel sama5d2 SoC family as the configuration
> options differ from other instances of the GEM.
>
> Signed-off-by: Cyrille Pitchen <[email protected]>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> drivers/net/ethernet/cadence/macb.c | 8 ++++++++
> 1 file changed, 8 insertions(+)
>
> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
> index 740d04fd2223..caeb39561567 100644
> --- a/drivers/net/ethernet/cadence/macb.c
> +++ b/drivers/net/ethernet/cadence/macb.c
> @@ -2713,6 +2713,13 @@ static const struct macb_config pc302gem_config = {
> .init = macb_init,
> };
>
> +static const struct macb_config sama5d2_config = {
> + .caps = 0,
> + .dma_burst_length = 16,
> + .clk_init = macb_clk_init,
> + .init = macb_init,
> +};
> +
> static const struct macb_config sama5d3_config = {
> .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
> .dma_burst_length = 16,
> @@ -2756,6 +2763,7 @@ static const struct of_device_id macb_dt_ids[] = {
> { .compatible = "cdns,macb" },
> { .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
> { .compatible = "cdns,gem", .data = &pc302gem_config },
> + { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },

This compatible has to be documented

> { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
> { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
> { .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
> --
> 2.1.3
>

--
Alexandre Belloni, Free Electrons
Embedded Linux, Kernel and Android engineering
http://free-electrons.com

2015-06-18 14:23:55

by Nicolas Ferre

Subject: Re: [PATCH] net/macb: add config for Atmel sama5d2 SoCs

Le 18/06/2015 15:30, Alexandre Belloni a ?crit :
> On 18/06/2015 at 12:18:19 +0200, Nicolas Ferre wrote :
>> From: Cyrille Pitchen <[email protected]>
>>
>> Add the compatible string for Atmel sama5d2 SoC family as the configuration
>> options differ from other instances of the GEM.
>>
>> Signed-off-by: Cyrille Pitchen <[email protected]>
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> drivers/net/ethernet/cadence/macb.c | 8 ++++++++
>> 1 file changed, 8 insertions(+)
>>
>> diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c
>> index 740d04fd2223..caeb39561567 100644
>> --- a/drivers/net/ethernet/cadence/macb.c
>> +++ b/drivers/net/ethernet/cadence/macb.c
>> @@ -2713,6 +2713,13 @@ static const struct macb_config pc302gem_config = {
>> .init = macb_init,
>> };
>>
>> +static const struct macb_config sama5d2_config = {
>> + .caps = 0,
>> + .dma_burst_length = 16,
>> + .clk_init = macb_clk_init,
>> + .init = macb_init,
>> +};
>> +
>> static const struct macb_config sama5d3_config = {
>> .caps = MACB_CAPS_SG_DISABLED | MACB_CAPS_GIGABIT_MODE_AVAILABLE,
>> .dma_burst_length = 16,
>> @@ -2756,6 +2763,7 @@ static const struct of_device_id macb_dt_ids[] = {
>> { .compatible = "cdns,macb" },
>> { .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
>> { .compatible = "cdns,gem", .data = &pc302gem_config },
>> + { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
>
> This compatible has to be documented

Sure, I re-send a series right now (and add some documentation fixes).

Thanks, bye,

>
>> { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
>> { .compatible = "atmel,sama5d4-gem", .data = &sama5d4_config },
>> { .compatible = "cdns,at91rm9200-emac", .data = &emac_config },
>> --
>> 2.1.3
>>
>


--
Nicolas Ferre