Skip to contentSkip to conversation

pic64gx clk kconfig/binding changes

PATCH Applied Conor Dooley 2 participants 6 messages Jan 13 – Jan 16

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

v3 cover pic64gx clk kconfig/binding changes

From: Conor Dooley <[email protected]>

Mostly this is stuff that PH did last year, but rebased on top of current work, now that the clock driver rework patches have been applied.

v3: rebase on linus' tree

v2: fix the binding, d'oh

CC Conor Dooley <[email protected]>
CC Daire McNamara <[email protected]>
CC Michael Turquette <[email protected]>
CC Stephen Boyd <[email protected]>
CC Rob Herring <[email protected]>
CC Krzysztof Kozlowski <[email protected]>
CC Claudiu Beznea <[email protected]>

Conor Dooley (1):
clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE

Pierre-Henry Moussay (2):
dt-bindings: clock: mpfs-ccc: Add pic64gx compatibility
dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility

 .../bindings/clock/microchip,mpfs-ccc.yaml       |  6 +++++-
 .../bindings/clock/microchip,mpfs-clkcfg.yaml    | 16 +++++++++++++++-
 drivers/clk/microchip/Kconfig                    |  4 ++--
 3 files changed, 22 insertions(+), 4 deletions(-)
Signature · 1 line
2.51.0
#1 lore raw

PATCH v3 1/3 clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE

From: Conor Dooley <[email protected]>

This driver is used by non-polarfire devices now, and the ARCH_MICROCHIP symbol has been defined for some time on RISCV so drop it without any functional change.

---
 drivers/clk/microchip/Kconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/clk/microchip/Kconfig +2 -2
index 1b9e43eb5497..0c03b14699bf 100644
@@ -5,8 +5,8 @@ config COMMON_CLK_PIC32
 
 config MCHP_CLK_MPFS
 	bool "Clk driver for PolarFire SoC"
-	depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
-	default ARCH_MICROCHIP_POLARFIRE
+	depends on ARCH_MICROCHIP || COMPILE_TEST
+	default y
 	depends on MFD_SYSCON
 	select AUXILIARY_BUS
 	select REGMAP_MMIO
Signature · 1 line
2.51.0
#2 lore raw

PATCH v3 2/3 dt-bindings: clock: mpfs-ccc: Add pic64gx compatibility

In reply to Conor Dooley

From: Pierre-Henry Moussay <[email protected]>

pic64gx SoC Clock Conditioning Circuitry is compatibles with the Polarfire SoC

---
 .../devicetree/bindings/clock/microchip,mpfs-ccc.yaml       | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/microchip,mpfs-ccc.yaml +5 -1
index f1770360798f..9a6b50527c42 100644
@@ -17,7 +17,11 @@ description: |
 
 properties:
   compatible:
-    const: microchip,mpfs-ccc
+    oneOf:
+      - items:
+          - const: microchip,pic64gx-ccc
+          - const: microchip,mpfs-ccc
+      - const: microchip,mpfs-ccc
 
   reg:
     items:
Signature · 1 line
2.51.0
#3 lore raw

PATCH v3 3/3 dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility

In reply to Conor Dooley

From: Pierre-Henry Moussay <[email protected]>

pic64gx has a clock controller compatible with mpfs-clkcfg. Don't permit the deprecated configuration that was never supported for this SoC.

---
 .../bindings/clock/microchip,mpfs-clkcfg.yaml    | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)
Documentation/devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml +15 -1
index ee4f31596d97..a23703c281d1 100644
@@ -19,7 +19,11 @@ description: |
 
 properties:
   compatible:
-    const: microchip,mpfs-clkcfg
+    oneOf:
+      - items:
+          - const: microchip,pic64gx-clkcfg
+          - const: microchip,mpfs-clkcfg
+      - const: microchip,mpfs-clkcfg
 
   reg:
     oneOf:
@@ -69,6 +73,16 @@ required:
   - clocks
   - '#clock-cells'
 
+if:
+  properties:
+    compatible:
+      contains:
+        const: microchip,pic64gx-clkcfg
+then:
+  properties:
+    reg:
+      maxItems: 1
+
 additionalProperties: false
 
 examples:
Signature · 1 line
2.51.0
Acked-by Krzysztof Kozlowski Reviewed-by on v3 3/3
#4 lore raw

Re: [PATCH v3 3/3] dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility

Hi, Conor,

Quoted 7 lines · Conor Dooley

From: Pierre-Henry Moussay <[email protected]>

pic64gx has a clock controller compatible with mpfs-clkcfg. Don't permit the deprecated configuration that was never supported for this SoC.

From Checkpatch:

WARNING: Co-developed-by: must be immediately followed by Signed-off-by:

I moved the Co-developed-by: tag before you SoB.

Quoted 2 lines

Here.

Now, the full chain of trust is as follows:

Let me know you have anything against.

Quoted 1 line

Thank you,
Claudiu

#5 lore raw
In reply to Conor Dooley
Quoted 6 lines · Conor Dooley

Conor Dooley (1):
clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE

Pierre-Henry Moussay (2):
dt-bindings: clock: mpfs-ccc: Add pic64gx compatibility
dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility

Applied to clk-microchip, thanks!