pic64gx clk kconfig/binding changes
Subsystems (4)
v2 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.
v2: fix the binding, d'oh
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
PATCH v2 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
@@ -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 COMMON_CLK_DIVIDER_REGMAP
Signature · 1 line
2.51.0
Re: [PATCH v2 1/3] clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE
Quoted 16 lines · Conor Dooley
From: Conor Dooley <[email protected]>
This driver is used by non-polarfire devices now, and the
ARCH_MICROCHIPsymbol has been defined for some time on RISCV so drop it without any functional change.Signed-off-by Conor Dooley <[email protected]>--- drivers/clk/microchip/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/microchip/Kconfig +0
-0
drivers/clk/microchip/Kconfig config COMMON_CLK_PIC32 · line 12
Quoted 10 lines
drivers/clk/microchip/Kconfig +2
-2@@ -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 COMMON_CLK_DIVIDER_REGMAP
OK, I found v2 in my inbox. Same symptom here. It doesn't apply on top of the current at91-next either.
Thank you,
Claudiu
Re: [PATCH v2 1/3] clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE
Quoted 20 lines · Claudiu Beznea
Quoted 17 lines · Conor Dooley
From: Conor Dooley <[email protected]>
This driver is used by non-polarfire devices now, and the
ARCH_MICROCHIPsymbol has been defined for some time on RISCV so drop it without any functional change.Signed-off-by Conor Dooley <[email protected]>--- drivers/clk/microchip/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/microchip/Kconfig +0
-0@@ -5,8 +5,8 @@ config COMMON_CLK_PIC32
Quoted 12 lines
drivers/clk/microchip/Kconfig config COMMON_CLK_PIC32 · line 12
Quoted 9 lines
drivers/clk/microchip/Kconfig +2
-2config 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 COMMON_CLK_DIVIDER_REGMAPOK, I found v2 in my inbox. Same symptom here. It doesn't apply on top of the current at91-next either.
I think this should sort itself out after -rc1, but I'll resend if it doesn't.
Re: [PATCH v2 1/3] clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE
Quoted 34 lines · Conor Dooley
Quoted 20 lines · Claudiu Beznea
Quoted 17 lines · Conor Dooley
From: Conor Dooley <[email protected]>
This driver is used by non-polarfire devices now, and the
ARCH_MICROCHIPsymbol has been defined for some time on RISCV so drop it without any functional change.Signed-off-by Conor Dooley <[email protected]>--- drivers/clk/microchip/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/microchip/Kconfig +0
-0@@ -5,8 +5,8 @@ config COMMON_CLK_PIC32Quoted 12 lines
drivers/clk/microchip/Kconfig config COMMON_CLK_PIC32 · line 12
Quoted 9 lines
drivers/clk/microchip/Kconfig +2
-2config 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 COMMON_CLK_DIVIDER_REGMAPOK, I found v2 in my inbox. Same symptom here. It doesn't apply on top of the current at91-next either.
Quoted 2 lines
I think this should sort itself out after -rc1, but I'll resend if it doesn't.
Still doesn't apply. It conflicts at least with
commit c6f2dddfa7f9 ("clk: microchip: mpfs: use regmap for clocks")
Thank you,
Claudiu
Re: [PATCH v2 1/3] clk: microchip: drop POLARFIRE from ARCH_MICROCHIP_POLARFIRE
Quoted 36 lines · claudiu beznea
Quoted 33 lines · Conor Dooley
Quoted 31 lines · Claudiu Beznea
Quoted 16 lines · Conor Dooley
From: Conor Dooley <[email protected]>
This driver is used by non-polarfire devices now, and the
ARCH_MICROCHIPsymbol has been defined for some time on RISCV so drop it without any functional change.Signed-off-by Conor Dooley <[email protected]>--- drivers/clk/microchip/Kconfig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)drivers/clk/microchip/Kconfig +0
-0drivers/clk/microchip/Kconfig config COMMON_CLK_PIC32 · line 11
Quoted 9 lines
drivers/clk/microchip/Kconfig +2
-2@@ -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 COMMON_CLK_DIVIDER_REGMAPOK, I found v2 in my inbox. Same symptom here. It doesn't apply on top of the current at91-next either.
Quoted 5 lines
Quoted 2 lines
I think this should sort itself out after -rc1, but I'll resend if it doesn't.
Still doesn't apply. It conflicts at least with
commitc6f2dddfa7f9("clk: microchip: mpfs: use regmap for clocks")
Right, I'll resend. Thought it was based on the aforementioned patch tbh!
PATCH v2 2/3 dt-bindings: clock: mpfs-ccc: Add pic64gx compatibility
In reply to Conor DooleyFrom: 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
@@ -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
Re: [PATCH v2 2/3] dt-bindings: clock: mpfs-ccc: Add pic64gx compatibility
Quoted 8 lines · Conor Dooley
From: Pierre-Henry Moussay <[email protected]>
pic64gx SoC Clock Conditioning Circuitry is compatibles with the Polarfire SoC
Signed-off-by Pierre-Henry Moussay <[email protected]>Acked-by Conor Dooley <[email protected]>Signed-off-by Conor Dooley <[email protected]>
Quoted 21 lines
--- .../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@@ -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:
PATCH v2 3/3 dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility
In reply to Conor DooleyFrom: 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
@@ -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
Re: [PATCH v2 3/3] dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility
Quoted 11 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.
Signed-off-by Pierre-Henry Moussay <[email protected]>Co-developed-by Conor Dooley <[email protected]>Signed-off-by Conor Dooley <[email protected]>--- .../bindings/clock/microchip,mpfs-clkcfg.yaml | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-)
Best regards,
Krzysztof
Re: [PATCH v2 3/3] dt-bindings: clock: mpfs-clkcfg: Add pic64gx compatibility
In reply to Conor DooleyQuoted 8 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.
Signed-off-by Pierre-Henry Moussay <[email protected]>Co-developed-by Conor Dooley <[email protected]>Signed-off-by Conor Dooley <[email protected]>