Skip to content

Commit

Permalink
riscv: dts: microchip: make the fabric dtsi board specific
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Conor Dooley authored and Palmer Dabbelt committed Jun 1, 2022
1 parent e8c81d6 commit 1277b19
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@
/* 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>;
Expand Down
1 change: 1 addition & 0 deletions arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion arch/riscv/boot/dts/microchip/mpfs.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,6 @@

/dts-v1/;
#include "dt-bindings/clock/microchip,mpfs-clock.h"
#include "mpfs-fabric.dtsi"

/ {
#address-cells = <2>;
Expand Down

0 comments on commit 1277b19

Please sign in to comment.