Skip to content

Commit b5b9e93

Browse files
committed
Merge tag 'clk-microchip-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into clk-microchip
Pull Microchip clk driver updates from Claudiu Beznea: - PolarFire SoC clock driver updates to use regmaps instead of iomem addresses; with it, the reset control driver support for non-auxiliary bus probing was included as it now depends on the regmap registered by the clock controller driver - A cleanup patch for the LAN966X clk driver * tag 'clk-microchip-6.19' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux: reset: mpfs: add non-auxiliary bus probing clk: lan966x: remove unused dt-bindings include clk: microchip: mpfs: use regmap for clocks dt-bindings: clk: microchip: mpfs: remove first reg region
2 parents 3a86608 + 781f60e commit b5b9e93

7 files changed

Lines changed: 266 additions & 96 deletions

File tree

Documentation/devicetree/bindings/clock/microchip,mpfs-clkcfg.yaml

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,16 +22,23 @@ properties:
2222
const: microchip,mpfs-clkcfg
2323

2424
reg:
25-
items:
26-
- description: |
27-
clock config registers:
28-
These registers contain enable, reset & divider tables for the, cpu,
29-
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
30-
for the peripheral clocks.
31-
- description: |
32-
mss pll dri registers:
33-
Block of registers responsible for dynamic reconfiguration of the mss
34-
pll
25+
oneOf:
26+
- items:
27+
- description: |
28+
clock config registers:
29+
These registers contain enable, reset & divider tables for the, cpu,
30+
axi, ahb and rtc/mtimer reference clocks as well as enable and reset
31+
for the peripheral clocks.
32+
- description: |
33+
mss pll dri registers:
34+
Block of registers responsible for dynamic reconfiguration of the mss
35+
pll
36+
deprecated: true
37+
- items:
38+
- description: |
39+
mss pll dri registers:
40+
Block of registers responsible for dynamic reconfiguration of the mss
41+
pll
3542
3643
clocks:
3744
maxItems: 1
@@ -69,11 +76,12 @@ examples:
6976
- |
7077
#include <dt-bindings/clock/microchip,mpfs-clock.h>
7178
soc {
72-
#address-cells = <2>;
73-
#size-cells = <2>;
74-
clkcfg: clock-controller@20002000 {
79+
#address-cells = <1>;
80+
#size-cells = <1>;
81+
82+
clkcfg: clock-controller@3E001000 {
7583
compatible = "microchip,mpfs-clkcfg";
76-
reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
84+
reg = <0x3E001000 0x1000>;
7785
clocks = <&ref>;
7886
#clock-cells = <1>;
7987
};

drivers/clk/clk-lan966x.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,6 @@
1616
#include <linux/platform_device.h>
1717
#include <linux/slab.h>
1818

19-
#include <dt-bindings/clock/microchip,lan966x.h>
20-
2119
#define GCK_ENA BIT(0)
2220
#define GCK_SRC_SEL GENMASK(9, 8)
2321
#define GCK_PRESCALER GENMASK(23, 16)

drivers/clk/microchip/Kconfig

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,8 @@ config MCHP_CLK_MPFS
77
bool "Clk driver for PolarFire SoC"
88
depends on ARCH_MICROCHIP_POLARFIRE || COMPILE_TEST
99
default ARCH_MICROCHIP_POLARFIRE
10+
depends on MFD_SYSCON
1011
select AUXILIARY_BUS
12+
select REGMAP_MMIO
1113
help
1214
Supports Clock Configuration for PolarFire SoC

0 commit comments

Comments
 (0)