Hi,
This serries collects some little modifications to DT bindings and associated
drivers changes for supporting the upcoming SAM9X60 SoC.
I took the advantage of this series for fixing some of the leftovers in DT
bindings for reset controller and Ethernet macb.
These changes touch several sub-systems but I would like that these (mostly
trivial) patches stay together for facilitating reviews, prevent breaking
dependencies and facilitating the tracking of acceptance status. However, tell
me if you think otherwise.
My intentions are that the series would enter Mainline through arm-soc tree:
sounds okay to everyone? If okay, I'm ready to collect Ack tags...
For the first batch, I send the whole series to everyone. I'll try my best to
reduce subsequent message deliveries if one part of the serries needs rework.
Best regards,
Nicolas
Nicolas Ferre (8):
dt-bindings: arm: atmel: add missing samx7 to reset controller
dt-bindings: arm: atmel: add new sam9x60 reset controller binding
dt-bindings: arm: atmel: add new sam9x60 SFR binding
net/macb: bindings doc/trivial: fix documentation for sama5d3 10/100
interface
net/macb: bindings doc: add sam9x60 binding
power: reset: at91-reset: add support for sam9x60 SoC
USB: host: ohci-at91: add sam9x60-sfr definition for ohci
net: macb: add sam9x60-macb compatibility string
.../devicetree/bindings/arm/atmel-sysregs.txt | 4 +++-
Documentation/devicetree/bindings/net/macb.txt | 4 ++--
drivers/net/ethernet/cadence/macb_main.c | 1 +
drivers/power/reset/at91-reset.c | 13 +++++++++++++
drivers/usb/host/ohci-at91.c | 7 +++++--
5 files changed, 24 insertions(+), 5 deletions(-)
--
2.17.1
This removes a line left while adding the correct compatibility string for
sama5d3 10/100 interface. Now use the "atmel,sama5d3-macb" string.
Signed-off-by: Nicolas Ferre <[email protected]>
---
Documentation/devicetree/bindings/net/macb.txt | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index 3e17ac1d5d58..f5c414b10e27 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -3,8 +3,7 @@
Required properties:
- compatible: Should be "cdns,[<chip>-]{macb|gem}"
Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
- Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
- available on sama5d3 SoCs.
+ Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
Use "cdns,np4-macb" for NP4 SoC devices.
Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
--
2.17.1
Add support for additional reset causes and the proper compatibility
string for sam9x60 SoC. The restart function is the same as the samx7.
Signed-off-by: Nicolas Ferre <[email protected]>
---
drivers/power/reset/at91-reset.c | 13 +++++++++++++
1 file changed, 13 insertions(+)
diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
index f44a9ffcc2ab..44ca983a49a1 100644
--- a/drivers/power/reset/at91-reset.c
+++ b/drivers/power/reset/at91-reset.c
@@ -44,6 +44,9 @@ enum reset_type {
RESET_TYPE_WATCHDOG = 2,
RESET_TYPE_SOFTWARE = 3,
RESET_TYPE_USER = 4,
+ RESET_TYPE_CPU_FAIL = 6,
+ RESET_TYPE_XTAL_FAIL = 7,
+ RESET_TYPE_ULP2 = 8,
};
static void __iomem *at91_ramc_base[2], *at91_rstc_base;
@@ -164,6 +167,15 @@ static void __init at91_reset_status(struct platform_device *pdev)
case RESET_TYPE_USER:
reason = "user reset";
break;
+ case RESET_TYPE_CPU_FAIL:
+ reason = "CPU clock failure detection";
+ break;
+ case RESET_TYPE_XTAL_FAIL:
+ reason = "32.768 kHz crystal failure detection";
+ break;
+ case RESET_TYPE_ULP2:
+ reason = "ULP2 reset";
+ break;
default:
reason = "unknown reset";
break;
@@ -183,6 +195,7 @@ static const struct of_device_id at91_reset_of_match[] = {
{ .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
{ .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart },
{ .compatible = "atmel,samx7-rstc", .data = samx7_restart },
+ { .compatible = "microchip,sam9x60-rstc", .data = samx7_restart },
{ /* sentinel */ }
};
MODULE_DEVICE_TABLE(of, at91_reset_of_match);
--
2.17.1
Add this SFR compatible definition for the sam9x60 SoC and manage
its use in ohci-at91.c driver.
Signed-off-by: Nicolas Ferre <[email protected]>
---
drivers/usb/host/ohci-at91.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/ohci-at91.c b/drivers/usb/host/ohci-at91.c
index ec6739ef3129..fc35a7993b7b 100644
--- a/drivers/usb/host/ohci-at91.c
+++ b/drivers/usb/host/ohci-at91.c
@@ -141,8 +141,11 @@ static struct regmap *at91_dt_syscon_sfr(void)
struct regmap *regmap;
regmap = syscon_regmap_lookup_by_compatible("atmel,sama5d2-sfr");
- if (IS_ERR(regmap))
- regmap = NULL;
+ if (IS_ERR(regmap)) {
+ regmap = syscon_regmap_lookup_by_compatible("microchip,sam9x60-sfr");
+ if (IS_ERR(regmap))
+ regmap = NULL;
+ }
return regmap;
}
--
2.17.1
Add a new compatibility string for this product. It's using
at91sam9260-macb layout but has a newer hardware revision: it's safer
to use its own string.
Signed-off-by: Nicolas Ferre <[email protected]>
---
drivers/net/ethernet/cadence/macb_main.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
index 66cc7927061a..a0889ef107a1 100644
--- a/drivers/net/ethernet/cadence/macb_main.c
+++ b/drivers/net/ethernet/cadence/macb_main.c
@@ -3941,6 +3941,7 @@ static const struct of_device_id macb_dt_ids[] = {
{ .compatible = "cdns,np4-macb", .data = &np4_config },
{ .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
{ .compatible = "cdns,gem", .data = &pc302gem_config },
+ { .compatible = "cdns,sam9x60-macb", .data = &at91sam9260_config },
{ .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
{ .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
{ .compatible = "atmel,sama5d3-macb", .data = &sama5d3macb_config },
--
2.17.1
Add this SFR compatible definition for the sam9x60 SoC. Will be needed
in OHCI driver: ohci-at91.c.
Signed-off-by: Nicolas Ferre <[email protected]>
---
Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index badce6ef3ab3..dfc91bc02b97 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -148,6 +148,7 @@ required properties:
- compatible: Should be "atmel,<chip>-sfr", "syscon" or
"atmel,<chip>-sfrbu", "syscon"
<chip> can be "sama5d3", "sama5d4" or "sama5d2".
+ it also can be "microchip,sam9x60-sfr", "syscon".
- reg: Should contain registers location and length
sfr@f0038000 {
--
2.17.1
Update the Reset Controller's binding to add new SoC compatibility string.
Signed-off-by: Nicolas Ferre <[email protected]>
---
Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 36952cc39993..badce6ef3ab3 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -22,6 +22,7 @@ Its subnodes can be:
RSTC Reset Controller required properties:
- compatible: Should be "atmel,<chip>-rstc".
<chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"
+ it also can be "microchip,sam9x60-rstc"
- reg: Should contain registers location and length
- clocks: phandle to input clock.
--
2.17.1
Add the compatibility sting documentation for sam9x60 10/100 interface.
Signed-off-by: Nicolas Ferre <[email protected]>
---
Documentation/devicetree/bindings/net/macb.txt | 1 +
1 file changed, 1 insertion(+)
diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
index f5c414b10e27..174f292d8a3e 100644
--- a/Documentation/devicetree/bindings/net/macb.txt
+++ b/Documentation/devicetree/bindings/net/macb.txt
@@ -4,6 +4,7 @@ Required properties:
- compatible: Should be "cdns,[<chip>-]{macb|gem}"
Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
+ Use "cdns,sam9x60-macb" for Microchip sam9x60 SoC.
Use "cdns,np4-macb" for NP4 SoC devices.
Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
--
2.17.1
Add this missing compatibility string to the Reset Controller
compatible string chip list.
Signed-off-by: Nicolas Ferre <[email protected]>
---
Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
index 14f319f694b7..36952cc39993 100644
--- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
+++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
@@ -21,7 +21,7 @@ Its subnodes can be:
RSTC Reset Controller required properties:
- compatible: Should be "atmel,<chip>-rstc".
- <chip> can be "at91sam9260" or "at91sam9g45" or "sama5d3"
+ <chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"
- reg: Should contain registers location and length
- clocks: phandle to input clock.
--
2.17.1
On Wed, 16 Jan 2019 10:57:37 +0100, Nicolas Ferre wrote:
> Add this missing compatibility string to the Reset Controller
> compatible string chip list.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
Reviewed-by: Rob Herring <[email protected]>
On Wed, Jan 16, 2019 at 10:57:38AM +0100, Nicolas Ferre wrote:
> Update the Reset Controller's binding to add new SoC compatibility string.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> index 36952cc39993..badce6ef3ab3 100644
> --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> @@ -22,6 +22,7 @@ Its subnodes can be:
> RSTC Reset Controller required properties:
> - compatible: Should be "atmel,<chip>-rstc".
> <chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"
> + it also can be "microchip,sam9x60-rstc"
How is this related to at91sam9260-rstc?
The 'x' is a wildcard? We generally avoid wildcards.
> - reg: Should contain registers location and length
> - clocks: phandle to input clock.
>
> --
> 2.17.1
>
On Wed, Jan 16, 2019 at 10:57:40AM +0100, Nicolas Ferre wrote:
> This removes a line left while adding the correct compatibility string for
> sama5d3 10/100 interface. Now use the "atmel,sama5d3-macb" string.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> Documentation/devicetree/bindings/net/macb.txt | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
> index 3e17ac1d5d58..f5c414b10e27 100644
> --- a/Documentation/devicetree/bindings/net/macb.txt
> +++ b/Documentation/devicetree/bindings/net/macb.txt
> @@ -3,8 +3,7 @@
> Required properties:
> - compatible: Should be "cdns,[<chip>-]{macb|gem}"
> Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
> - Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
> - available on sama5d3 SoCs.
> + Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
Where is "atmel,sama5d3-macb"?
> Use "cdns,np4-macb" for NP4 SoC devices.
> Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
> Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
> --
> 2.17.1
>
Hi Rob,
On 22/01/2019 at 02:07, Rob Herring wrote:
> On Wed, Jan 16, 2019 at 10:57:38AM +0100, Nicolas Ferre wrote:
>> Update the Reset Controller's binding to add new SoC compatibility string.
>>
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 +
>> 1 file changed, 1 insertion(+)
>>
>> diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
>> index 36952cc39993..badce6ef3ab3 100644
>> --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
>> +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
>> @@ -22,6 +22,7 @@ Its subnodes can be:
>> RSTC Reset Controller required properties:
>> - compatible: Should be "atmel,<chip>-rstc".
>> <chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"
>> + it also can be "microchip,sam9x60-rstc"
>
> How is this related to at91sam9260-rstc?
at91sam9260 and sam9x60 are completely different products (they share
the same core though...). I know the naming could be misleading but it
is like it is...
> The 'x' is a wildcard? We generally avoid wildcards.
Here, the 'x' is definitively not a wildcard nor a kind of "family"
name, it's included in the (upcoming) single product's name.
I hope it clarifies.
Best regards,
Nicolas
>> - reg: Should contain registers location and length
>> - clocks: phandle to input clock.
>>
>> --
>> 2.17.1
>>
>
--
Nicolas Ferre
Hi Rob,
On 22/01/2019 at 02:10, Rob Herring wrote:
> On Wed, Jan 16, 2019 at 10:57:40AM +0100, Nicolas Ferre wrote:
>> This removes a line left while adding the correct compatibility string for
>> sama5d3 10/100 interface. Now use the "atmel,sama5d3-macb" string.
>>
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> Documentation/devicetree/bindings/net/macb.txt | 3 +--
>> 1 file changed, 1 insertion(+), 2 deletions(-)
>>
>> diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
>> index 3e17ac1d5d58..f5c414b10e27 100644
>> --- a/Documentation/devicetree/bindings/net/macb.txt
>> +++ b/Documentation/devicetree/bindings/net/macb.txt
>> @@ -3,8 +3,7 @@
>> Required properties:
>> - compatible: Should be "cdns,[<chip>-]{macb|gem}"
>> Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
>> - Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
>> - available on sama5d3 SoCs.
>> + Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
>
> Where is "atmel,sama5d3-macb"?
It's actually a couple of line below: line 13 of the resulting macb.txt
file. It was already in the file when I removed the leftovers.
Do you advice to try to better sort entries in this file? Is there a
common pattern?
Best regards,
Nicolas
>> Use "cdns,np4-macb" for NP4 SoC devices.
>> Use "cdns,at32ap7000-macb" for other 10/100 usage or use the generic form: "cdns,macb".
>> Use "cdns,pc302-gem" for Picochip picoXcell pc302 and later devices based on
>> --
>> 2.17.1
>>
>
--
Nicolas Ferre
On Tue, Jan 22, 2019 at 3:00 AM <[email protected]> wrote:
>
> Hi Rob,
>
> On 22/01/2019 at 02:07, Rob Herring wrote:
> > On Wed, Jan 16, 2019 at 10:57:38AM +0100, Nicolas Ferre wrote:
> >> Update the Reset Controller's binding to add new SoC compatibility string.
> >>
> >> Signed-off-by: Nicolas Ferre <[email protected]>
> >> ---
> >> Documentation/devicetree/bindings/arm/atmel-sysregs.txt | 1 +
> >> 1 file changed, 1 insertion(+)
> >>
> >> diff --git a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> >> index 36952cc39993..badce6ef3ab3 100644
> >> --- a/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> >> +++ b/Documentation/devicetree/bindings/arm/atmel-sysregs.txt
> >> @@ -22,6 +22,7 @@ Its subnodes can be:
> >> RSTC Reset Controller required properties:
> >> - compatible: Should be "atmel,<chip>-rstc".
> >> <chip> can be "at91sam9260", "at91sam9g45", "sama5d3" or "samx7"
> >> + it also can be "microchip,sam9x60-rstc"
> >
> > How is this related to at91sam9260-rstc?
>
> at91sam9260 and sam9x60 are completely different products (they share
> the same core though...). I know the naming could be misleading but it
> is like it is...
>
> > The 'x' is a wildcard? We generally avoid wildcards.
>
> Here, the 'x' is definitively not a wildcard nor a kind of "family"
> name, it's included in the (upcoming) single product's name.
>
> I hope it clarifies.
Yes, thanks.
Reviewed-by: Rob Herring <[email protected]>
On Tue, Jan 22, 2019 at 3:09 AM <[email protected]> wrote:
>
> Hi Rob,
>
> On 22/01/2019 at 02:10, Rob Herring wrote:
> > On Wed, Jan 16, 2019 at 10:57:40AM +0100, Nicolas Ferre wrote:
> >> This removes a line left while adding the correct compatibility string for
> >> sama5d3 10/100 interface. Now use the "atmel,sama5d3-macb" string.
> >>
> >> Signed-off-by: Nicolas Ferre <[email protected]>
> >> ---
> >> Documentation/devicetree/bindings/net/macb.txt | 3 +--
> >> 1 file changed, 1 insertion(+), 2 deletions(-)
> >>
> >> diff --git a/Documentation/devicetree/bindings/net/macb.txt b/Documentation/devicetree/bindings/net/macb.txt
> >> index 3e17ac1d5d58..f5c414b10e27 100644
> >> --- a/Documentation/devicetree/bindings/net/macb.txt
> >> +++ b/Documentation/devicetree/bindings/net/macb.txt
> >> @@ -3,8 +3,7 @@
> >> Required properties:
> >> - compatible: Should be "cdns,[<chip>-]{macb|gem}"
> >> Use "cdns,at91rm9200-emac" Atmel at91rm9200 SoC.
> >> - Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs or the 10/100Mbit IP
> >> - available on sama5d3 SoCs.
> >> + Use "cdns,at91sam9260-macb" for Atmel at91sam9 SoCs.
> >
> > Where is "atmel,sama5d3-macb"?
>
> It's actually a couple of line below: line 13 of the resulting macb.txt
> file. It was already in the file when I removed the leftovers.
>
> Do you advice to try to better sort entries in this file? Is there a
> common pattern?
Okay, it's fine.
Reviewed-by: Rob Herring <[email protected]>
Hi,
On Wed, Jan 16, 2019 at 10:57:42AM +0100, Nicolas Ferre wrote:
> Add support for additional reset causes and the proper compatibility
> string for sam9x60 SoC. The restart function is the same as the samx7.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
> ---
> drivers/power/reset/at91-reset.c | 13 +++++++++++++
> 1 file changed, 13 insertions(+)
>
> diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
> index f44a9ffcc2ab..44ca983a49a1 100644
> --- a/drivers/power/reset/at91-reset.c
> +++ b/drivers/power/reset/at91-reset.c
> @@ -44,6 +44,9 @@ enum reset_type {
> RESET_TYPE_WATCHDOG = 2,
> RESET_TYPE_SOFTWARE = 3,
> RESET_TYPE_USER = 4,
> + RESET_TYPE_CPU_FAIL = 6,
> + RESET_TYPE_XTAL_FAIL = 7,
> + RESET_TYPE_ULP2 = 8,
what happened to 5? :)
> };
>
> static void __iomem *at91_ramc_base[2], *at91_rstc_base;
> @@ -164,6 +167,15 @@ static void __init at91_reset_status(struct platform_device *pdev)
> case RESET_TYPE_USER:
> reason = "user reset";
> break;
> + case RESET_TYPE_CPU_FAIL:
> + reason = "CPU clock failure detection";
> + break;
> + case RESET_TYPE_XTAL_FAIL:
> + reason = "32.768 kHz crystal failure detection";
> + break;
> + case RESET_TYPE_ULP2:
> + reason = "ULP2 reset";
> + break;
> default:
> reason = "unknown reset";
> break;
> @@ -183,6 +195,7 @@ static const struct of_device_id at91_reset_of_match[] = {
> { .compatible = "atmel,at91sam9g45-rstc", .data = at91sam9g45_restart },
> { .compatible = "atmel,sama5d3-rstc", .data = sama5d3_restart },
> { .compatible = "atmel,samx7-rstc", .data = samx7_restart },
> + { .compatible = "microchip,sam9x60-rstc", .data = samx7_restart },
> { /* sentinel */ }
> };
> MODULE_DEVICE_TABLE(of, at91_reset_of_match);
Patch looks fine to me. But I will wait a bit with merging, so that
Alexandre or Ludovic have a chance to provide feedback.
-- Sebastian
Hi Sebastian,
On 23/01/2019 at 19:34, Sebastian Reichel wrote:
> Hi,
>
> On Wed, Jan 16, 2019 at 10:57:42AM +0100, Nicolas Ferre wrote:
>> Add support for additional reset causes and the proper compatibility
>> string for sam9x60 SoC. The restart function is the same as the samx7.
>>
>> Signed-off-by: Nicolas Ferre <[email protected]>
>> ---
>> drivers/power/reset/at91-reset.c | 13 +++++++++++++
>> 1 file changed, 13 insertions(+)
>>
>> diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
>> index f44a9ffcc2ab..44ca983a49a1 100644
>> --- a/drivers/power/reset/at91-reset.c
>> +++ b/drivers/power/reset/at91-reset.c
>> @@ -44,6 +44,9 @@ enum reset_type {
>> RESET_TYPE_WATCHDOG = 2,
>> RESET_TYPE_SOFTWARE = 3,
>> RESET_TYPE_USER = 4,
>> + RESET_TYPE_CPU_FAIL = 6,
>> + RESET_TYPE_XTAL_FAIL = 7,
>> + RESET_TYPE_ULP2 = 8,
>
> what happened to 5? :)
That a good question ;-)
It's marked as "Reserved"... which opens up a whole new field of
speculation :-)
[..]
>> { .compatible = "atmel,samx7-rstc", .data = samx7_restart },
>> + { .compatible = "microchip,sam9x60-rstc", .data = samx7_restart },
>> { /* sentinel */ }
>> };
>> MODULE_DEVICE_TABLE(of, at91_reset_of_match);
>
> Patch looks fine to me. But I will wait a bit with merging, so that
> Alexandre or Ludovic have a chance to provide feedback.
What about merging this patch with the whole series through the at91
then arm-soc trees?
Best regards,
--
Nicolas Ferre
Hi,
On Thu, Jan 24, 2019 at 10:34:50AM +0000, [email protected] wrote:
> Hi Sebastian,
>
> On 23/01/2019 at 19:34, Sebastian Reichel wrote:
> > Hi,
> >
> > On Wed, Jan 16, 2019 at 10:57:42AM +0100, Nicolas Ferre wrote:
> >> Add support for additional reset causes and the proper compatibility
> >> string for sam9x60 SoC. The restart function is the same as the samx7.
> >>
> >> Signed-off-by: Nicolas Ferre <[email protected]>
> >> ---
> >> drivers/power/reset/at91-reset.c | 13 +++++++++++++
> >> 1 file changed, 13 insertions(+)
> >>
> >> diff --git a/drivers/power/reset/at91-reset.c b/drivers/power/reset/at91-reset.c
> >> index f44a9ffcc2ab..44ca983a49a1 100644
> >> --- a/drivers/power/reset/at91-reset.c
> >> +++ b/drivers/power/reset/at91-reset.c
> >> @@ -44,6 +44,9 @@ enum reset_type {
> >> RESET_TYPE_WATCHDOG = 2,
> >> RESET_TYPE_SOFTWARE = 3,
> >> RESET_TYPE_USER = 4,
> >> + RESET_TYPE_CPU_FAIL = 6,
> >> + RESET_TYPE_XTAL_FAIL = 7,
> >> + RESET_TYPE_ULP2 = 8,
> >
> > what happened to 5? :)
>
> That a good question ;-)
>
> It's marked as "Reserved"... which opens up a whole new field of
> speculation :-)
Ok :)
> [..]
>
> >> { .compatible = "atmel,samx7-rstc", .data = samx7_restart },
> >> + { .compatible = "microchip,sam9x60-rstc", .data = samx7_restart },
> >> { /* sentinel */ }
> >> };
> >> MODULE_DEVICE_TABLE(of, at91_reset_of_match);
> >
> > Patch looks fine to me. But I will wait a bit with merging, so that
> > Alexandre or Ludovic have a chance to provide feedback.
>
> What about merging this patch with the whole series through the at91
> then arm-soc trees?
It seems to be possible to merge this standalone, but merging
through at91/arm-soc is also fine with me.
Acked-by: Sebastian Reichel <[email protected]>
-- Sebastian
Hi David,
On 16/01/2019 at 10:57, Nicolas Ferre wrote:
> Add a new compatibility string for this product. It's using
> at91sam9260-macb layout but has a newer hardware revision: it's safer
> to use its own string.
>
> Signed-off-by: Nicolas Ferre <[email protected]>
I'm thinking of pushing this patch with the others of the series through
arm-soc tree. Can I have your "Acked-by" tag then?
Best regards,
Nicolas
> ---
> drivers/net/ethernet/cadence/macb_main.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/ethernet/cadence/macb_main.c b/drivers/net/ethernet/cadence/macb_main.c
> index 66cc7927061a..a0889ef107a1 100644
> --- a/drivers/net/ethernet/cadence/macb_main.c
> +++ b/drivers/net/ethernet/cadence/macb_main.c
> @@ -3941,6 +3941,7 @@ static const struct of_device_id macb_dt_ids[] = {
> { .compatible = "cdns,np4-macb", .data = &np4_config },
> { .compatible = "cdns,pc302-gem", .data = &pc302gem_config },
> { .compatible = "cdns,gem", .data = &pc302gem_config },
> + { .compatible = "cdns,sam9x60-macb", .data = &at91sam9260_config },
> { .compatible = "atmel,sama5d2-gem", .data = &sama5d2_config },
> { .compatible = "atmel,sama5d3-gem", .data = &sama5d3_config },
> { .compatible = "atmel,sama5d3-macb", .data = &sama5d3macb_config },
>
--
Nicolas Ferre
All,
On 16/01/2019 at 10:57, Nicolas Ferre wrote:
> Hi,
>
> This series collects some little modifications to DT bindings and associated
> drivers changes for supporting the upcoming SAM9X60 SoC.
>
> I took the advantage of this series for fixing some of the leftovers in DT
> bindings for reset controller and Ethernet macb.
>
> These changes touch several sub-systems but I would like that these (mostly
> trivial) patches stay together for facilitating reviews, prevent breaking
> dependencies and facilitating the tracking of acceptance status. However, tell
> me if you think otherwise.
It seems it's not the preferred way to go and that I must split and send
to sub-system Maintainers so that bindings and driver code go together
through Maintainer's git trees (USB, power/reset, netdev).
> My intentions are that the series would enter Mainline through arm-soc tree:
> sounds okay to everyone? If okay, I'm ready to collect Ack tags...
I'm re-sending this split series. Some of the "Reviewed-by:" are missing
so we'll have the chance to add them on individual series.
Thanks for your reviews so far.
Best regards,
Nicolas
> For the first batch, I send the whole series to everyone. I'll try my best to
> reduce subsequent message deliveries if one part of the serries needs rework.
>
> Best regards,
> Nicolas
>
>
> Nicolas Ferre (8):
> dt-bindings: arm: atmel: add missing samx7 to reset controller
> dt-bindings: arm: atmel: add new sam9x60 reset controller binding
> dt-bindings: arm: atmel: add new sam9x60 SFR binding
> net/macb: bindings doc/trivial: fix documentation for sama5d3 10/100
> interface
> net/macb: bindings doc: add sam9x60 binding
> power: reset: at91-reset: add support for sam9x60 SoC
> USB: host: ohci-at91: add sam9x60-sfr definition for ohci
> net: macb: add sam9x60-macb compatibility string
>
> .../devicetree/bindings/arm/atmel-sysregs.txt | 4 +++-
> Documentation/devicetree/bindings/net/macb.txt | 4 ++--
> drivers/net/ethernet/cadence/macb_main.c | 1 +
> drivers/power/reset/at91-reset.c | 13 +++++++++++++
> drivers/usb/host/ohci-at91.c | 7 +++++--
> 5 files changed, 24 insertions(+), 5 deletions(-)
>
--
Nicolas Ferre