]> git.baikalelectronics.ru Git - kernel.git/commitdiff
riscv: dts: microchip: remove soc vendor from filenames
authorConor Dooley <conor.dooley@microchip.com>
Mon, 9 May 2022 14:26:04 +0000 (15:26 +0100)
committerPalmer Dabbelt <palmer@rivosinc.com>
Wed, 1 Jun 2022 22:27:54 +0000 (15:27 -0700)
Having the SoC vendor both as the directory and in the filename adds
little. Remove microchip from the filenames so that the files will
resemble the other directories in riscv (and arm64). The new names
follow a soc-board.dts & soc{,-fabric}.dtsi pattern.

Reviewed-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Conor Dooley <conor.dooley@microchip.com>
Link: https://lore.kernel.org/r/20220509142610.128590-4-conor.dooley@microchip.com
Signed-off-by: Palmer Dabbelt <palmer@rivosinc.com>
arch/riscv/boot/dts/microchip/Makefile
arch/riscv/boot/dts/microchip/microchip-mpfs-fabric.dtsi [deleted file]
arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts [deleted file]
arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi [deleted file]
arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi [new file with mode: 0644]
arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts [new file with mode: 0644]
arch/riscv/boot/dts/microchip/mpfs.dtsi [new file with mode: 0644]

index 855c1502d912bac524dc8e53b612193c73d65b08..af3a5059b35002d6949fe03b30d4778138cb5cc8 100644 (file)
@@ -1,3 +1,3 @@
 # SPDX-License-Identifier: GPL-2.0
-dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += microchip-mpfs-icicle-kit.dtb
+dtb-$(CONFIG_SOC_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb
 obj-$(CONFIG_BUILTIN_DTB) += $(addsuffix .o, $(dtb-y))
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs-fabric.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs-fabric.dtsi
deleted file mode 100644 (file)
index ccaac33..0000000
+++ /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/microchip-mpfs-icicle-kit.dts b/arch/riscv/boot/dts/microchip/microchip-mpfs-icicle-kit.dts
deleted file mode 100644 (file)
index c71d6aa..0000000
+++ /dev/null
@@ -1,159 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/* Copyright (c) 2020-2021 Microchip Technology Inc */
-
-/dts-v1/;
-
-#include "microchip-mpfs.dtsi"
-
-/* Clock frequency (in Hz) of the rtcclk */
-#define RTCCLK_FREQ            1000000
-
-/ {
-       model = "Microchip PolarFire-SoC Icicle Kit";
-       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";
-
-       aliases {
-               ethernet0 = &mac1;
-               serial0 = &mmuart0;
-               serial1 = &mmuart1;
-               serial2 = &mmuart2;
-               serial3 = &mmuart3;
-               serial4 = &mmuart4;
-       };
-
-       chosen {
-               stdout-path = "serial1:115200n8";
-       };
-
-       cpus {
-               timebase-frequency = <RTCCLK_FREQ>;
-       };
-
-       ddrc_cache_lo: memory@80000000 {
-               device_type = "memory";
-               reg = <0x0 0x80000000 0x0 0x2e000000>;
-               status = "okay";
-       };
-
-       ddrc_cache_hi: memory@1000000000 {
-               device_type = "memory";
-               reg = <0x10 0x0 0x0 0x40000000>;
-               status = "okay";
-       };
-};
-
-&refclk {
-       clock-frequency = <125000000>;
-};
-
-&mmuart1 {
-       status = "okay";
-};
-
-&mmuart2 {
-       status = "okay";
-};
-
-&mmuart3 {
-       status = "okay";
-};
-
-&mmuart4 {
-       status = "okay";
-};
-
-&mmc {
-       status = "okay";
-
-       bus-width = <4>;
-       disable-wp;
-       cap-sd-highspeed;
-       cap-mmc-highspeed;
-       card-detect-delay = <200>;
-       mmc-ddr-1_8v;
-       mmc-hs200-1_8v;
-       sd-uhs-sdr12;
-       sd-uhs-sdr25;
-       sd-uhs-sdr50;
-       sd-uhs-sdr104;
-};
-
-&spi0 {
-       status = "okay";
-};
-
-&spi1 {
-       status = "okay";
-};
-
-&qspi {
-       status = "okay";
-};
-
-&i2c0 {
-       status = "okay";
-};
-
-&i2c1 {
-       status = "okay";
-};
-
-&i2c2 {
-       status = "okay";
-};
-
-&mac0 {
-       phy-mode = "sgmii";
-       phy-handle = <&phy0>;
-};
-
-&mac1 {
-       status = "okay";
-       phy-mode = "sgmii";
-       phy-handle = <&phy1>;
-       phy1: ethernet-phy@9 {
-               reg = <9>;
-               ti,fifo-depth = <0x1>;
-       };
-       phy0: ethernet-phy@8 {
-               reg = <8>;
-               ti,fifo-depth = <0x1>;
-       };
-};
-
-&gpio2 {
-       interrupts = <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>,
-                    <53>, <53>, <53>, <53>;
-       status = "okay";
-};
-
-&rtc {
-       status = "okay";
-};
-
-&usb {
-       status = "okay";
-       dr_mode = "host";
-};
-
-&mbox {
-       status = "okay";
-};
-
-&syscontroller {
-       status = "okay";
-};
-
-&pcie {
-       status = "okay";
-};
-
-&core_pwm0 {
-       status = "okay";
-};
diff --git a/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi b/arch/riscv/boot/dts/microchip/microchip-mpfs.dtsi
deleted file mode 100644 (file)
index e318fe5..0000000
+++ /dev/null
@@ -1,455 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
-/* Copyright (c) 2020-2021 Microchip Technology Inc */
-
-/dts-v1/;
-#include "dt-bindings/clock/microchip,mpfs-clock.h"
-#include "microchip-mpfs-fabric.dtsi"
-
-/ {
-       #address-cells = <2>;
-       #size-cells = <2>;
-       model = "Microchip PolarFire SoC";
-       compatible = "microchip,mpfs";
-
-       cpus {
-               #address-cells = <1>;
-               #size-cells = <0>;
-
-               cpu0: cpu@0 {
-                       compatible = "sifive,e51", "sifive,rocket0", "riscv";
-                       device_type = "cpu";
-                       i-cache-block-size = <64>;
-                       i-cache-sets = <128>;
-                       i-cache-size = <16384>;
-                       reg = <0>;
-                       riscv,isa = "rv64imac";
-                       clocks = <&clkcfg CLK_CPU>;
-                       status = "disabled";
-
-                       cpu0_intc: interrupt-controller {
-                               #interrupt-cells = <1>;
-                               compatible = "riscv,cpu-intc";
-                               interrupt-controller;
-                       };
-               };
-
-               cpu1: cpu@1 {
-                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
-                       d-cache-block-size = <64>;
-                       d-cache-sets = <64>;
-                       d-cache-size = <32768>;
-                       d-tlb-sets = <1>;
-                       d-tlb-size = <32>;
-                       device_type = "cpu";
-                       i-cache-block-size = <64>;
-                       i-cache-sets = <64>;
-                       i-cache-size = <32768>;
-                       i-tlb-sets = <1>;
-                       i-tlb-size = <32>;
-                       mmu-type = "riscv,sv39";
-                       reg = <1>;
-                       riscv,isa = "rv64imafdc";
-                       clocks = <&clkcfg CLK_CPU>;
-                       tlb-split;
-                       status = "okay";
-
-                       cpu1_intc: interrupt-controller {
-                               #interrupt-cells = <1>;
-                               compatible = "riscv,cpu-intc";
-                               interrupt-controller;
-                       };
-               };
-
-               cpu2: cpu@2 {
-                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
-                       d-cache-block-size = <64>;
-                       d-cache-sets = <64>;
-                       d-cache-size = <32768>;
-                       d-tlb-sets = <1>;
-                       d-tlb-size = <32>;
-                       device_type = "cpu";
-                       i-cache-block-size = <64>;
-                       i-cache-sets = <64>;
-                       i-cache-size = <32768>;
-                       i-tlb-sets = <1>;
-                       i-tlb-size = <32>;
-                       mmu-type = "riscv,sv39";
-                       reg = <2>;
-                       riscv,isa = "rv64imafdc";
-                       clocks = <&clkcfg CLK_CPU>;
-                       tlb-split;
-                       status = "okay";
-
-                       cpu2_intc: interrupt-controller {
-                               #interrupt-cells = <1>;
-                               compatible = "riscv,cpu-intc";
-                               interrupt-controller;
-                       };
-               };
-
-               cpu3: cpu@3 {
-                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
-                       d-cache-block-size = <64>;
-                       d-cache-sets = <64>;
-                       d-cache-size = <32768>;
-                       d-tlb-sets = <1>;
-                       d-tlb-size = <32>;
-                       device_type = "cpu";
-                       i-cache-block-size = <64>;
-                       i-cache-sets = <64>;
-                       i-cache-size = <32768>;
-                       i-tlb-sets = <1>;
-                       i-tlb-size = <32>;
-                       mmu-type = "riscv,sv39";
-                       reg = <3>;
-                       riscv,isa = "rv64imafdc";
-                       clocks = <&clkcfg CLK_CPU>;
-                       tlb-split;
-                       status = "okay";
-
-                       cpu3_intc: interrupt-controller {
-                               #interrupt-cells = <1>;
-                               compatible = "riscv,cpu-intc";
-                               interrupt-controller;
-                       };
-               };
-
-               cpu4: cpu@4 {
-                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
-                       d-cache-block-size = <64>;
-                       d-cache-sets = <64>;
-                       d-cache-size = <32768>;
-                       d-tlb-sets = <1>;
-                       d-tlb-size = <32>;
-                       device_type = "cpu";
-                       i-cache-block-size = <64>;
-                       i-cache-sets = <64>;
-                       i-cache-size = <32768>;
-                       i-tlb-sets = <1>;
-                       i-tlb-size = <32>;
-                       mmu-type = "riscv,sv39";
-                       reg = <4>;
-                       riscv,isa = "rv64imafdc";
-                       clocks = <&clkcfg CLK_CPU>;
-                       tlb-split;
-                       status = "okay";
-                       cpu4_intc: interrupt-controller {
-                               #interrupt-cells = <1>;
-                               compatible = "riscv,cpu-intc";
-                               interrupt-controller;
-                       };
-               };
-       };
-
-       refclk: mssrefclk {
-               compatible = "fixed-clock";
-               #clock-cells = <0>;
-       };
-
-       syscontroller: syscontroller {
-               compatible = "microchip,mpfs-sys-controller";
-               mboxes = <&mbox 0>;
-       };
-
-       soc {
-               #address-cells = <2>;
-               #size-cells = <2>;
-               compatible = "simple-bus";
-               ranges;
-
-               cctrllr: cache-controller@2010000 {
-                       compatible = "sifive,fu540-c000-ccache", "cache";
-                       reg = <0x0 0x2010000 0x0 0x1000>;
-                       cache-block-size = <64>;
-                       cache-level = <2>;
-                       cache-sets = <1024>;
-                       cache-size = <2097152>;
-                       cache-unified;
-                       interrupt-parent = <&plic>;
-                       interrupts = <1>, <2>, <3>;
-               };
-
-               clint: clint@2000000 {
-                       compatible = "sifive,fu540-c000-clint", "sifive,clint0";
-                       reg = <0x0 0x2000000 0x0 0xC000>;
-                       interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>,
-                                             <&cpu1_intc 3>, <&cpu1_intc 7>,
-                                             <&cpu2_intc 3>, <&cpu2_intc 7>,
-                                             <&cpu3_intc 3>, <&cpu3_intc 7>,
-                                             <&cpu4_intc 3>, <&cpu4_intc 7>;
-               };
-
-               plic: interrupt-controller@c000000 {
-                       compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
-                       reg = <0x0 0xc000000 0x0 0x4000000>;
-                       #address-cells = <0>;
-                       #interrupt-cells = <1>;
-                       interrupt-controller;
-                       interrupts-extended = <&cpu0_intc 11>,
-                                             <&cpu1_intc 11>, <&cpu1_intc 9>,
-                                             <&cpu2_intc 11>, <&cpu2_intc 9>,
-                                             <&cpu3_intc 11>, <&cpu3_intc 9>,
-                                             <&cpu4_intc 11>, <&cpu4_intc 9>;
-                       riscv,ndev = <186>;
-               };
-
-               clkcfg: clkcfg@20002000 {
-                       compatible = "microchip,mpfs-clkcfg";
-                       reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
-                       clocks = <&refclk>;
-                       #clock-cells = <1>;
-               };
-
-               mmuart0: serial@20000000 {
-                       compatible = "ns16550a";
-                       reg = <0x0 0x20000000 0x0 0x400>;
-                       reg-io-width = <4>;
-                       reg-shift = <2>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <90>;
-                       current-speed = <115200>;
-                       clocks = <&clkcfg CLK_MMUART0>;
-                       status = "disabled"; /* Reserved for the HSS */
-               };
-
-               mmuart1: serial@20100000 {
-                       compatible = "ns16550a";
-                       reg = <0x0 0x20100000 0x0 0x400>;
-                       reg-io-width = <4>;
-                       reg-shift = <2>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <91>;
-                       current-speed = <115200>;
-                       clocks = <&clkcfg CLK_MMUART1>;
-                       status = "disabled";
-               };
-
-               mmuart2: serial@20102000 {
-                       compatible = "ns16550a";
-                       reg = <0x0 0x20102000 0x0 0x400>;
-                       reg-io-width = <4>;
-                       reg-shift = <2>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <92>;
-                       current-speed = <115200>;
-                       clocks = <&clkcfg CLK_MMUART2>;
-                       status = "disabled";
-               };
-
-               mmuart3: serial@20104000 {
-                       compatible = "ns16550a";
-                       reg = <0x0 0x20104000 0x0 0x400>;
-                       reg-io-width = <4>;
-                       reg-shift = <2>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <93>;
-                       current-speed = <115200>;
-                       clocks = <&clkcfg CLK_MMUART3>;
-                       status = "disabled";
-               };
-
-               mmuart4: serial@20106000 {
-                       compatible = "ns16550a";
-                       reg = <0x0 0x20106000 0x0 0x400>;
-                       reg-io-width = <4>;
-                       reg-shift = <2>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <94>;
-                       clocks = <&clkcfg CLK_MMUART4>;
-                       current-speed = <115200>;
-                       status = "disabled";
-               };
-
-               /* Common node entry for emmc/sd */
-               mmc: mmc@20008000 {
-                       compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc";
-                       reg = <0x0 0x20008000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <88>;
-                       clocks = <&clkcfg CLK_MMC>;
-                       max-frequency = <200000000>;
-                       status = "disabled";
-               };
-
-               spi0: spi@20108000 {
-                       compatible = "microchip,mpfs-spi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x0 0x20108000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <54>;
-                       clocks = <&clkcfg CLK_SPI0>;
-                       spi-max-frequency = <25000000>;
-                       status = "disabled";
-               };
-
-               spi1: spi@20109000 {
-                       compatible = "microchip,mpfs-spi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x0 0x20109000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <55>;
-                       clocks = <&clkcfg CLK_SPI1>;
-                       spi-max-frequency = <25000000>;
-                       status = "disabled";
-               };
-
-               qspi: spi@21000000 {
-                       compatible = "microchip,mpfs-qspi";
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       reg = <0x0 0x21000000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <85>;
-                       clocks = <&clkcfg CLK_QSPI>;
-                       spi-max-frequency = <25000000>;
-                       status = "disabled";
-               };
-
-               i2c0: i2c@2010a000 {
-                       compatible = "microchip,mpfs-i2c", "microchip,corei2c-rtl-v7";
-                       reg = <0x0 0x2010a000 0x0 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <58>;
-                       clocks = <&clkcfg CLK_I2C0>;
-                       clock-frequency = <100000>;
-                       status = "disabled";
-               };
-
-               i2c1: i2c@2010b000 {
-                       compatible = "microchip,mpfs-i2c", "microchip,corei2c-rtl-v7";
-                       reg = <0x0 0x2010b000 0x0 0x1000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <61>;
-                       clocks = <&clkcfg CLK_I2C1>;
-                       clock-frequency = <100000>;
-                       status = "disabled";
-               };
-
-               mac0: ethernet@20110000 {
-                       compatible = "cdns,macb";
-                       reg = <0x0 0x20110000 0x0 0x2000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <64>, <65>, <66>, <67>, <68>, <69>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>;
-                       clock-names = "pclk", "hclk";
-                       status = "disabled";
-               };
-
-               mac1: ethernet@20112000 {
-                       compatible = "cdns,macb";
-                       reg = <0x0 0x20112000 0x0 0x2000>;
-                       #address-cells = <1>;
-                       #size-cells = <0>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <70>, <71>, <72>, <73>, <74>, <75>;
-                       local-mac-address = [00 00 00 00 00 00];
-                       clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
-                       clock-names = "pclk", "hclk";
-                       status = "disabled";
-               };
-
-               gpio0: gpio@20120000 {
-                       compatible = "microchip,mpfs-gpio";
-                       reg = <0x0 0x20120000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupt-controller;
-                       #interrupt-cells = <1>;
-                       clocks = <&clkcfg CLK_GPIO0>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       status = "disabled";
-               };
-
-               gpio1: gpio@20121000 {
-                       compatible = "microchip,mpfs-gpio";
-                       reg = <0x0 0x20121000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupt-controller;
-                       #interrupt-cells = <1>;
-                       clocks = <&clkcfg CLK_GPIO1>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       status = "disabled";
-               };
-
-               gpio2: gpio@20122000 {
-                       compatible = "microchip,mpfs-gpio";
-                       reg = <0x0 0x20122000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupt-controller;
-                       #interrupt-cells = <1>;
-                       clocks = <&clkcfg CLK_GPIO2>;
-                       gpio-controller;
-                       #gpio-cells = <2>;
-                       status = "disabled";
-               };
-
-               rtc: rtc@20124000 {
-                       compatible = "microchip,mpfs-rtc";
-                       reg = <0x0 0x20124000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <80>, <81>;
-                       clocks = <&clkcfg CLK_RTC>, <&clkcfg CLK_RTCREF>;
-                       clock-names = "rtc", "rtcref";
-                       status = "disabled";
-               };
-
-               usb: usb@20201000 {
-                       compatible = "microchip,mpfs-musb";
-                       reg = <0x0 0x20201000 0x0 0x1000>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <86>, <87>;
-                       clocks = <&clkcfg CLK_USB>;
-                       interrupt-names = "dma","mc";
-                       status = "disabled";
-               };
-
-               pcie: pcie@2000000000 {
-                       compatible = "microchip,pcie-host-1.0";
-                       #address-cells = <0x3>;
-                       #interrupt-cells = <0x1>;
-                       #size-cells = <0x2>;
-                       device_type = "pci";
-                       reg = <0x20 0x0 0x0 0x8000000>, <0x0 0x43000000 0x0 0x10000>;
-                       reg-names = "cfg", "apb";
-                       bus-range = <0x0 0x7f>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <119>;
-                       interrupt-map = <0 0 0 1 &pcie_intc 0>,
-                                       <0 0 0 2 &pcie_intc 1>,
-                                       <0 0 0 3 &pcie_intc 2>,
-                                       <0 0 0 4 &pcie_intc 3>;
-                       interrupt-map-mask = <0 0 0 7>;
-                       clocks = <&fabric_clk1>, <&fabric_clk1>, <&fabric_clk3>;
-                       clock-names = "fic0", "fic1", "fic3";
-                       ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>;
-                       msi-parent = <&pcie>;
-                       msi-controller;
-                       microchip,axi-m-atr0 = <0x10 0x0>;
-                       status = "disabled";
-                       pcie_intc: legacy-interrupt-controller {
-                               #address-cells = <0>;
-                               #interrupt-cells = <1>;
-                               interrupt-controller;
-                       };
-               };
-
-               mbox: mailbox@37020000 {
-                       compatible = "microchip,mpfs-mailbox";
-                       reg = <0x0 0x37020000 0x0 0x1000>, <0x0 0x2000318C 0x0 0x40>;
-                       interrupt-parent = <&plic>;
-                       interrupts = <96>;
-                       #mbox-cells = <1>;
-                       status = "disabled";
-               };
-       };
-};
diff --git a/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi b/arch/riscv/boot/dts/microchip/mpfs-fabric.dtsi
new file mode 100644 (file)
index 0000000..ccaac33
--- /dev/null
@@ -0,0 +1,37 @@
+// 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.dts b/arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts
new file mode 100644 (file)
index 0000000..84b0015
--- /dev/null
@@ -0,0 +1,159 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/* Copyright (c) 2020-2021 Microchip Technology Inc */
+
+/dts-v1/;
+
+#include "mpfs.dtsi"
+
+/* Clock frequency (in Hz) of the rtcclk */
+#define RTCCLK_FREQ            1000000
+
+/ {
+       model = "Microchip PolarFire-SoC Icicle Kit";
+       compatible = "microchip,mpfs-icicle-kit", "microchip,mpfs";
+
+       aliases {
+               ethernet0 = &mac1;
+               serial0 = &mmuart0;
+               serial1 = &mmuart1;
+               serial2 = &mmuart2;
+               serial3 = &mmuart3;
+               serial4 = &mmuart4;
+       };
+
+       chosen {
+               stdout-path = "serial1:115200n8";
+       };
+
+       cpus {
+               timebase-frequency = <RTCCLK_FREQ>;
+       };
+
+       ddrc_cache_lo: memory@80000000 {
+               device_type = "memory";
+               reg = <0x0 0x80000000 0x0 0x2e000000>;
+               status = "okay";
+       };
+
+       ddrc_cache_hi: memory@1000000000 {
+               device_type = "memory";
+               reg = <0x10 0x0 0x0 0x40000000>;
+               status = "okay";
+       };
+};
+
+&refclk {
+       clock-frequency = <125000000>;
+};
+
+&mmuart1 {
+       status = "okay";
+};
+
+&mmuart2 {
+       status = "okay";
+};
+
+&mmuart3 {
+       status = "okay";
+};
+
+&mmuart4 {
+       status = "okay";
+};
+
+&mmc {
+       status = "okay";
+
+       bus-width = <4>;
+       disable-wp;
+       cap-sd-highspeed;
+       cap-mmc-highspeed;
+       card-detect-delay = <200>;
+       mmc-ddr-1_8v;
+       mmc-hs200-1_8v;
+       sd-uhs-sdr12;
+       sd-uhs-sdr25;
+       sd-uhs-sdr50;
+       sd-uhs-sdr104;
+};
+
+&spi0 {
+       status = "okay";
+};
+
+&spi1 {
+       status = "okay";
+};
+
+&qspi {
+       status = "okay";
+};
+
+&i2c0 {
+       status = "okay";
+};
+
+&i2c1 {
+       status = "okay";
+};
+
+&i2c2 {
+       status = "okay";
+};
+
+&mac0 {
+       phy-mode = "sgmii";
+       phy-handle = <&phy0>;
+};
+
+&mac1 {
+       status = "okay";
+       phy-mode = "sgmii";
+       phy-handle = <&phy1>;
+       phy1: ethernet-phy@9 {
+               reg = <9>;
+               ti,fifo-depth = <0x1>;
+       };
+       phy0: ethernet-phy@8 {
+               reg = <8>;
+               ti,fifo-depth = <0x1>;
+       };
+};
+
+&gpio2 {
+       interrupts = <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>,
+                    <53>, <53>, <53>, <53>;
+       status = "okay";
+};
+
+&rtc {
+       status = "okay";
+};
+
+&usb {
+       status = "okay";
+       dr_mode = "host";
+};
+
+&mbox {
+       status = "okay";
+};
+
+&syscontroller {
+       status = "okay";
+};
+
+&pcie {
+       status = "okay";
+};
+
+&core_pwm0 {
+       status = "okay";
+};
diff --git a/arch/riscv/boot/dts/microchip/mpfs.dtsi b/arch/riscv/boot/dts/microchip/mpfs.dtsi
new file mode 100644 (file)
index 0000000..7d2c226
--- /dev/null
@@ -0,0 +1,455 @@
+// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+/* Copyright (c) 2020-2021 Microchip Technology Inc */
+
+/dts-v1/;
+#include "dt-bindings/clock/microchip,mpfs-clock.h"
+#include "mpfs-fabric.dtsi"
+
+/ {
+       #address-cells = <2>;
+       #size-cells = <2>;
+       model = "Microchip PolarFire SoC";
+       compatible = "microchip,mpfs";
+
+       cpus {
+               #address-cells = <1>;
+               #size-cells = <0>;
+
+               cpu0: cpu@0 {
+                       compatible = "sifive,e51", "sifive,rocket0", "riscv";
+                       device_type = "cpu";
+                       i-cache-block-size = <64>;
+                       i-cache-sets = <128>;
+                       i-cache-size = <16384>;
+                       reg = <0>;
+                       riscv,isa = "rv64imac";
+                       clocks = <&clkcfg CLK_CPU>;
+                       status = "disabled";
+
+                       cpu0_intc: interrupt-controller {
+                               #interrupt-cells = <1>;
+                               compatible = "riscv,cpu-intc";
+                               interrupt-controller;
+                       };
+               };
+
+               cpu1: cpu@1 {
+                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+                       d-cache-block-size = <64>;
+                       d-cache-sets = <64>;
+                       d-cache-size = <32768>;
+                       d-tlb-sets = <1>;
+                       d-tlb-size = <32>;
+                       device_type = "cpu";
+                       i-cache-block-size = <64>;
+                       i-cache-sets = <64>;
+                       i-cache-size = <32768>;
+                       i-tlb-sets = <1>;
+                       i-tlb-size = <32>;
+                       mmu-type = "riscv,sv39";
+                       reg = <1>;
+                       riscv,isa = "rv64imafdc";
+                       clocks = <&clkcfg CLK_CPU>;
+                       tlb-split;
+                       status = "okay";
+
+                       cpu1_intc: interrupt-controller {
+                               #interrupt-cells = <1>;
+                               compatible = "riscv,cpu-intc";
+                               interrupt-controller;
+                       };
+               };
+
+               cpu2: cpu@2 {
+                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+                       d-cache-block-size = <64>;
+                       d-cache-sets = <64>;
+                       d-cache-size = <32768>;
+                       d-tlb-sets = <1>;
+                       d-tlb-size = <32>;
+                       device_type = "cpu";
+                       i-cache-block-size = <64>;
+                       i-cache-sets = <64>;
+                       i-cache-size = <32768>;
+                       i-tlb-sets = <1>;
+                       i-tlb-size = <32>;
+                       mmu-type = "riscv,sv39";
+                       reg = <2>;
+                       riscv,isa = "rv64imafdc";
+                       clocks = <&clkcfg CLK_CPU>;
+                       tlb-split;
+                       status = "okay";
+
+                       cpu2_intc: interrupt-controller {
+                               #interrupt-cells = <1>;
+                               compatible = "riscv,cpu-intc";
+                               interrupt-controller;
+                       };
+               };
+
+               cpu3: cpu@3 {
+                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+                       d-cache-block-size = <64>;
+                       d-cache-sets = <64>;
+                       d-cache-size = <32768>;
+                       d-tlb-sets = <1>;
+                       d-tlb-size = <32>;
+                       device_type = "cpu";
+                       i-cache-block-size = <64>;
+                       i-cache-sets = <64>;
+                       i-cache-size = <32768>;
+                       i-tlb-sets = <1>;
+                       i-tlb-size = <32>;
+                       mmu-type = "riscv,sv39";
+                       reg = <3>;
+                       riscv,isa = "rv64imafdc";
+                       clocks = <&clkcfg CLK_CPU>;
+                       tlb-split;
+                       status = "okay";
+
+                       cpu3_intc: interrupt-controller {
+                               #interrupt-cells = <1>;
+                               compatible = "riscv,cpu-intc";
+                               interrupt-controller;
+                       };
+               };
+
+               cpu4: cpu@4 {
+                       compatible = "sifive,u54-mc", "sifive,rocket0", "riscv";
+                       d-cache-block-size = <64>;
+                       d-cache-sets = <64>;
+                       d-cache-size = <32768>;
+                       d-tlb-sets = <1>;
+                       d-tlb-size = <32>;
+                       device_type = "cpu";
+                       i-cache-block-size = <64>;
+                       i-cache-sets = <64>;
+                       i-cache-size = <32768>;
+                       i-tlb-sets = <1>;
+                       i-tlb-size = <32>;
+                       mmu-type = "riscv,sv39";
+                       reg = <4>;
+                       riscv,isa = "rv64imafdc";
+                       clocks = <&clkcfg CLK_CPU>;
+                       tlb-split;
+                       status = "okay";
+                       cpu4_intc: interrupt-controller {
+                               #interrupt-cells = <1>;
+                               compatible = "riscv,cpu-intc";
+                               interrupt-controller;
+                       };
+               };
+       };
+
+       refclk: mssrefclk {
+               compatible = "fixed-clock";
+               #clock-cells = <0>;
+       };
+
+       syscontroller: syscontroller {
+               compatible = "microchip,mpfs-sys-controller";
+               mboxes = <&mbox 0>;
+       };
+
+       soc {
+               #address-cells = <2>;
+               #size-cells = <2>;
+               compatible = "simple-bus";
+               ranges;
+
+               cctrllr: cache-controller@2010000 {
+                       compatible = "sifive,fu540-c000-ccache", "cache";
+                       reg = <0x0 0x2010000 0x0 0x1000>;
+                       cache-block-size = <64>;
+                       cache-level = <2>;
+                       cache-sets = <1024>;
+                       cache-size = <2097152>;
+                       cache-unified;
+                       interrupt-parent = <&plic>;
+                       interrupts = <1>, <2>, <3>;
+               };
+
+               clint: clint@2000000 {
+                       compatible = "sifive,fu540-c000-clint", "sifive,clint0";
+                       reg = <0x0 0x2000000 0x0 0xC000>;
+                       interrupts-extended = <&cpu0_intc 3>, <&cpu0_intc 7>,
+                                             <&cpu1_intc 3>, <&cpu1_intc 7>,
+                                             <&cpu2_intc 3>, <&cpu2_intc 7>,
+                                             <&cpu3_intc 3>, <&cpu3_intc 7>,
+                                             <&cpu4_intc 3>, <&cpu4_intc 7>;
+               };
+
+               plic: interrupt-controller@c000000 {
+                       compatible = "sifive,fu540-c000-plic", "sifive,plic-1.0.0";
+                       reg = <0x0 0xc000000 0x0 0x4000000>;
+                       #address-cells = <0>;
+                       #interrupt-cells = <1>;
+                       interrupt-controller;
+                       interrupts-extended = <&cpu0_intc 11>,
+                                             <&cpu1_intc 11>, <&cpu1_intc 9>,
+                                             <&cpu2_intc 11>, <&cpu2_intc 9>,
+                                             <&cpu3_intc 11>, <&cpu3_intc 9>,
+                                             <&cpu4_intc 11>, <&cpu4_intc 9>;
+                       riscv,ndev = <186>;
+               };
+
+               clkcfg: clkcfg@20002000 {
+                       compatible = "microchip,mpfs-clkcfg";
+                       reg = <0x0 0x20002000 0x0 0x1000>, <0x0 0x3E001000 0x0 0x1000>;
+                       clocks = <&refclk>;
+                       #clock-cells = <1>;
+               };
+
+               mmuart0: serial@20000000 {
+                       compatible = "ns16550a";
+                       reg = <0x0 0x20000000 0x0 0x400>;
+                       reg-io-width = <4>;
+                       reg-shift = <2>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <90>;
+                       current-speed = <115200>;
+                       clocks = <&clkcfg CLK_MMUART0>;
+                       status = "disabled"; /* Reserved for the HSS */
+               };
+
+               mmuart1: serial@20100000 {
+                       compatible = "ns16550a";
+                       reg = <0x0 0x20100000 0x0 0x400>;
+                       reg-io-width = <4>;
+                       reg-shift = <2>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <91>;
+                       current-speed = <115200>;
+                       clocks = <&clkcfg CLK_MMUART1>;
+                       status = "disabled";
+               };
+
+               mmuart2: serial@20102000 {
+                       compatible = "ns16550a";
+                       reg = <0x0 0x20102000 0x0 0x400>;
+                       reg-io-width = <4>;
+                       reg-shift = <2>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <92>;
+                       current-speed = <115200>;
+                       clocks = <&clkcfg CLK_MMUART2>;
+                       status = "disabled";
+               };
+
+               mmuart3: serial@20104000 {
+                       compatible = "ns16550a";
+                       reg = <0x0 0x20104000 0x0 0x400>;
+                       reg-io-width = <4>;
+                       reg-shift = <2>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <93>;
+                       current-speed = <115200>;
+                       clocks = <&clkcfg CLK_MMUART3>;
+                       status = "disabled";
+               };
+
+               mmuart4: serial@20106000 {
+                       compatible = "ns16550a";
+                       reg = <0x0 0x20106000 0x0 0x400>;
+                       reg-io-width = <4>;
+                       reg-shift = <2>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <94>;
+                       clocks = <&clkcfg CLK_MMUART4>;
+                       current-speed = <115200>;
+                       status = "disabled";
+               };
+
+               /* Common node entry for emmc/sd */
+               mmc: mmc@20008000 {
+                       compatible = "microchip,mpfs-sd4hc", "cdns,sd4hc";
+                       reg = <0x0 0x20008000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <88>;
+                       clocks = <&clkcfg CLK_MMC>;
+                       max-frequency = <200000000>;
+                       status = "disabled";
+               };
+
+               spi0: spi@20108000 {
+                       compatible = "microchip,mpfs-spi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0 0x20108000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <54>;
+                       clocks = <&clkcfg CLK_SPI0>;
+                       spi-max-frequency = <25000000>;
+                       status = "disabled";
+               };
+
+               spi1: spi@20109000 {
+                       compatible = "microchip,mpfs-spi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0 0x20109000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <55>;
+                       clocks = <&clkcfg CLK_SPI1>;
+                       spi-max-frequency = <25000000>;
+                       status = "disabled";
+               };
+
+               qspi: spi@21000000 {
+                       compatible = "microchip,mpfs-qspi";
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       reg = <0x0 0x21000000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <85>;
+                       clocks = <&clkcfg CLK_QSPI>;
+                       spi-max-frequency = <25000000>;
+                       status = "disabled";
+               };
+
+               i2c0: i2c@2010a000 {
+                       compatible = "microchip,mpfs-i2c", "microchip,corei2c-rtl-v7";
+                       reg = <0x0 0x2010a000 0x0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <58>;
+                       clocks = <&clkcfg CLK_I2C0>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               i2c1: i2c@2010b000 {
+                       compatible = "microchip,mpfs-i2c", "microchip,corei2c-rtl-v7";
+                       reg = <0x0 0x2010b000 0x0 0x1000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <61>;
+                       clocks = <&clkcfg CLK_I2C1>;
+                       clock-frequency = <100000>;
+                       status = "disabled";
+               };
+
+               mac0: ethernet@20110000 {
+                       compatible = "cdns,macb";
+                       reg = <0x0 0x20110000 0x0 0x2000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <64>, <65>, <66>, <67>, <68>, <69>;
+                       local-mac-address = [00 00 00 00 00 00];
+                       clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>;
+                       clock-names = "pclk", "hclk";
+                       status = "disabled";
+               };
+
+               mac1: ethernet@20112000 {
+                       compatible = "cdns,macb";
+                       reg = <0x0 0x20112000 0x0 0x2000>;
+                       #address-cells = <1>;
+                       #size-cells = <0>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <70>, <71>, <72>, <73>, <74>, <75>;
+                       local-mac-address = [00 00 00 00 00 00];
+                       clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>;
+                       clock-names = "pclk", "hclk";
+                       status = "disabled";
+               };
+
+               gpio0: gpio@20120000 {
+                       compatible = "microchip,mpfs-gpio";
+                       reg = <0x0 0x20120000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       clocks = <&clkcfg CLK_GPIO0>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       status = "disabled";
+               };
+
+               gpio1: gpio@20121000 {
+                       compatible = "microchip,mpfs-gpio";
+                       reg = <0x0 0x20121000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       clocks = <&clkcfg CLK_GPIO1>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       status = "disabled";
+               };
+
+               gpio2: gpio@20122000 {
+                       compatible = "microchip,mpfs-gpio";
+                       reg = <0x0 0x20122000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupt-controller;
+                       #interrupt-cells = <1>;
+                       clocks = <&clkcfg CLK_GPIO2>;
+                       gpio-controller;
+                       #gpio-cells = <2>;
+                       status = "disabled";
+               };
+
+               rtc: rtc@20124000 {
+                       compatible = "microchip,mpfs-rtc";
+                       reg = <0x0 0x20124000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <80>, <81>;
+                       clocks = <&clkcfg CLK_RTC>, <&clkcfg CLK_RTCREF>;
+                       clock-names = "rtc", "rtcref";
+                       status = "disabled";
+               };
+
+               usb: usb@20201000 {
+                       compatible = "microchip,mpfs-musb";
+                       reg = <0x0 0x20201000 0x0 0x1000>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <86>, <87>;
+                       clocks = <&clkcfg CLK_USB>;
+                       interrupt-names = "dma","mc";
+                       status = "disabled";
+               };
+
+               pcie: pcie@2000000000 {
+                       compatible = "microchip,pcie-host-1.0";
+                       #address-cells = <0x3>;
+                       #interrupt-cells = <0x1>;
+                       #size-cells = <0x2>;
+                       device_type = "pci";
+                       reg = <0x20 0x0 0x0 0x8000000>, <0x0 0x43000000 0x0 0x10000>;
+                       reg-names = "cfg", "apb";
+                       bus-range = <0x0 0x7f>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <119>;
+                       interrupt-map = <0 0 0 1 &pcie_intc 0>,
+                                       <0 0 0 2 &pcie_intc 1>,
+                                       <0 0 0 3 &pcie_intc 2>,
+                                       <0 0 0 4 &pcie_intc 3>;
+                       interrupt-map-mask = <0 0 0 7>;
+                       clocks = <&fabric_clk1>, <&fabric_clk1>, <&fabric_clk3>;
+                       clock-names = "fic0", "fic1", "fic3";
+                       ranges = <0x3000000 0x0 0x8000000 0x20 0x8000000 0x0 0x80000000>;
+                       msi-parent = <&pcie>;
+                       msi-controller;
+                       microchip,axi-m-atr0 = <0x10 0x0>;
+                       status = "disabled";
+                       pcie_intc: legacy-interrupt-controller {
+                               #address-cells = <0>;
+                               #interrupt-cells = <1>;
+                               interrupt-controller;
+                       };
+               };
+
+               mbox: mailbox@37020000 {
+                       compatible = "microchip,mpfs-mailbox";
+                       reg = <0x0 0x37020000 0x0 0x1000>, <0x0 0x2000318C 0x0 0x40>;
+                       interrupt-parent = <&plic>;
+                       interrupts = <96>;
+                       #mbox-cells = <1>;
+                       status = "disabled";
+               };
+       };
+};