* [PATCH 1/4] dt-bindings: arm: remove PMC bindings
2018-06-07 8:41 [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Alexandre Belloni
@ 2018-06-07 8:41 ` Alexandre Belloni
2018-06-12 21:53 ` Rob Herring
2018-06-07 8:41 ` [PATCH 2/4] dt-bindings: clk: at91: Document all the PMC compatibles Alexandre Belloni
` (3 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Alexandre Belloni @ 2018-06-07 8:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Rob Herring, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel, Alexandre Belloni
The PMC bindings are fully described in
Documentation/devicetree/bindings/clock/at91-clock.txt. Remove the
duplicate and incomplete documentation.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
.../devicetree/bindings/arm/atmel-pmc.txt | 14 --------------
1 file changed, 14 deletions(-)
delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt
diff --git a/Documentation/devicetree/bindings/arm/atmel-pmc.txt b/Documentation/devicetree/bindings/arm/atmel-pmc.txt
deleted file mode 100644
index 795cc78543fe..000000000000
--- a/Documentation/devicetree/bindings/arm/atmel-pmc.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-* Power Management Controller (PMC)
-
-Required properties:
-- compatible: Should be "atmel,<chip>-pmc".
- <chip> can be: at91rm9200, at91sam9260, at91sam9g45, at91sam9n12,
- at91sam9x5, sama5d3
-
-- reg: Should contain PMC registers location and length
-
-Examples:
- pmc: pmc@fffffc00 {
- compatible = "atmel,at91rm9200-pmc";
- reg = <0xfffffc00 0x100>;
- };
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 1/4] dt-bindings: arm: remove PMC bindings
2018-06-07 8:41 ` [PATCH 1/4] dt-bindings: arm: remove PMC bindings Alexandre Belloni
@ 2018-06-12 21:53 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2018-06-12 21:53 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Nicolas Ferre, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel
On Thu, Jun 07, 2018 at 10:41:04AM +0200, Alexandre Belloni wrote:
> The PMC bindings are fully described in
> Documentation/devicetree/bindings/clock/at91-clock.txt. Remove the
> duplicate and incomplete documentation.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> .../devicetree/bindings/arm/atmel-pmc.txt | 14 --------------
> 1 file changed, 14 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt
Acked-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 2/4] dt-bindings: clk: at91: Document all the PMC compatibles
2018-06-07 8:41 [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Alexandre Belloni
2018-06-07 8:41 ` [PATCH 1/4] dt-bindings: arm: remove PMC bindings Alexandre Belloni
@ 2018-06-07 8:41 ` Alexandre Belloni
2018-06-12 21:54 ` Rob Herring
2018-06-07 8:41 ` [PATCH 3/4] ARM: at91: fix USB clock detection handling Alexandre Belloni
` (2 subsequent siblings)
4 siblings, 1 reply; 8+ messages in thread
From: Alexandre Belloni @ 2018-06-07 8:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Rob Herring, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel, Alexandre Belloni
Add missing PMC compatibles to the list of available compatibles.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
Documentation/devicetree/bindings/clock/at91-clock.txt | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/Documentation/devicetree/bindings/clock/at91-clock.txt b/Documentation/devicetree/bindings/clock/at91-clock.txt
index 51c259a92d02..a1f591969538 100644
--- a/Documentation/devicetree/bindings/clock/at91-clock.txt
+++ b/Documentation/devicetree/bindings/clock/at91-clock.txt
@@ -17,14 +17,13 @@ Required properties:
"atmel,at91sam9x5-clk-slow-rc-osc":
at91 internal slow RC oscillator
- "atmel,at91rm9200-pmc" or
- "atmel,at91sam9g45-pmc" or
- "atmel,at91sam9n12-pmc" or
- "atmel,at91sam9x5-pmc" or
- "atmel,sama5d3-pmc":
+ "atmel,<chip>-pmc":
at91 PMC (Power Management Controller)
All at91 specific clocks (clocks defined below) must be child
node of the PMC node.
+ <chip> can be: at91rm9200, at91sam9260, at91sam9261,
+ at91sam9263, at91sam9g45, at91sam9n12, at91sam9rl, at91sam9x5,
+ sama5d2, sama5d3 or sama5d4.
"atmel,at91sam9x5-clk-slow" (under sckc node)
or
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 2/4] dt-bindings: clk: at91: Document all the PMC compatibles
2018-06-07 8:41 ` [PATCH 2/4] dt-bindings: clk: at91: Document all the PMC compatibles Alexandre Belloni
@ 2018-06-12 21:54 ` Rob Herring
0 siblings, 0 replies; 8+ messages in thread
From: Rob Herring @ 2018-06-12 21:54 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Nicolas Ferre, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel
On Thu, Jun 07, 2018 at 10:41:05AM +0200, Alexandre Belloni wrote:
> Add missing PMC compatibles to the list of available compatibles.
>
> Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
> ---
> Documentation/devicetree/bindings/clock/at91-clock.txt | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
Reviewed-by: Rob Herring <robh@kernel.org>
^ permalink raw reply [flat|nested] 8+ messages in thread
* [PATCH 3/4] ARM: at91: fix USB clock detection handling
2018-06-07 8:41 [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Alexandre Belloni
2018-06-07 8:41 ` [PATCH 1/4] dt-bindings: arm: remove PMC bindings Alexandre Belloni
2018-06-07 8:41 ` [PATCH 2/4] dt-bindings: clk: at91: Document all the PMC compatibles Alexandre Belloni
@ 2018-06-07 8:41 ` Alexandre Belloni
2018-06-07 8:41 ` [PATCH 4/4] ARM: dts: fix PMC compatible Alexandre Belloni
2018-06-12 10:24 ` [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Nicolas Ferre
4 siblings, 0 replies; 8+ messages in thread
From: Alexandre Belloni @ 2018-06-07 8:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Rob Herring, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel, Alexandre Belloni
Add more compatibles to be able to correct the USB clock detection.
at91sam9261 and at91sam9263 have the same PMC_SCSR layout as at91sam9260.
at91sam9rl doesn't have any USB clock.
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
arch/arm/mach-at91/pm.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/arch/arm/mach-at91/pm.c b/arch/arm/mach-at91/pm.c
index 849014c01cf4..563f34d01ce4 100644
--- a/arch/arm/mach-at91/pm.c
+++ b/arch/arm/mach-at91/pm.c
@@ -559,15 +559,20 @@ static const struct pmc_info pmc_infos[] __initconst = {
{ .uhp_udp_mask = AT91RM9200_PMC_UHP | AT91RM9200_PMC_UDP },
{ .uhp_udp_mask = AT91SAM926x_PMC_UHP | AT91SAM926x_PMC_UDP },
{ .uhp_udp_mask = AT91SAM926x_PMC_UHP },
+ { .uhp_udp_mask = 0 },
};
static const struct of_device_id atmel_pmc_ids[] __initconst = {
{ .compatible = "atmel,at91rm9200-pmc", .data = &pmc_infos[0] },
{ .compatible = "atmel,at91sam9260-pmc", .data = &pmc_infos[1] },
+ { .compatible = "atmel,at91sam9261-pmc", .data = &pmc_infos[1] },
+ { .compatible = "atmel,at91sam9263-pmc", .data = &pmc_infos[1] },
{ .compatible = "atmel,at91sam9g45-pmc", .data = &pmc_infos[2] },
{ .compatible = "atmel,at91sam9n12-pmc", .data = &pmc_infos[1] },
+ { .compatible = "atmel,at91sam9rl-pmc", .data = &pmc_infos[3] },
{ .compatible = "atmel,at91sam9x5-pmc", .data = &pmc_infos[1] },
{ .compatible = "atmel,sama5d3-pmc", .data = &pmc_infos[1] },
+ { .compatible = "atmel,sama5d4-pmc", .data = &pmc_infos[1] },
{ .compatible = "atmel,sama5d2-pmc", .data = &pmc_infos[1] },
{ /* sentinel */ },
};
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* [PATCH 4/4] ARM: dts: fix PMC compatible
2018-06-07 8:41 [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Alexandre Belloni
` (2 preceding siblings ...)
2018-06-07 8:41 ` [PATCH 3/4] ARM: at91: fix USB clock detection handling Alexandre Belloni
@ 2018-06-07 8:41 ` Alexandre Belloni
2018-06-12 10:24 ` [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Nicolas Ferre
4 siblings, 0 replies; 8+ messages in thread
From: Alexandre Belloni @ 2018-06-07 8:41 UTC (permalink / raw)
To: Nicolas Ferre
Cc: Rob Herring, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel, Alexandre Belloni
Make each SoC dtsi use its soc specific PMc compatible string. This solves
a potential issue on at91sam9261 and at91sam9263 when using suspend to RAM
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
---
arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
arch/arm/boot/dts/at91sam9rl.dtsi | 2 +-
arch/arm/boot/dts/sama5d4.dtsi | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/arch/arm/boot/dts/at91sam9261.dtsi b/arch/arm/boot/dts/at91sam9261.dtsi
index 53c63d0a418a..33f09d5ea020 100644
--- a/arch/arm/boot/dts/at91sam9261.dtsi
+++ b/arch/arm/boot/dts/at91sam9261.dtsi
@@ -590,7 +590,7 @@
};
pmc: pmc@fffffc00 {
- compatible = "atmel,at91rm9200-pmc", "syscon";
+ compatible = "atmel,at91sam9261-pmc", "syscon";
reg = <0xfffffc00 0x100>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/at91sam9263.dtsi b/arch/arm/boot/dts/at91sam9263.dtsi
index 87fb0660ab5d..af68a86c9973 100644
--- a/arch/arm/boot/dts/at91sam9263.dtsi
+++ b/arch/arm/boot/dts/at91sam9263.dtsi
@@ -93,7 +93,7 @@
};
pmc: pmc@fffffc00 {
- compatible = "atmel,at91rm9200-pmc", "syscon";
+ compatible = "atmel,at91sam9263-pmc", "syscon";
reg = <0xfffffc00 0x100>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/at91sam9rl.dtsi b/arch/arm/boot/dts/at91sam9rl.dtsi
index bd001cca25a4..8fb22030f00b 100644
--- a/arch/arm/boot/dts/at91sam9rl.dtsi
+++ b/arch/arm/boot/dts/at91sam9rl.dtsi
@@ -832,7 +832,7 @@
};
pmc: pmc@fffffc00 {
- compatible = "atmel,at91sam9g45-pmc", "syscon";
+ compatible = "atmel,at91sam9rl-pmc", "syscon";
reg = <0xfffffc00 0x100>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;
diff --git a/arch/arm/boot/dts/sama5d4.dtsi b/arch/arm/boot/dts/sama5d4.dtsi
index 0cf9beddd556..92a35a1942b6 100644
--- a/arch/arm/boot/dts/sama5d4.dtsi
+++ b/arch/arm/boot/dts/sama5d4.dtsi
@@ -392,7 +392,7 @@
};
pmc: pmc@f0018000 {
- compatible = "atmel,sama5d3-pmc", "syscon";
+ compatible = "atmel,sama5d4-pmc", "syscon";
reg = <0xf0018000 0x120>;
interrupts = <1 IRQ_TYPE_LEVEL_HIGH 7>;
interrupt-controller;
--
2.17.1
^ permalink raw reply related [flat|nested] 8+ messages in thread
* Re: [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263
2018-06-07 8:41 [PATCH 0/4] Fix suspend resume on at91sam9261 and at91sam9263 Alexandre Belloni
` (3 preceding siblings ...)
2018-06-07 8:41 ` [PATCH 4/4] ARM: dts: fix PMC compatible Alexandre Belloni
@ 2018-06-12 10:24 ` Nicolas Ferre
4 siblings, 0 replies; 8+ messages in thread
From: Nicolas Ferre @ 2018-06-12 10:24 UTC (permalink / raw)
To: Alexandre Belloni
Cc: Rob Herring, devicetree, linux-clk, Stephen Boyd, linux-kernel,
linux-arm-kernel
On 07/06/2018 at 10:41, Alexandre Belloni wrote:
> USB clock detection may not work properly on at91sam9261 and at91sam9263
> because they currently use the same bit mask as at91rm9200 instead of
> the one for at91sam9260.
>
> Take the opportunity to also change the PMC compatible strings for all
> the other SoCs in preparation for the new clock bindings.
>
> Alexandre Belloni (4):
> dt-bindings: arm: remove PMC bindings
> dt-bindings: clk: at91: Document all the PMC compatibles
> ARM: at91: fix USB clock detection handling
> ARM: dts: fix PMC compatible
To the whole series:
Acked-by: Nicolas Ferre <nicolas.ferre@microchip.com>
Thanks, best regards.
> .../devicetree/bindings/arm/atmel-pmc.txt | 14 --------------
> .../devicetree/bindings/clock/at91-clock.txt | 9 ++++-----
> arch/arm/boot/dts/at91sam9261.dtsi | 2 +-
> arch/arm/boot/dts/at91sam9263.dtsi | 2 +-
> arch/arm/boot/dts/at91sam9rl.dtsi | 2 +-
> arch/arm/boot/dts/sama5d4.dtsi | 2 +-
> arch/arm/mach-at91/pm.c | 5 +++++
> 7 files changed, 13 insertions(+), 23 deletions(-)
> delete mode 100644 Documentation/devicetree/bindings/arm/atmel-pmc.txt
>
--
Nicolas Ferre
^ permalink raw reply [flat|nested] 8+ messages in thread