Skip to content

Commit 26535e8

Browse files
committed
riscv: dts: microchip: convert clock and reset to use syscon
The "subblock" clocks and reset registers on PolarFire SoC are located in the mss-top-sysreg region, alongside pinctrl and interrupt control functionality. Re-write the devicetree to describe the sys explicitly, as its own node, rather than as a region of the clock node. Correspondingly, the phandles to the reset controller must be updated to the new provider. The drivers will continue to support the old way of doing things. Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
1 parent 6f86a41 commit 26535e8

1 file changed

Lines changed: 12 additions & 7 deletions

File tree

arch/riscv/boot/dts/microchip/mpfs.dtsi

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -251,11 +251,9 @@
251251
#dma-cells = <1>;
252252
};
253253

254-
clkcfg: clkcfg@20002000 {
255-
compatible = "microchip,mpfs-clkcfg";
256-
reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
257-
clocks = <&refclk>;
258-
#clock-cells = <1>;
254+
mss_top_sysreg: syscon@20002000 {
255+
compatible = "microchip,mpfs-mss-top-sysreg", "syscon", "simple-mfd";
256+
reg = <0x0 0x20002000 0x0 0x1000>;
259257
#reset-cells = <1>;
260258
};
261259

@@ -452,7 +450,7 @@
452450
local-mac-address = [00 00 00 00 00 00];
453451
clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>;
454452
clock-names = "pclk", "hclk";
455-
resets = <&clkcfg CLK_MAC0>;
453+
resets = <&mss_top_sysreg CLK_MAC0>;
456454
status = "disabled";
457455
};
458456

@@ -466,7 +464,7 @@
466464
local-mac-address = [00 00 00 00 00 00];
467465
clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
468466
clock-names = "pclk", "hclk";
469-
resets = <&clkcfg CLK_MAC1>;
467+
resets = <&mss_top_sysreg CLK_MAC1>;
470468
status = "disabled";
471469
};
472470

@@ -550,5 +548,12 @@
550548
clocks = <&scbclk>;
551549
status = "disabled";
552550
};
551+
552+
clkcfg: clkcfg@3e001000 {
553+
compatible = "microchip,mpfs-clkcfg";
554+
reg = <0x0 0x3e001000 0x0 0x1000>;
555+
clocks = <&refclk>;
556+
#clock-cells = <1>;
557+
};
553558
};
554559
};

0 commit comments

Comments
 (0)