riscv: dts: microchip: make the fabric dtsi board specific

Currently mpfs-fabric.dtsi is included by mpfs.dtsi - which is fine
currently since there is only one board with this SoC upstream.

However if another board was added, it would include the fabric contents
of the Icicle Kit's reference design. To avoid this, rename
mpfs-fabric.dtsi to mpfs-icicle-kit-fabric.dtsi & include it in the dts
rather than mpfs.dtsi.

mpfs-icicle-kit-fabric.dtsi specifically matches the 22.03 reference
design for the icicle kit's FPGA fabric & an older version of the
design may not have the i2c or pwm devices - so add the compatible
string to document this.

Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20220509142610.128590-6-conor.dooley@microchip.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>

diff --git a/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi
deleted file mode 100644 (file)
index ccaac33..0000000
--- a/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi
+++ /dev/null
@@ -1,37 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/* Copyright (c) 2020-2021 Microchip Technology Inc */
-
-/ {
-       core_pwm0: pwm@41000000 {
-               compatible = "microchip,corepwm-rtl-v4";
-               reg = <0x0 0x41000000 0x0 0xF0>;
-               microchip,sync-update-mask = /bits/ 32 <0>;
-               #pwm-cells = <2>;
-               clocks = <&fabric_clk3>;
-               status = "disabled";
-       };
-
-       i2c2: i2c@44000000 {
-               compatible = "microchip,corei2c-rtl-v7";
-               reg = <0x0 0x44000000 0x0 0x1000>;
-               #address-cells = <1>;
-               #size-cells = <0>;
-               clocks = <&fabric_clk3>;
-               interrupt-parent = <&plic>;
-               interrupts = <122>;
-               clock-frequency = <100000>;
-               status = "disabled";
-       };
-
-       fabric_clk3: fabric-clk3 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <62500000>;
-       };
-
-       fabric_clk1: fabric-clk1 {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-               clock-frequency = <125000000>;
-       };
-};

diff --git a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi
new file mode 100644 (file)
index 0000000..0d28858
--- /dev/null
+++ b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit-fabric.dtsi
@@ -0,0 +1,39 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/* Copyright (c) 2020-2021 Microchip Technology Inc */
+
+/ {
+       compatible = "microchip,mpfs-icicle-reference-rtlv2203", "microchip,mpfs";
+
+       core_pwm0: pwm@41000000 {
+               compatible = "microchip,corepwm-rtl-v4";
+               reg = <0x0 0x41000000 0x0 0xF0>;
+               microchip,sync-update-mask = /bits/ 32 <0>;
+               #pwm-cells = <2>;
+               clocks = <&fabric_clk3>;
+               status = "disabled";
+       };
+
+       i2c2: i2c@44000000 {
+               compatible = "microchip,corei2c-rtl-v7";
+               reg = <0x0 0x44000000 0x0 0x1000>;
+               #address-cells = <1>;
+               #size-cells = <0>;
+               clocks = <&fabric_clk3>;
+               interrupt-parent = <&plic>;
+               interrupts = <122>;
+               clock-frequency = <100000>;
+               status = "disabled";
+       };
+
+       fabric_clk3: fabric-clk3 {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <62500000>;
+       };
+
+       fabric_clk1: fabric-clk1 {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+               clock-frequency = <125000000>;
+       };
+};

diff --git a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
index 84b0015dfd47167885d424ec4770ba598533660e..739dfa52bed100b92ab12f799488e66bbbfdb78c 100644 (file)
--- a/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
+++ b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
@@ -4,6 +4,7 @@
 /dts-v1/;
 
 #include "mpfs.dtsi"
+#include "mpfs-icicle-kit-fabric.dtsi"
 
 /* Clock frequency (in Hz) of the rtcclk */
 #define RTCCLK_FREQ            1000000

diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi
index 7d2c226479d361c04273f8f4666e0c59a984711b..8c32591341942fba260c42b1090cbda9ef7f0deb 100644 (file)
--- a/arch/riscv/boot/dts/microchip/mpfs.dtsi
+++ b/arch/riscv/boot/dts/microchip/mpfs.dtsi
@@ -3,7 +3,6 @@
 
 /dts-v1/;
 #include "dt-bindings/clock/microchip,mpfs-clock.h"
-#include "mpfs-fabric.dtsi"
 
 / {
        #address-cells = <2>;