Sync PolarFire SoC dts with Linux
Subsystems (3)
cover Sync PolarFire SoC dts with Linux
Hey,
Couple of patches here that do a long-overdue sync of the Linux devicetree for PolarFire SoC & the Icicle kit with Linux. This wasn't possible for a while due to an incorrect dts & clock driver that were based on a pre-upstream version of the dt-binding. That's fixed now, so a complete re-sync is possible.
To elide complaints about the mac address not being set for the second ethernet, the code which set it for ethernet0 has been changed to set it for whichever (or both) of the macbs that are enabled.
Hopefully I'll have a follow-on bit of work soonTM that will rework the mac address setting code as it'll be needed to support another board.
Cheers,
Conor.
Conor Dooley (3):
riscv: dts: drop microchip from dts filenames
riscv: dts: sync mpfs-icicle devicetree with linux
board: microchip: set mac address for ethernet1 on icicle
arch/riscv/dts/Makefile | 2 +-
arch/riscv/dts/microchip-mpfs-icicle-kit.dts | 136 ------
arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi | 71 +++
...-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} | 0
arch/riscv/dts/mpfs-icicle-kit.dts | 208 +++++++++
.../dts/{microchip-mpfs.dtsi => mpfs.dtsi} | 442 ++++++++----------
board/microchip/mpfs_icicle/mpfs_icicle.c | 15 +-
configs/microchip_mpfs_icicle_defconfig | 2 +-
doc/board/microchip/mpfs_icicle.rst | 6 +-
.../dt-bindings/clock/microchip-mpfs-clock.h | 29 +-
.../microchip-mpfs-plic.h | 196 --------
.../interrupt-controller/riscv-hart.h | 17 -
12 files changed, 514 insertions(+), 610 deletions(-)
delete mode 100644 arch/riscv/dts/microchip-mpfs-icicle-kit.dts
create mode 100644 arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi
rename arch/riscv/dts/{microchip-mpfs-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} (100%)
create mode 100644 arch/riscv/dts/mpfs-icicle-kit.dts
rename arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} (57%)
delete mode 100644 include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h
delete mode 100644 include/dt-bindings/interrupt-controller/riscv-hart.hSignature · 1 line
2.40.1
PATCH 1/3 riscv: dts: drop microchip from dts filenames
The original names picked for the DT doesn't match Linux's naming scheme and it was renamed there a while ago. Rename it in U-Boot to allow easily syncing dts between the two projects.
---
arch/riscv/dts/Makefile | 2 +-
...s-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} | 0
.../{microchip-mpfs-icicle-kit.dts => mpfs-icicle-kit.dts} | 2 +-
arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} | 0
configs/microchip_mpfs_icicle_defconfig | 2 +-
doc/board/microchip/mpfs_icicle.rst | 6 +++---
6 files changed, 6 insertions(+), 6 deletions(-)
rename arch/riscv/dts/{microchip-mpfs-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} (100%)
rename arch/riscv/dts/{microchip-mpfs-icicle-kit.dts => mpfs-icicle-kit.dts} (98%)
rename arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} (100%)arch/riscv/dts/Makefile +1 -1
@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AE350) += ae350_32.dtb ae350_64.dtb -dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb +dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += mpfs-icicle-kit.dtb dtb-$(CONFIG_TARGET_QEMU_VIRT) += qemu-virt32.dtb qemu-virt64.dtb dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtb
arch/riscv/dts/mpfs-icicle-kit-u-boot.dtsi renamed from arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi +0 -0
arch/riscv/dts/mpfs-icicle-kit.dts renamed from arch/riscv/dts/microchip-mpfs-icicle-kit.dts +1 -1
@@ -6,7 +6,7 @@ /dts-v1/; -#include "microchip-mpfs.dtsi" +#include "mpfs.dtsi" /* Clock frequency (in Hz) of the rtcclk */ #define RTCCLK_FREQ 1000000
arch/riscv/dts/mpfs.dtsi renamed from arch/riscv/dts/microchip-mpfs.dtsi +0 -0
configs/microchip_mpfs_icicle_defconfig +1 -1
@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_ENV_SIZE=0x2000 -CONFIG_DEFAULT_DEVICE_TREE="microchip-mpfs-icicle-kit" +CONFIG_DEFAULT_DEVICE_TREE="mpfs-icicle-kit" CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MEM_TOP_HIDE=0x400000 CONFIG_SYS_LOAD_ADDR=0x80200000
doc/board/microchip/mpfs_icicle.rst +3 -3
@@ -134,7 +134,7 @@ Build OpenSBI .. code-block:: none make PLATFORM=generic FW_PAYLOAD_PATH=<u-boot-directory>/u-boot.bin - FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/microchip-mpfs-icicle-kit-.dtb + FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/mpfs-icicle-kit-.dtb 3. Output "fw_payload.bin" file available at "<opensbi-directory>/build/platform/generic/firmware/fw_payload.bin"
@@ -277,14 +277,14 @@ load uImage (with initramfs). done Bytes transferred = 14482480 (dcfc30 hex) - RISC-V # tftpboot ${fdt_addr_r} microchip-mpfs-icicle-kit.dtb + RISC-V # tftpboot ${fdt_addr_r} mpfs-icicle-kit.dtb ethernet@20112000: PHY present at 9 ethernet@20112000: Starting autonegotiation... ethernet@20112000: Autonegotiation complete ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800) Using ethernet@20112000 device TFTP from server 192.168.1.3; our IP address is 192.168.1.5 - Filename 'microchip-mpfs-icicle-kit.dtb'. + Filename 'mpfs-icicle-kit.dtb'. Load address: 0x82200000 Loading: # 2.5 MiB/s
Signature · 1 line
2.40.1
A message that is not in the archive (sent off-list or not yet received): SEZPR03MB80645427881E88E85F252B4EC155A@SEZPR03MB8064.apcprd03.prod.outlook.com
Rick Chen
Reviewed-byRe: [PATCH v1 1/3] riscv: dts: drop microchip from dts filenames
Quoted 8 lines
From: Conor Dooley <[email protected]>
Sent: Wednesday, June 07, 2023 6:06 PM
To: [email protected]
Cc: Rick Jian-Zhi Chen(陳建志) <[email protected]>; Leo Yu-Chi Liang(梁育齊) <[email protected]>; Padmarao Begari <[email protected]>; Conor Dooley <[email protected]>
Subject: [PATCH v1 1/3] riscv: dts: drop microchip from dts filenamesThe original names picked for the DT doesn't match Linux's naming scheme and it was renamed there a while ago. Rename it in U-Boot to allow easily syncing dts between the two projects.
Quoted 7 lines
Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/dts/Makefile | 2 +- ...s-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} | 0 .../{microchip-mpfs-icicle-kit.dts => mpfs-icicle-kit.dts} | 2 +- arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} | 0 configs/microchip_mpfs_icicle_defconfig | 2 +- doc/board/microchip/mpfs_icicle.rst | 6 +++---
Re: [PATCH v1 1/3] riscv: dts: drop microchip from dts filenames
In reply to Conor DooleyQuoted 6 lines · Conor Dooley
The original names picked for the DT doesn't match Linux's naming scheme
and it was renamed there a while ago. Rename it in U-Boot to allow easily syncing dts between the two projects.
Quoted 8 lines
Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/dts/Makefile | 2 +- ...s-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} | 0 .../{microchip-mpfs-icicle-kit.dts => mpfs-icicle-kit.dts} | 2 +- arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} | 0 configs/microchip_mpfs_icicle_defconfig | 2 +- doc/board/microchip/mpfs_icicle.rst | 6 +++-
Quoted 98 lines
--
6 files changed, 6 insertions(+), 6 deletions(-) rename arch/riscv/dts/{microchip-mpfs-icicle-kit-u-boot.dtsi => mpfs-icicle-kit-u-boot.dtsi} (100%) rename arch/riscv/dts/{microchip-mpfs-icicle-kit.dts => mpfs-icicle- kit.dts} (98%) rename arch/riscv/dts/{microchip-mpfs.dtsi => mpfs.dtsi} (100%)arch/riscv/dts/Makefile +0
-1@@ -1,7 +1,7 @@ # SPDX-License-Identifier: GPL-2.0+ dtb-$(CONFIG_TARGET_AE350) += ae350_32.dtb ae350_64.dtb -dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += microchip-mpfs-icicle-kit.dtb
arch/riscv/dts/Makefile +1
-0+dtb-$(CONFIG_TARGET_MICROCHIP_ICICLE) += mpfs-icicle-kit.dtb dtb-$(CONFIG_TARGET_QEMU_VIRT) += qemu-virt32.dtb qemu-virt64.dtb dtb-$(CONFIG_TARGET_OPENPITON_RISCV64) += openpiton-riscv64.dtb dtb-$(CONFIG_TARGET_SIFIVE_UNLEASHED) += hifive-unleashed-a00.dtbarch/riscv/dts/mpfs-icicle-kit-u-boot.dtsi renamed from arch/riscv/dts/microchip-mpfs-icicle-kit-u-boot.dtsi +0
-0arch/riscv/dts/mpfs-icicle-kit.dts renamed from arch/riscv/dts/microchip-mpfs-icicle-kit.dts +1
-1@@ -6,7 +6,7 @@ /dts-v1/; -#include "microchip-mpfs.dtsi" +#include "mpfs.dtsi" /* Clock frequency (in Hz) of the rtcclk */ #define RTCCLK_FREQ 1000000arch/riscv/dts/mpfs.dtsi renamed from arch/riscv/dts/microchip-mpfs.dtsi +0
-0configs/microchip_mpfs_icicle_defconfig +1
-1@@ -4,7 +4,7 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_HAS_CUSTOM_SYS_INIT_SP_ADDR=y CONFIG_CUSTOM_SYS_INIT_SP_ADDR=0x80200000 CONFIG_ENV_SIZE=0x2000 -CONFIG_DEFAULT_DEVICE_TREE="microchip-mpfs-icicle-kit" +CONFIG_DEFAULT_DEVICE_TREE="mpfs-icicle-kit" CONFIG_SYS_PROMPT="RISC-V # " CONFIG_SYS_MEM_TOP_HIDE=0x400000 CONFIG_SYS_LOAD_ADDR=0x80200000doc/board/microchip/mpfs_icicle.rst +0
-0@@ -134,7 +134,7 @@ Build OpenSBI .. code-block:: none make PLATFORM=generic FW_PAYLOAD_PATH=<u-boot-directory>/u-boot.bin
- FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/microchip-mpfs-
icicle-kit-.dtb
+ FW_FDT_PATH=<u-boot-directory>/arch/riscv/dts/mpfs-icicle-kit-
.dtb3. Output "fw_payload.bin" file available at
"<opensbi-directory>/build/platform/generic/firmware/fw_payload.bin"
doc/board/microchip/mpfs_icicle.rst +2
-2@@ -277,14 +277,14 @@ load uImage (with initramfs). done Bytes transferred = 14482480 (dcfc30 hex) - RISC-V # tftpboot ${fdt_addr_r} microchip-mpfs-icicle-kit.dtb + RISC-V # tftpboot ${fdt_addr_r} mpfs-icicle-kit.dtb ethernet@20112000: PHY present at 9 ethernet@20112000: Starting autonegotiation... ethernet@20112000: Autonegotiation complete ethernet@20112000: link up, 1000Mbps full-duplex (lpa: 0x7800) Using ethernet@20112000 device TFTP from server 192.168.1.3; our IP address is 192.168.1.5 - Filename 'microchip-mpfs-icicle-kit.dtb'. + Filename 'mpfs-icicle-kit.dtb'. Load address: 0x82200000 Loading: # 2.5 MiB/s
PATCH 2/3 riscv: dts: sync mpfs-icicle devicetree with linux
In reply to Conor DooleyThe "notable" disappearances are:
- the pac193x stanza - there's nothing in mainline linux w.r.t. bindings for this & what is going to appear in mainline linux is going to be incompatible with what is currently in U-Boot.
- operating points - these operating points should not be set at the soc.dtsi level as they may not be possible depending on the design programmed to the FPGA
- clock output names - there are defines for the clock indices, these should not be needed
- the dt maintainers in linux NAKed using defines for IRQ numbers
- the qspi nand, which is not part of the icicle's default configuration is removed.
--- arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi | 71 +++ arch/riscv/dts/mpfs-icicle-kit.dts | 190 +++++--- arch/riscv/dts/mpfs.dtsi | 442 ++++++++---------- .../dt-bindings/clock/microchip-mpfs-clock.h | 29 +- .../microchip-mpfs-plic.h | 196 -------- .../interrupt-controller/riscv-hart.h | 17 - 6 files changed, 420 insertions(+), 525 deletions(-) create mode 100644 arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi delete mode 100644 include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h delete mode 100644 include/dt-bindings/interrupt-controller/riscv-hart.h
arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +71 -0
@@ -0,0 +1,71 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* Copyright (c) 2020-2021 Microchip Technology Inc */ + +/ { + compatible = "microchip,mpfs-icicle-reference-rtlv2210", "microchip,mpfs-icicle-kit", + "microchip,mpfs"; + + core_pwm0: pwm@40000000 { + compatible = "microchip,corepwm-rtl-v4"; + reg = <0x0 0x40000000 0x0 0xF0>; + microchip,sync-update-mask = /bits/ 32 <0>; + #pwm-cells = <3>; + clocks = <&ccc_nw CLK_CCC_PLL0_OUT3>; + status = "disabled"; + }; + + i2c2: i2c@40000200 { + compatible = "microchip,corei2c-rtl-v7"; + reg = <0x0 0x40000200 0x0 0x100>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&ccc_nw CLK_CCC_PLL0_OUT3>; + interrupt-parent = <&plic>; + interrupts = <122>; + clock-frequency = <100000>; + status = "disabled"; + }; + + pcie: pcie@3000000000 { + compatible = "microchip,pcie-host-1.0"; + #address-cells = <0x3>; + #interrupt-cells = <0x1>; + #size-cells = <0x2>; + device_type = "pci"; + reg = <0x30 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 = <&ccc_nw CLK_CCC_PLL0_OUT1>, <&ccc_nw CLK_CCC_PLL0_OUT3>; + clock-names = "fic1", "fic3"; + ranges = <0x3000000 0x0 0x8000000 0x30 0x8000000 0x0 0x80000000>; + dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000 0x1 0x00000000>; + msi-parent = <&pcie>; + msi-controller; + status = "disabled"; + pcie_intc: interrupt-controller { + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; + }; + }; + + refclk_ccc: cccrefclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + }; +}; + +&ccc_nw { + clocks = <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>, + <&refclk_ccc>, <&refclk_ccc>; + clock-names = "pll0_ref0", "pll0_ref1", "pll1_ref0", "pll1_ref1", + "dll0_ref", "dll1_ref"; + status = "okay"; +};
arch/riscv/dts/mpfs-icicle-kit.dts +131 -59
243 lines not on this page · raw message
arch/riscv/dts/mpfs.dtsi +192 -250
670 lines not on this page · raw message
include/dt-bindings/clock/microchip-mpfs-clock.h +26 -3
@@ -1,7 +1,7 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* -* Copyright (C) 2020 Microchip Technology Inc. -* Padmarao Begari <[email protected]> +* Daire McNamara,<[email protected]> +* Copyright (C) 2020-2022 Microchip Technology Inc. All rights reserved. */ #ifndef _DT_BINDINGS_CLK_MICROCHIP_MPFS_H_
@@ -45,4 +45,27 @@#define CLK_RTCREF 33#define CLK_MSSPLL 34 +/* Clock Conditioning Circuitry Clock IDs */ + +#define CLK_CCC_PLL0 0 +#define CLK_CCC_PLL1 1 +#define CLK_CCC_DLL0 2 +#define CLK_CCC_DLL1 3 + +#define CLK_CCC_PLL0_OUT0 4 +#define CLK_CCC_PLL0_OUT1 5 +#define CLK_CCC_PLL0_OUT2 6 +#define CLK_CCC_PLL0_OUT3 7 + +#define CLK_CCC_PLL1_OUT0 8 +#define CLK_CCC_PLL1_OUT1 9 +#define CLK_CCC_PLL1_OUT2 10 +#define CLK_CCC_PLL1_OUT3 11 + +#define CLK_CCC_DLL0_OUT0 12 +#define CLK_CCC_DLL0_OUT1 13 + +#define CLK_CCC_DLL1_OUT0 14 +#define CLK_CCC_DLL1_OUT1 15 +#endif /* _DT_BINDINGS_CLK_MICROCHIP_MPFS_H_ */
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0 -196
196 lines not on this page · raw message
include/dt-bindings/interrupt-controller/riscv-hart.h deleted +0 -17
@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ -/* Copyright (c) 2020-2021 Microchip Technology Inc */ - -#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H -#define _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H - -#define HART_INT_U_SOFT 0 -#define HART_INT_S_SOFT 1 -#define HART_INT_M_SOFT 3 -#define HART_INT_U_TIMER 4 -#define HART_INT_S_TIMER 5 -#define HART_INT_M_TIMER 7 -#define HART_INT_U_EXT 8 -#define HART_INT_S_EXT 9 -#define HART_INT_M_EXT 11 - -#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H */
Signature · 1 line
2.40.1
Re: [PATCH v1 2/3] riscv: dts: sync mpfs-icicle devicetree with linux
Quoted 30 lines · Conor Dooley
The "notable" disappearances are:
- the pac193x stanza - there's nothing in mainline linux w.r.t. bindings
for this & what is going to appear in mainline linux is going to be incompatible with what is currently in U-Boot.
- operating points - these operating points should not be set at thesoc.dtsilevel as they may not be possible depending on the design programmed to the FPGA
- clock output names - there are defines for the clock indices, these should not be needed
- the dt maintainers in linux NAKed using defines for IRQ numbers
- the qspi nand, which is not part of the icicle's default configuration
is removed.Signed-off-by Conor Dooley <[email protected]>--- arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi | 71 +++ arch/riscv/dts/mpfs-icicle-kit.dts | 190 +++++--- arch/riscv/dts/mpfs.dtsi | 442 ++++++++------ ---- .../dt-bindings/clock/microchip-mpfs-clock.h | 29 +- .../microchip-mpfs-plic.h | 196 -------- .../interrupt-controller/riscv-hart.h | 17 - 6 files changed, 420 insertions(+), 525 deletions(-) create mode 100644 arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi delete mode 100644 include/dt-bindings/interrupt- controller/microchip-mpfs-plic.h delete mode 100644 include/dt-bindings/interrupt-controller/riscv-
Quoted 2 lines
hart.h
Quoted 1,477 lines
arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +5
-0@@ -0,0 +1,71 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* Copyright (c) 2020-2021 Microchip Technology Inc */ + +/ { + compatible = "microchip,mpfs-icicle-reference-rtlv2210","microchip,mpfs-icicle-kit",
arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +30
-0+ "microchip,mpfs"; + + core_pwm0: pwm@40000000 { + compatible = "microchip,corepwm-rtl-v4"; + reg = <0x0 0x40000000 0x0 0xF0>; + microchip,sync-update-mask = /bits/ 32 <0>; + #pwm-cells = <3>; + clocks = <&ccc_nw CLK_CCC_PLL0_OUT3>; + status = "disabled"; + }; + + i2c2: i2c@40000200 { + compatible = "microchip,corei2c-rtl-v7"; + reg = <0x0 0x40000200 0x0 0x100>; + #address-cells = <1>; + #size-cells = <0>; + clocks = <&ccc_nw CLK_CCC_PLL0_OUT3>; + interrupt-parent = <&plic>; + interrupts = <122>; + clock-frequency = <100000>; + status = "disabled"; + }; + + pcie: pcie@3000000000 { + compatible = "microchip,pcie-host-1.0"; + #address-cells = <0x3>; + #interrupt-cells = <0x1>; + #size-cells = <0x2>; + device_type = "pci"; + reg = <0x30 0x0 0x0 0x8000000>, <0x0 0x43000000 0x0
0x10000>;arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +10
-0+ 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 = <&ccc_nw CLK_CCC_PLL0_OUT1>, <&ccc_nw
CLK_CCC_PLL0_OUT3>;arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +2
-0+ clock-names = "fic1", "fic3"; + ranges = <0x3000000 0x0 0x8000000 0x30 0x8000000 0x0
0x80000000>;arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +1
-0+ dma-ranges = <0x02000000 0x0 0x00000000 0x0 0x00000000
0x10x00000000>;arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +18
-0+ msi-parent = <&pcie>; + msi-controller; + status = "disabled"; + pcie_intc: interrupt-controller { + #address-cells = <0>; + #interrupt-cells = <1>; + interrupt-controller; + }; + }; + + refclk_ccc: cccrefclk { + compatible = "fixed-clock"; + #clock-cells = <0>; + }; +}; + +&ccc_nw { + clocks = <&refclk_ccc>, <&refclk_ccc>, <&refclk_ccc>,<
&refclk_ccc>,arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +2
-0+ <&refclk_ccc>, <&refclk_ccc>; + clock-names = "pll0_ref0", "pll0_ref1", "pll1_ref0","
pll1_ref1",arch/riscv/dts/mpfs-icicle-kit-fabric.dtsi new file +3
-0+ "dll0_ref", "dll1_ref"; + status = "okay"; +};arch/riscv/dts/mpfs-icicle-kit.dts +39
-5@@ -7,29 +7,63 @@ /dts-v1/; #include "mpfs.dtsi" +#include "mpfs-icicle-kit-fabric.dtsi" +#include <dt-bindings/gpio/gpio.h> +#include <dt-bindings/leds/common.h> /* Clock frequency (in Hz) of the rtcclk */ #define RTCCLK_FREQ 1000000 / { model = "Microchip PolarFire-SoC Icicle Kit"; - compatible = "microchip,mpfs-icicle-reference-rtlv2210", - "microchip,mpfs-icicle-kit", "microchip,mpfs"; + compatible = "microchip,mpfs-icicle-reference-rtlv2210", "microchip,mpfs-icicle-kit", + "microchip,mpfs"; aliases { - serial1 = &uart1; ethernet0 = &mac1; - spi0 = &qspi; + serial0 = &mmuart0; + serial1 = &mmuart1; + serial2 = &mmuart2; + serial3 = &mmuart3; + serial4 = &mmuart4; }; chosen { - stdout-path = "serial1"; + stdout-path = "serial1:115200n8"; }; cpus { timebase-frequency = <RTCCLK_FREQ>; }; + leds { + compatible = "gpio-leds"; + + led-1 { + gpios = <&gpio2 16 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_RED>; + label = "led1"; + }; + + led-2 { + gpios = <&gpio2 17 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_RED>; + label = "led2"; + }; + + led-3 { + gpios = <&gpio2 18 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_AMBER>; + label = "led3"; + }; + + led-4 { + gpios = <&gpio2 19 GPIO_ACTIVE_HIGH>; + color = <LED_COLOR_ID_AMBER>; + label = "led4"; + }; + }; + ddrc_cache_lo: memory@80000000 { device_type = "memory";arch/riscv/dts/mpfs-icicle-kit.dts +92
-54reg = <0x0 0x80000000 0x0 0x40000000>;@@ -54,83 +88,121 @@ }; }; -&refclk { - clock-frequency = <125000000>; +&core_pwm0 { + status = "okay"; }; -&uart1 { +&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"; +}; + +&i2c0 { + status = "okay"; +}; + +&i2c1 { + status = "okay"; +}; + +&i2c2 { + status = "okay"; +}; + +&mac0 { + phy-mode = "sgmii"; + phy-handle = <&phy0>; + status = "enabled"; +}; + +&mac1 { + phy-mode = "sgmii"; + phy-handle = <&phy1>; + status = "okay"; + + phy1: ethernet-phy@9 { + reg = <9>; + }; + + phy0: ethernet-phy@8 { + reg = <8>; + }; +}; + +&mbox { status = "okay"; }; &mmc { - status = "okay"; - bus-width = <4>; disable-wp; - cap-mmc-highspeed; cap-sd-highspeed; - card-detect-delay = <200>; + cap-mmc-highspeed; mmc-ddr-1_8v; mmc-hs200-1_8v; sd-uhs-sdr12; sd-uhs-sdr25; sd-uhs-sdr50; sd-uhs-sdr104; + status = "okay"; }; -&i2c1 { +&mmuart1 { status = "okay"; - clock-frequency = <100000>; - - pac193x: pac193x@10 { - compatible = "microchip,pac1934"; - reg = <0x10>; - samp-rate = <64>; - status = "okay"; - ch1: channel0 { - uohms-shunt-res = <10000>; - rail-name = "VDDREG"; - channel_enabled; - }; - ch2: channel1 { - uohms-shunt-res = <10000>; - rail-name = "VDDA25"; - channel_enabled; - }; - ch3: channel2 { - uohms-shunt-res = <10000>; - rail-name = "VDD25"; - channel_enabled; - }; - ch4: channel3 { - uohms-shunt-res = <10000>; - rail-name = "VDDA_REG"; - channel_enabled; - }; - }; }; -&mac1 { +&mmuart2 { + status = "okay"; +}; + +&mmuart3 { + status = "okay"; +}; + +&mmuart4 { + status = "okay"; +}; + +&pcie { status = "okay"; - phy-mode = "sgmii"; - phy-handle = <&phy1>; - phy1: ethernet-phy@9 { - reg = <9>; - ti,fifo-depth = <0x1>; - }; }; &qspi { status = "okay"; - num-cs = <1>; - - flash0: flash@0 { - compatible = "spi-nand"; - reg = <0x0>; - spi-tx-bus-width = <4>; - spi-rx-bus-width = <4>; - spi-max-frequency = <20000000>; - spi-cpol; - spi-cpha; - }; +}; + +&refclk { + clock-frequency = <125000000>; +}; + +&refclk_ccc { + clock-frequency = <50000000>; +}; + +&rtc { + status = "okay"; +}; + +&spi0 { + status = "okay"; +}; + +&spi1 { + status = "okay"; +}; + +&syscontroller { + status = "okay"; +}; + +&usb { + status = "okay"; + dr_mode = "host"; };arch/riscv/dts/mpfs.dtsi +39
-42@@ -2,8 +2,6 @@ /* Copyright (c) 2020-2021 Microchip Technology Inc */ #include "dt-bindings/clock/microchip-mpfs-clock.h" -#include "dt-bindings/interrupt-controller/microchip-mpfs-plic.h" -#include "dt-bindings/interrupt-controller/riscv-hart.h" / { #address-cells = <2>;@@ -11,9 +9,6 @@ model = "Microchip PolarFire SoC"; compatible = "microchip,mpfs"; - chosen { - }; - cpus { #address-cells = <1>; #size-cells = <0>;@@ -28,12 +23,7 @@ riscv,isa = "rv64imac"; clocks = <&clkcfg CLK_CPU>; status = "disabled"; - operating-points = < - /* kHz uV */ - 600000 1100000 - 300000 950000 - 150000 750000 - >; + cpu0_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc";@@ -59,13 +49,9 @@ riscv,isa = "rv64imafdc"; clocks = <&clkcfg CLK_CPU>; tlb-split; + next-level-cache = <&cctrllr>; status = "okay"; - operating-points = < - /* kHz uV */ - 600000 1100000 - 300000 950000 - 150000 750000 - >; + cpu1_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc";@@ -91,13 +77,9 @@ riscv,isa = "rv64imafdc"; clocks = <&clkcfg CLK_CPU>; tlb-split; + next-level-cache = <&cctrllr>; status = "okay"; - operating-points = < - /* kHz uV */ - 600000 1100000 - 300000 950000 - 150000 750000 - >; + cpu2_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc";@@ -123,13 +105,9 @@ riscv,isa = "rv64imafdc"; clocks = <&clkcfg CLK_CPU>; tlb-split; + next-level-cache = <&cctrllr>; status = "okay"; - operating-points = < - /* kHz uV */ - 600000 1100000 - 300000 950000 - 150000 750000 - >; + cpu3_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc";@@ -155,273 +133,322 @@ riscv,isa = "rv64imafdc"; clocks = <&clkcfg CLK_CPU>; tlb-split; + next-level-cache = <&cctrllr>; status = "okay"; - operating-points = < - /* kHz uV */ - 600000 1100000 - 300000 950000 - 150000 750000 - >; cpu4_intc: interrupt-controller { #interrupt-cells = <1>; compatible = "riscv,cpu-intc"; interrupt-controller; }; }; + + cpu-map { + cluster0 { + core0 { + cpu = <&cpu0>; + }; + + core1 { + cpu = <&cpu1>; + }; + + core2 { + cpu = <&cpu2>; + }; + + core3 { + cpu = <&cpu3>; + }; + + core4 { + cpu = <&cpu4>; + }; + }; + }; }; - refclk: refclk { + 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 = "microchip,mpfs-soc", "simple-bus"; + compatible = "simple-bus"; ranges; - clint: clint@2000000 { - compatible = "sifive,clint0"; - reg = <0x0 0x2000000 0x0 0xC000>; - interrupts-extended = - <&cpu0_intc HART_INT_M_SOFT
&cpu0_intcHART_INT_M_TIMERarch/riscv/dts/mpfs.dtsi +0
-1- &cpu1_intc HART_INT_M_SOFT
&cpu1_intcHART_INT_M_TIMERarch/riscv/dts/mpfs.dtsi +0
-1- &cpu2_intc HART_INT_M_SOFT
&cpu2_intcHART_INT_M_TIMERarch/riscv/dts/mpfs.dtsi +0
-1- &cpu3_intc HART_INT_M_SOFT
&cpu3_intcHART_INT_M_TIMERarch/riscv/dts/mpfs.dtsi +0
-1- &cpu4_intc HART_INT_M_SOFT
&cpu4_intcHART_INT_M_TIMER>;arch/riscv/dts/mpfs.dtsi +0
-4- }; - - cachecontroller: cache-controller@2010000 { - compatible = "sifive,fu540-c000-ccache","cache";
arch/riscv/dts/mpfs.dtsi +2
-0+ cctrllr: cache-controller@2010000 { + compatible = "microchip,mpfs-ccache","sifive,fu540-c000-ccache", "cache";
arch/riscv/dts/mpfs.dtsi +2
-6reg = <0x0 0x2010000 0x0 0x1000>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_L2_METADATA_CORR - PLIC_INT_L2_METADATA_UNCORR - PLIC_INT_L2_DATA_CORR>; cache-block-size = <64>; cache-level = <2>; cache-sets = <1024>; cache-size = <2097152>; cache-unified; + interrupt-parent = <&plic>; + interrupts = <1>, <3>, <4>, <2>; }; - pdma: pdma@3000000 { - compatible = "microchip,mpfs-pdma-uio","sifive,fu540-c000-pdma";
arch/riscv/dts/mpfs.dtsi +0
-3- reg = <0x0 0x3000000 0x0 0x8000>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_DMA_CH0_DONE
PLIC_INT_DMA_CH0_ERRarch/riscv/dts/mpfs.dtsi +0
-1- PLIC_INT_DMA_CH1_DONE
PLIC_INT_DMA_CH1_ERRarch/riscv/dts/mpfs.dtsi +0
-1- PLIC_INT_DMA_CH2_DONE
PLIC_INT_DMA_CH2_ERRarch/riscv/dts/mpfs.dtsi +0
-1- PLIC_INT_DMA_CH3_DONE
PLIC_INT_DMA_CH3_ERR>;arch/riscv/dts/mpfs.dtsi +2
-1- #dma-cells = <1>; + clint: clint@2000000 { + compatible = "sifive,fu540-c000-clint","sifive,clint0";
arch/riscv/dts/mpfs.dtsi +2
-0+ reg = <0x0 0x2000000 0x0 0xC000>; + interrupts-extended = <&cpu0_intc 3>,<
&cpu0_intc7>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu1_intc 3>,<
&cpu1_intc7>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu2_intc 3>,<
&cpu2_intc7>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu3_intc 3>,<
&cpu3_intc7>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu4_intc 3>,<
&cpu4_intc7>;arch/riscv/dts/mpfs.dtsi +1
-1}; plic: interrupt-controller@c000000 { - compatible = "sifive,plic-1.0.0"; + compatible = "sifive,fu540-c000-plic","sifive,plic-1.0.0";
arch/riscv/dts/mpfs.dtsi +1
-2reg = <0x0 0xc000000 0x0 0x4000000>; + #address-cells = <0>; #interrupt-cells = <1>; - riscv,ndev = <186>; interrupt-controller; - interrupts-extended = <&cpu0_intc
HART_INT_M_EXTarch/riscv/dts/mpfs.dtsi +0
-1- &cpu1_intc HART_INT_M_EXT
&cpu1_intcHART_INT_S_EXTarch/riscv/dts/mpfs.dtsi +0
-1- &cpu2_intc HART_INT_M_EXT
&cpu2_intcHART_INT_S_EXTarch/riscv/dts/mpfs.dtsi +0
-1- &cpu3_intc HART_INT_M_EXT
&cpu3_intcHART_INT_S_EXTarch/riscv/dts/mpfs.dtsi +0
-1- &cpu4_intc HART_INT_M_EXT
&cpu4_intcHART_INT_S_EXT>;arch/riscv/dts/mpfs.dtsi +2
-0+ interrupts-extended = <&cpu0_intc 11>, + <&cpu1_intc 11>,<
&cpu1_intc9>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu2_intc 11>,<
&cpu2_intc9>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu3_intc 11>,<
&cpu3_intc9>,arch/riscv/dts/mpfs.dtsi +1
-0+ <&cpu4_intc 11>,<
&cpu4_intc9>;arch/riscv/dts/mpfs.dtsi +5
-0+ riscv,ndev = <186>; + }; + + pdma: dma-controller@3000000 { + compatible = "sifive,fu540-c000-pdma","sifive,pdma0";
arch/riscv/dts/mpfs.dtsi +5
-0+ reg = <0x0 0x3000000 0x0 0x8000>; + interrupt-parent = <&plic>; + interrupts = <5 6>, <7 8>, <9 10>, <11 12>; + dma-channels = <4>; + #dma-cells = <1>; }; clkcfg: clkcfg@20002000 { compatible = "microchip,mpfs-clkcfg"; reg = <0x0 0x20002000 0x0 0x1000>, <0x0
0x3E0010000x00x1000>;arch/riscv/dts/mpfs.dtsi +0
-2- reg-names = "mss_sysreg"; clocks = <&refclk>; #clock-cells = <1>; - clock-output-names = "cpu", "axi", "ahb","envm", /* 0-3 */
arch/riscv/dts/mpfs.dtsi +0
-1- "mac0", "mac1", "mmc", "timer",/* 4-7 */arch/riscv/dts/mpfs.dtsi +0
-1- "mmuart0", "mmuart1", "mmuart2","mmuart3", /* 8-11 */
arch/riscv/dts/mpfs.dtsi +0
-1- "mmuart4", "spi0", "spi1", "i2c0",/* 12-15 */arch/riscv/dts/mpfs.dtsi +0
-1- "i2c1", "can0", "can1", "usb",/* 16-19 */arch/riscv/dts/mpfs.dtsi +0
-1- "rsvd", "rtc", "qspi", "gpio0",/* 20-23 */arch/riscv/dts/mpfs.dtsi +0
-1- "gpio1", "gpio2", "ddrc", "fic0",/* 24-27 */arch/riscv/dts/mpfs.dtsi +0
-1- "fic1", "fic2", "fic3", "athena","cfm"; /* 28-32 */
arch/riscv/dts/mpfs.dtsi +1
-3+ #reset-cells = <1>; }; - /* Common node entry for eMMC/SD */ - mmc: mmc@20008000 { - compatible = "microchip,mpfs-sd4hc","cdns,sd4hc";
arch/riscv/dts/mpfs.dtsi +0
-4- reg = <0x0 0x20008000 0x0 0x1000>; - clocks = <&clkcfg CLK_MMC>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMC_MAIN
PLIC_INT_MMC_WAKEUP>;arch/riscv/dts/mpfs.dtsi +3
-1- max-frequency = <200000000>; + ccc_se: clock-controller@38010000 { + compatible = "microchip,mpfs-ccc"; + reg = <0x0 0x38010000 0x0 0x1000>, <0x0
0x380200000x00x1000>,arch/riscv/dts/mpfs.dtsi +1
-0+ <0x0 0x39010000 0x0 0x1000>, <0x0
0x390200000x00x1000>;arch/riscv/dts/mpfs.dtsi +4
-1+ #clock-cells = <1>; status = "disabled"; }; - uart0: serial@20000000 { + ccc_ne: clock-controller@38040000 { + compatible = "microchip,mpfs-ccc"; + reg = <0x0 0x38040000 0x0 0x1000>, <0x0
0x380800000x00x1000>,arch/riscv/dts/mpfs.dtsi +1
-0+ <0x0 0x39040000 0x0 0x1000>, <0x0
0x390800000x00x1000>;arch/riscv/dts/mpfs.dtsi +7
-0+ #clock-cells = <1>; + status = "disabled"; + }; + + ccc_nw: clock-controller@38100000 { + compatible = "microchip,mpfs-ccc"; + reg = <0x0 0x38100000 0x0 0x1000>, <0x0
0x382000000x00x1000>,arch/riscv/dts/mpfs.dtsi +1
-0+ <0x0 0x39100000 0x0 0x1000>, <0x0
0x392000000x00x1000>;arch/riscv/dts/mpfs.dtsi +7
-0+ #clock-cells = <1>; + status = "disabled"; + }; + + ccc_sw: clock-controller@38400000 { + compatible = "microchip,mpfs-ccc"; + reg = <0x0 0x38400000 0x0 0x1000>, <0x0
0x388000000x00x1000>,arch/riscv/dts/mpfs.dtsi +1
-0+ <0x0 0x39400000 0x0 0x1000>, <0x0
0x398000000x00x1000>;arch/riscv/dts/mpfs.dtsi +25
-9+ #clock-cells = <1>; + status = "disabled"; + }; + + mmuart0: serial@20000000 { compatible = "ns16550a"; reg = <0x0 0x20000000 0x0 0x400>; reg-io-width = <4>; reg-shift = <2>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMUART0>; + interrupts = <90>; + current-speed = <115200>; clocks = <&clkcfg CLK_MMUART0>; status = "disabled"; /* Reserved for the HSS */ }; - uart1: serial@20100000 { + mmuart1: serial@20100000 { compatible = "ns16550a"; reg = <0x0 0x20100000 0x0 0x400>; reg-io-width = <4>; reg-shift = <2>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMUART1>; + interrupts = <91>; + current-speed = <115200>; clocks = <&clkcfg CLK_MMUART1>; status = "disabled"; }; - uart2: serial@20102000 { + mmuart2: serial@20102000 { compatible = "ns16550a"; reg = <0x0 0x20102000 0x0 0x400>; reg-io-width = <4>; reg-shift = <2>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMUART2>; + interrupts = <92>; + current-speed = <115200>; clocks = <&clkcfg CLK_MMUART2>; status = "disabled"; }; - uart3: serial@20104000 { + mmuart3: serial@20104000 { compatible = "ns16550a"; reg = <0x0 0x20104000 0x0 0x400>; reg-io-width = <4>; reg-shift = <2>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMUART3>; + interrupts = <93>; + current-speed = <115200>; clocks = <&clkcfg CLK_MMUART3>; status = "disabled"; }; - uart4: serial@20106000 { + mmuart4: serial@20106000 { compatible = "ns16550a"; reg = <0x0 0x20106000 0x0 0x400>; reg-io-width = <4>; reg-shift = <2>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MMUART4>; + 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";
arch/riscv/dts/mpfs.dtsi +18
-10+ 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"; - reg = <0x0 0x20108000 0x0 0x1000>; - clocks = <&clkcfg CLK_SPI0>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_SPI0>; - num-cs = <8>; #address-cells = <1>; #size-cells = <0>; + reg = <0x0 0x20108000 0x0 0x1000>; + interrupt-parent = <&plic>; + interrupts = <54>; + clocks = <&clkcfg CLK_SPI0>; status = "disabled"; }; spi1: spi@20109000 { compatible = "microchip,mpfs-spi"; - reg = <0x0 0x20109000 0x0 0x1000>; - clocks = <&clkcfg CLK_SPI1>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_SPI1>; - num-cs = <8>; #address-cells = <1>; #size-cells = <0>; + reg = <0x0 0x20109000 0x0 0x1000>; + interrupt-parent = <&plic>; + interrupts = <55>; + clocks = <&clkcfg CLK_SPI1>; + status = "disabled"; + }; + + qspi: spi@21000000 { + compatible = "microchip,mpfs-qspi","microchip,coreqspi-rtl-v2";
arch/riscv/dts/mpfs.dtsi +7
-1+ #address-cells = <1>; + #size-cells = <0>; + reg = <0x0 0x21000000 0x0 0x1000>; + interrupt-parent = <&plic>; + interrupts = <85>; + clocks = <&clkcfg CLK_QSPI>; status = "disabled"; }; i2c0: i2c@2010a000 { - compatible = "microchip,mpfs-i2c"; + compatible = "microchip,mpfs-i2c","microchip,corei2c-rtl-v7";
arch/riscv/dts/mpfs.dtsi +5
-4reg = <0x0 0x2010a000 0x0 0x1000>; - clocks = <&clkcfg CLK_I2C0>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_I2C0_MAIN>; #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"; + compatible = "microchip,mpfs-i2c","microchip,corei2c-rtl-v7";
arch/riscv/dts/mpfs.dtsi +9
-12reg = <0x0 0x2010b000 0x0 0x1000>; - clocks = <&clkcfg CLK_I2C1>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_I2C1_MAIN>; #address-cells = <1>; #size-cells = <0>; + interrupt-parent = <&plic>; + interrupts = <61>; + clocks = <&clkcfg CLK_I2C1>; + clock-frequency = <100000>; status = "disabled"; }; can0: can@2010c000 { - compatible = "microchip,mpfs-can-uio"; + compatible = "microchip,mpfs-can"; reg = <0x0 0x2010c000 0x0 0x1000>; clocks = <&clkcfg CLK_CAN0>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_CAN0>; - #address-cells = <1>; - #size-cells = <0>; + interrupts = <56>; status = "disabled"; }; can1: can@2010d000 { - compatible = "microchip,mpfs-can-uio"; + compatible = "microchip,mpfs-can"; reg = <0x0 0x2010d000 0x0 0x1000>; clocks = <&clkcfg CLK_CAN1>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_CAN1>; - #address-cells = <1>; - #size-cells = <0>; + interrupts = <57>; status = "disabled"; }; mac0: ethernet@20110000 { - compatible = "cdns,macb"; + compatible = "microchip,mpfs-macb","cdns,macb";
arch/riscv/dts/mpfs.dtsi +2
-11reg = <0x0 0x20110000 0x0 0x2000>; - clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>; - clock-names = "pclk", "hclk"; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MAC0_INT - PLIC_INT_MAC0_QUEUE1 - PLIC_INT_MAC0_QUEUE2 - PLIC_INT_MAC0_QUEUE3 - PLIC_INT_MAC0_EMAC - PLIC_INT_MAC0_MMSL>; - local-mac-address = [00 00 00 00 00 00]; - status = "disabled"; #address-cells = <1>; #size-cells = <0>; + interrupt-parent = <&plic>; + interrupts = <64>, <65>, <66>, <67>, <68>,<69>;
arch/riscv/dts/mpfs.dtsi +6
-1+ local-mac-address = [00 00 00 00 00 00]; + clocks = <&clkcfg CLK_MAC0>, <&clkcfg CLK_AHB>; + clock-names = "pclk", "hclk"; + resets = <&clkcfg CLK_MAC0>; + status = "disabled"; }; mac1: ethernet@20112000 { - compatible = "cdns,macb"; + compatible = "microchip,mpfs-macb","cdns,macb";
arch/riscv/dts/mpfs.dtsi +2
-11reg = <0x0 0x20112000 0x0 0x2000>; - clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>; - clock-names = "pclk", "hclk"; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_MAC1_INT - PLIC_INT_MAC1_QUEUE1 - PLIC_INT_MAC1_QUEUE2 - PLIC_INT_MAC1_QUEUE3 - PLIC_INT_MAC1_EMAC - PLIC_INT_MAC1_MMSL>; - local-mac-address = [00 00 00 00 00 00]; - status = "disabled"; #address-cells = <1>; #size-cells = <0>; + interrupt-parent = <&plic>; + interrupts = <70>, <71>, <72>, <73>, <74>,<75>;
arch/riscv/dts/mpfs.dtsi +24
-39+ local-mac-address = [00 00 00 00 00 00]; + clocks = <&clkcfg CLK_MAC1>, <&clkcfg CLK_AHB>; + clock-names = "pclk", "hclk"; + resets = <&clkcfg CLK_MAC1>; + status = "disabled"; }; gpio0: gpio@20120000 { compatible = "microchip,mpfs-gpio"; reg = <0x0 0x20120000 0x0 0x1000>; - reg-names = "control"; - clocks = <&clkcfg CLK_GPIO0>; interrupt-parent = <&plic>; + interrupt-controller; + #interrupt-cells = <1>; + clocks = <&clkcfg CLK_GPIO0>; gpio-controller; #gpio-cells = <2>; status = "disabled";@@ -429,10 +456,11 @@ gpio1: gpio@20121000 { compatible = "microchip,mpfs-gpio"; - reg = <000 0x20121000 0x0 0x1000>; - reg-names = "control"; - clocks = <&clkcfg CLK_GPIO1>; + reg = <0x0 0x20121000 0x0 0x1000>; interrupt-parent = <&plic>; + interrupt-controller; + #interrupt-cells = <1>; + clocks = <&clkcfg CLK_GPIO1>; gpio-controller; #gpio-cells = <2>; status = "disabled";@@ -441,9 +469,10 @@ gpio2: gpio@20122000 { compatible = "microchip,mpfs-gpio"; reg = <0x0 0x20122000 0x0 0x1000>; - reg-names = "control"; - clocks = <&clkcfg CLK_GPIO2>; interrupt-parent = <&plic>; + interrupt-controller; + #interrupt-cells = <1>; + clocks = <&clkcfg CLK_GPIO2>; gpio-controller; #gpio-cells = <2>; status = "disabled";@@ -452,118 +481,31 @@ rtc: rtc@20124000 { compatible = "microchip,mpfs-rtc"; reg = <0x0 0x20124000 0x0 0x1000>; - clocks = <&clkcfg CLK_RTC>; - clock-names = "rtc"; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_RTC_WAKEUP PLIC_INT_RTC_MATCH>; - #address-cells = <1>; - #size-cells = <0>; + interrupts = <80>, <81>; + clocks = <&clkcfg CLK_RTC>, <&clkcfg CLK_RTCREF>; + clock-names = "rtc", "rtcref"; status = "disabled"; }; usb: usb@20201000 { - compatible = "microchip,mpfs-usb-host"; + compatible = "microchip,mpfs-musb"; reg = <0x0 0x20201000 0x0 0x1000>; - reg-names = "mc","control"; + interrupt-parent = <&plic>; + interrupts = <86>, <87>; clocks = <&clkcfg CLK_USB>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_USB_DMA PLIC_INT_USB_MC>; interrupt-names = "dma","mc"; - dr_mode = "host"; - status = "disabled"; - }; - - qspi: qspi@21000000 { - compatible = "microchip,mpfs-qspi"; - reg = <0x0 0x21000000 0x0 0x1000>; - clocks = <&clkcfg CLK_QSPI>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_QSPI>; - num-cs = <8>; - #address-cells = <1>; - #size-cells = <0>; status = "disabled"; }; mbox: mailbox@37020000 { compatible = "microchip,mpfs-mailbox"; - reg = <0x0 0x37020000 0x0 0x1000>, <0x0 0x2000318C 0x0 0x40>; + reg = <0x0 0x37020000 0x0 0x58>, <0x0 0x2000318C 0x0 0x40>, + <0x0 0x37020800 0x0 0x100>; interrupt-parent = <&plic>; - interrupts = <PLIC_INT_G5C_MESSAGE>; + interrupts = <96>; #mbox-cells = <1>; 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
0x00x10000>;arch/riscv/dts/mpfs.dtsi +0
-2- reg-names = "cfg", "apb"; - clocks = <&clkcfg CLK_FIC0>, <&clkcfg
CLK_FIC1>, <&clkcfgCLK_FIC3>;arch/riscv/dts/mpfs.dtsi +0
-10- clock-names = "fic0", "fic1", "fic3"; - bus-range = <0x0 0x7f>; - interrupt-parent = <&plic>; - interrupts = <PLIC_INT_FABRIC_F2H_2>; - 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>; - ranges = <0x3000000 0x0 0x8000000 0x20
0x80000000x00x80000000>;arch/riscv/dts/mpfs.dtsi +0
-52- msi-parent = <&pcie>; - msi-controller; - mchp,axi-m-atr0 = <0x10 0x0>; - status = "disabled"; - pcie_intc: legacy-interrupt-controller { - #address-cells = <0>; - #interrupt-cells = <1>; - interrupt-controller; - }; - }; - - syscontroller: syscontroller { - compatible = "microchip,mpfs-sys-controller"; - #address-cells = <1>; - #size-cells = <1>; - mboxes = <&mbox 0>; - }; - - hwrandom: hwrandom { - compatible = "microchip,mpfs-rng"; - #address-cells = <1>; - #size-cells = <1>; - syscontroller = <&syscontroller>; - }; - - serialnum: serialnum { - compatible = "microchip,mpfs-serial-number"; - #address-cells = <1>; - #size-cells = <1>; - syscontroller = <&syscontroller>; - }; - - fpgadigest: fpgadigest { - compatible = "microchip,mpfs-digest"; - #address-cells = <1>; - #size-cells = <1>; - syscontroller = <&syscontroller>; - }; - - devicecert: cert { - compatible = "microchip,mpfs-device-cert"; - #address-cells = <1>; - #size-cells = <1>; - syscontroller = <&syscontroller>; - }; - - signature: signature { - compatible = "microchip,mpfs-signature"; - #address-cells = <1>; - #size-cells = <1>; - syscontroller = <&syscontroller>; - }; }; };include/dt-bindings/clock/microchip-mpfs-clock.h +3
-3@@ -1,7 +1,7 @@ -/* SPDX-License-Identifier: (GPL-2.0 OR MIT) */ +/* SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) */ /* -* Copyright (C) 2020 Microchip Technology Inc. -* Padmarao Begari <[email protected]> +* Daire McNamara,<[email protected]> +* Copyright (C) 2020-2022 Microchip Technology Inc. All rights reserved.
*/#ifndef _DT_BINDINGS_CLK_MICROCHIP_MPFS_H_
include/dt-bindings/clock/microchip-mpfs-clock.h +23
-0@@ -45,4 +45,27 @@#define CLK_RTCREF 33#define CLK_MSSPLL 34 +/* Clock Conditioning Circuitry Clock IDs */ + +#define CLK_CCC_PLL0 0 +#define CLK_CCC_PLL1 1 +#define CLK_CCC_DLL0 2 +#define CLK_CCC_DLL1 3 + +#define CLK_CCC_PLL0_OUT0 4 +#define CLK_CCC_PLL0_OUT1 5 +#define CLK_CCC_PLL0_OUT2 6 +#define CLK_CCC_PLL0_OUT3 7 + +#define CLK_CCC_PLL1_OUT0 8 +#define CLK_CCC_PLL1_OUT1 9 +#define CLK_CCC_PLL1_OUT2 10 +#define CLK_CCC_PLL1_OUT3 11 + +#define CLK_CCC_DLL0_OUT0 12 +#define CLK_CCC_DLL0_OUT1 13 + +#define CLK_CCC_DLL1_OUT0 14 +#define CLK_CCC_DLL1_OUT1 15 +#endif /* _DT_BINDINGS_CLK_MICROCHIP_MPFS_H_ */ (quoted diff) +0
-0
plic.hb/include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h
deleted file mode 100644
index eba1bac7df..0000000000include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-7@@ -1,196 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ -/* Copyright (c) 2020-2021 Microchip Technology Inc */ - -#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_MICROCHIP_MPFS_PLIC_H -#define _DT_BINDINGS_INTERRUPT_CONTROLLER_MICROCHIP_MPFS_PLIC_H - -#define PLIC_INT_INVALID 0
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-3-#define PLIC_INT_L2_METADATA_CORR 1 -#define PLIC_INT_L2_METADATA_UNCORR 2 -#define PLIC_INT_L2_DATA_CORR 3
-#definePLIC_INT_L2_DATA_UNCORR
4
-#definePLIC_INT_DMA_CH0_DONE
5include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-2-#define PLIC_INT_DMA_CH0_ERR 6 -#define PLIC_INT_DMA_CH1_DONE 7
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-2-#define PLIC_INT_DMA_CH1_ERR 8 -#define PLIC_INT_DMA_CH2_DONE 9
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-2-#define PLIC_INT_DMA_CH2_ERR 10 -#define PLIC_INT_DMA_CH3_DONE 11
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-44-#define PLIC_INT_DMA_CH3_ERR 12 - -#define PLIC_INT_GPIO0_BIT0_OR_GPIO2_BIT0 13 -#define PLIC_INT_GPIO0_BIT1_OR_GPIO2_BIT1 14 -#define PLIC_INT_GPIO0_BIT2_OR_GPIO2_BIT2 15 -#define PLIC_INT_GPIO0_BIT3_OR_GPIO2_BIT3 16 -#define PLIC_INT_GPIO0_BIT4_OR_GPIO2_BIT4 17 -#define PLIC_INT_GPIO0_BIT5_OR_GPIO2_BIT5 18 -#define PLIC_INT_GPIO0_BIT6_OR_GPIO2_BIT6 19 -#define PLIC_INT_GPIO0_BIT7_OR_GPIO2_BIT7 20 -#define PLIC_INT_GPIO0_BIT8_OR_GPIO2_BIT8 21 -#define PLIC_INT_GPIO0_BIT9_OR_GPIO2_BIT9 22 -#define PLIC_INT_GPIO0_BIT10_OR_GPIO2_BIT10 23 -#define PLIC_INT_GPIO0_BIT11_OR_GPIO2_BIT11 24 -#define PLIC_INT_GPIO0_BIT12_OR_GPIO2_BIT12 25 -#define PLIC_INT_GPIO0_BIT13_OR_GPIO2_BIT13 26 -#define PLIC_INT_GPIO1_BIT0_OR_GPIO2_BIT14 27 -#define PLIC_INT_GPIO1_BIT1_OR_GPIO2_BIT15 28 -#define PLIC_INT_GPIO1_BIT2_OR_GPIO2_BIT16 29 -#define PLIC_INT_GPIO1_BIT3_OR_GPIO2_BIT17 30 -#define PLIC_INT_GPIO1_BIT4_OR_GPIO2_BIT18 31 -#define PLIC_INT_GPIO1_BIT5_OR_GPIO2_BIT19 32 -#define PLIC_INT_GPIO1_BIT6_OR_GPIO2_BIT20 33 -#define PLIC_INT_GPIO1_BIT7_OR_GPIO2_BIT21 34 -#define PLIC_INT_GPIO1_BIT8_OR_GPIO2_BIT22 35 -#define PLIC_INT_GPIO1_BIT9_OR_GPIO2_BIT23 36 -#define PLIC_INT_GPIO1_BIT10_OR_GPIO2_BIT24 37 -#define PLIC_INT_GPIO1_BIT11_OR_GPIO2_BIT25 38 -#define PLIC_INT_GPIO1_BIT12_OR_GPIO2_BIT26 39 -#define PLIC_INT_GPIO1_BIT13_OR_GPIO2_BIT27 40 -#define PLIC_INT_GPIO1_BIT14_OR_GPIO2_BIT28 41 -#define PLIC_INT_GPIO1_BIT15_OR_GPIO2_BIT29 42 -#define PLIC_INT_GPIO1_BIT16_OR_GPIO2_BIT30 43 -#define PLIC_INT_GPIO1_BIT17_OR_GPIO2_BIT31 44 -#define PLIC_INT_GPIO1_BIT18 45 -#define PLIC_INT_GPIO1_BIT19 46 -#define PLIC_INT_GPIO1_BIT20 47 -#define PLIC_INT_GPIO1_BIT21 48 -#define PLIC_INT_GPIO1_BIT22 49 -#define PLIC_INT_GPIO1_BIT23 50 -#define PLIC_INT_GPIO0_NON_DIRECT 51 -#define PLIC_INT_GPIO1_NON_DIRECT 52 -#define PLIC_INT_GPIO2_NON_DIRECT 53 -#define PLIC_INT_SPI0 54 -#define PLIC_INT_SPI1 55 -#define PLIC_INT_CAN0 56 -#define PLIC_INT_CAN1 57-#define
PLIC_INT_I2C0_MAIN
58
-#definePLIC_INT_I2C0_ALERT
59
-#definePLIC_INT_I2C0_SUS
60
-#definePLIC_INT_I2C1_MAIN
61
-#definePLIC_INT_I2C1_ALERT
62
-#definePLIC_INT_I2C1_SUS
63
-#definePLIC_INT_MAC0_INT
64include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-4-#define PLIC_INT_MAC0_QUEUE1 65 -#define PLIC_INT_MAC0_QUEUE2 66 -#define PLIC_INT_MAC0_QUEUE3 67 -#define PLIC_INT_MAC0_EMAC 68
-#definePLIC_INT_MAC0_MMSL
69
-#definePLIC_INT_MAC1_INT
70include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-4-#define PLIC_INT_MAC1_QUEUE1 71 -#define PLIC_INT_MAC1_QUEUE2 72 -#define PLIC_INT_MAC1_QUEUE3 73 -#define PLIC_INT_MAC1_EMAC 74
-#definePLIC_INT_MAC1_MMSL
75
-#definePLIC_INT_DDRC_TRAIN
76
-#definePLIC_INT_SCB_INTERRUPT
77
-#definePLIC_INT_ECC_ERROR
78include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-2-#define PLIC_INT_ECC_CORRECT 79 -#define PLIC_INT_RTC_WAKEUP 80
-#definePLIC_INT_RTC_MATCH
81
-#definePLIC_INT_TIMER182 -#define PLIC_INT_TIMER2 83 -#define PLIC_INT_ENVM 84 -#define PLIC_INT_QSPI 85 -#define PLIC_INT_USB_DMA 86 -#define PLIC_INT_USB_MC 87-#define
PLIC_INT_MMC_MAIN
88
-#definePLIC_INT_MMC_WAKEUP
89
-#definePLIC_INT_MMUART0
90
-#definePLIC_INT_MMUART1
91
-#definePLIC_INT_MMUART2
92
-#definePLIC_INT_MMUART3
93
-#definePLIC_INT_MMUART4
94
-#definePLIC_INT_G5C_DEVRST
95include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-5-#define PLIC_INT_G5C_MESSAGE 96 -#define PLIC_INT_USOC_VC_INTERRUPT 97 -#define PLIC_INT_USOC_SMB_INTERRUPT 98 -#define PLIC_INT_E51_0_MAINTENACE 99 -#define PLIC_INT_WDOG0_MRVP 100
-#definePLIC_INT_WDOG1_MRVP
101
-#definePLIC_INT_WDOG2_MRVP
102
-#definePLIC_INT_WDOG3_MRVP
103
-#definePLIC_INT_WDOG4_MRVP
104
-#definePLIC_INT_WDOG0_TOUT
105
-#definePLIC_INT_WDOG1_TOUT
106
-#definePLIC_INT_WDOG2_TOUT
107
-#definePLIC_INT_WDOG3_TOUT
108
-#definePLIC_INT_WDOG4_TOUT
109include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-4-#define PLIC_INT_G5C_MSS_SPI 110 -#define PLIC_INT_VOLT_TEMP_ALARM 111 -#define PLIC_INT_ATHENA_COMPLETE 112 -#define PLIC_INT_ATHENA_ALARM 113
include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-2-#define PLIC_INT_ATHENA_BUS_ERROR 114 -#define PLIC_INT_USOC_AXIC_US 115
-#definePLIC_INT_USOC_AXIC_DS
116
-#definePLIC_INT_SPARE117-#define
PLIC_INT_FABRIC_F2H_0
118
-#definePLIC_INT_FABRIC_F2H_1
119
-#definePLIC_INT_FABRIC_F2H_2
120
-#definePLIC_INT_FABRIC_F2H_3
121
-#definePLIC_INT_FABRIC_F2H_4
122
-#definePLIC_INT_FABRIC_F2H_5
123
-#definePLIC_INT_FABRIC_F2H_6
124
-#definePLIC_INT_FABRIC_F2H_7
125
-#definePLIC_INT_FABRIC_F2H_8
126
-#definePLIC_INT_FABRIC_F2H_9
127
-#definePLIC_INT_FABRIC_F2H_10
128
-#definePLIC_INT_FABRIC_F2H_11
129
-#definePLIC_INT_FABRIC_F2H_12
130
-#definePLIC_INT_FABRIC_F2H_13
131
-#definePLIC_INT_FABRIC_F2H_14
132
-#definePLIC_INT_FABRIC_F2H_15
133
-#definePLIC_INT_FABRIC_F2H_16
134
-#definePLIC_INT_FABRIC_F2H_17
135
-#definePLIC_INT_FABRIC_F2H_18
136
-#definePLIC_INT_FABRIC_F2H_19
137
-#definePLIC_INT_FABRIC_F2H_20
138
-#definePLIC_INT_FABRIC_F2H_21
139
-#definePLIC_INT_FABRIC_F2H_22
140
-#definePLIC_INT_FABRIC_F2H_23
141
-#definePLIC_INT_FABRIC_F2H_24
142
-#definePLIC_INT_FABRIC_F2H_25
143
-#definePLIC_INT_FABRIC_F2H_26
144
-#definePLIC_INT_FABRIC_F2H_27
145
-#definePLIC_INT_FABRIC_F2H_28
146
-#definePLIC_INT_FABRIC_F2H_29
147
-#definePLIC_INT_FABRIC_F2H_30
148
-#definePLIC_INT_FABRIC_F2H_31
149
-#definePLIC_INT_FABRIC_F2H_32
150
-#definePLIC_INT_FABRIC_F2H_33
151
-#definePLIC_INT_FABRIC_F2H_34
152
-#definePLIC_INT_FABRIC_F2H_35
153
-#definePLIC_INT_FABRIC_F2H_36
154
-#definePLIC_INT_FABRIC_F2H_37
155
-#definePLIC_INT_FABRIC_F2H_38
156
-#definePLIC_INT_FABRIC_F2H_39
157
-#definePLIC_INT_FABRIC_F2H_40
158
-#definePLIC_INT_FABRIC_F2H_41
159
-#definePLIC_INT_FABRIC_F2H_42
160
-#definePLIC_INT_FABRIC_F2H_43
161
-#definePLIC_INT_FABRIC_F2H_44
162
-#definePLIC_INT_FABRIC_F2H_45
163
-#definePLIC_INT_FABRIC_F2H_46
164
-#definePLIC_INT_FABRIC_F2H_47
165
-#definePLIC_INT_FABRIC_F2H_48
166
-#definePLIC_INT_FABRIC_F2H_49
167
-#definePLIC_INT_FABRIC_F2H_50
168
-#definePLIC_INT_FABRIC_F2H_51
169
-#definePLIC_INT_FABRIC_F2H_52
170
-#definePLIC_INT_FABRIC_F2H_53
171
-#definePLIC_INT_FABRIC_F2H_54
172
-#definePLIC_INT_FABRIC_F2H_55
173
-#definePLIC_INT_FABRIC_F2H_56
174
-#definePLIC_INT_FABRIC_F2H_57
175
-#definePLIC_INT_FABRIC_F2H_58
176
-#definePLIC_INT_FABRIC_F2H_59
177
-#definePLIC_INT_FABRIC_F2H_60
178
-#definePLIC_INT_FABRIC_F2H_61
179
-#definePLIC_INT_FABRIC_F2H_62
180
-#definePLIC_INT_FABRIC_F2H_63
181include/dt-bindings/interrupt-controller/microchip-mpfs-plic.h deleted +0
-7-#define PLIC_INT_BUS_ERROR_UNIT_HART_0 182 -#define PLIC_INT_BUS_ERROR_UNIT_HART_1 183 -#define PLIC_INT_BUS_ERROR_UNIT_HART_2 184 -#define PLIC_INT_BUS_ERROR_UNIT_HART_3 185 -#define PLIC_INT_BUS_ERROR_UNIT_HART_4 186 - -#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_MICROCHIP_MPFS_PLIC_H */ include/dt-bindings/interrupt-controller/riscv-hart.h deleted +0
-17@@ -1,17 +0,0 @@ -/* SPDX-License-Identifier: (GPL-2.0+ OR MIT) */ -/* Copyright (c) 2020-2021 Microchip Technology Inc */ - -#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H -#define _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H - -#define HART_INT_U_SOFT 0 -#define HART_INT_S_SOFT 1 -#define HART_INT_M_SOFT 3 -#define HART_INT_U_TIMER 4 -#define HART_INT_S_TIMER 5 -#define HART_INT_M_TIMER 7 -#define HART_INT_U_EXT 8 -#define HART_INT_S_EXT 9 -#define HART_INT_M_EXT 11 - -#endif /* _DT_BINDINGS_INTERRUPT_CONTROLLER_RISCV_HART_H */
PATCH 3/3 board: microchip: set mac address for ethernet1 on icicle
In reply to Conor DooleyThe dts sync from Linux leaves mac0/ethernet1 enabled on icicle, but U-Boot does not currently set a mac address for it. Expand on the code which currently sets the mac for mac1/ethernet0 to optionally set the mac address for the second ethernet.
--- board/microchip/mpfs_icicle/mpfs_icicle.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)
board/microchip/mpfs_icicle/mpfs_icicle.c +12 -3
@@ -80,7 +80,7 @@ int board_late_init(void)char icicle_mac_addr[20 ];void *blob = (void *)gd->fdt_blob; - node =fdt_path_offset (blob,"ethernet0" ); + node =fdt_path_offset (blob,"/soc/ethernet@20112000" );if (node <0 ) {printf ("No ethernet0 path offset\n" );return -ENODEV ;
@@ -88,7 +88,7 @@ int board_late_init(void) ret =fdtdec_get_byte_array (blob, node,"local-mac-address" , mac_addr,6 );if (ret) { -printf ("No local-mac-address property\n" ); +printf ("No local-mac-address property for ethernet@20112000\n" );return -EINVAL ; }
@@ -104,7 +104,7 @@ int board_late_init(void) ret =fdt_setprop (blob, node,"local-mac-address" , mac_addr,6 );if (ret) { -printf ("Error setting local-mac-address property\n" ); +printf ("Error setting local-mac-address property for ethernet@20112000\n" );return -ENODEV ; }
@@ -123,6 +123,15 @@ int board_late_init(void) mac_addr[5 ] = device_serial_number[0 ] +1 ; + node =fdt_path_offset (blob,"/soc/ethernet@20110000" ); +if (node >=0 ) { + ret =fdt_setprop (blob, node,"local-mac-address" , mac_addr,6 ); +if (ret) { +printf ("Error setting local-mac-address property for ethernet@20112000\n" ); +return -ENODEV ; + } + } + icicle_mac_addr[0 ] ='[' ;sprintf (&icicle_mac_addr[1 ],"%pM" , mac_addr);
Signature · 1 line
2.40.1
Re: [PATCH v1 3/3] board: microchip: set mac address for ethernet1 on icicle
Quoted 49 lines · Conor Dooley
The dts sync from Linux leaves mac0/ethernet1 enabled on icicle, but U-Boot does not currently set a mac address for it. Expand on the code
which currently sets the mac for mac1/ethernet0 to optionally set the mac address for the second ethernet.Signed-off-by Conor Dooley <[email protected]>--- board/microchip/mpfs_icicle/mpfs_icicle.c | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-)board/microchip/mpfs_icicle/mpfs_icicle.c +2
-2@@ -80,7 +80,7 @@ int board_late_init(void)char icicle_mac_addr[20 ];void *blob = (void *)gd->fdt_blob; - node =fdt_path_offset (blob,"ethernet0" ); + node =fdt_path_offset (blob,"/soc/ethernet@20112000" );if (node <0 ) {printf ("No ethernet0 path offset\n" );return -ENODEV ;@@ -88,7 +88,7 @@ int board_late_init(void) ret =fdtdec_get_byte_array (blob, node,"local-mac-address" , mac_addr,6 );if (ret) { -printf ("No local-mac-address property\n" ); +printf ("No local-mac-address property for ethernet@20112000\n");return -EINVAL ;board/microchip/mpfs_icicle/mpfs_icicle.c +1
-1}@@ -104,7 +104,7 @@ int board_late_init(void) ret =fdt_setprop (blob, node,"local-mac-address" , mac_addr,6 );if (ret) { -printf ("Error setting local-mac-address property\n" ); +printf ("Error setting local-mac-address property for ethernet@20112000\n");return -ENODEV ;board/microchip/mpfs_icicle/mpfs_icicle.c +0
-0}
board/microchip/mpfs_icicle/mpfs_icicle.c int board_late_init(void) · line 132
Quoted 10 lines
board/microchip/mpfs_icicle/mpfs_icicle.c +5
-0@@ -123,6 +123,15 @@ int board_late_init(void) mac_addr[5 ] = device_serial_number[0 ] +1 ; + node =fdt_path_offset (blob,"/soc/ethernet@20110000" ); + if (node >= 0) { + ret = fdt_setprop(blob, node, "local-mac-address", mac_addr, 6); + if (ret) { + printf("Error setting local-mac-address property for ethernet@20112000\n");
The print error is for ethernet@20110000 not ethernet@20112000.
Other than that:
Quoted 7 lines
board/microchip/mpfs_icicle/mpfs_icicle.c +4
-0+return -ENODEV ; + } + } + icicle_mac_addr[0 ] ='[' ;
sprintf(&icicle_mac_addr[1], "%pM", mac_addr);
Re: [PATCH v1 3/3] board: microchip: set mac address for ethernet1 on icicle
Quoted 6 lines · On Tue, Jun 13, 2023 at 05:35:58AM +0000, [email protected] wrote:
Quoted 4 lines · Conor Dooley
board/microchip/mpfs_icicle/mpfs_icicle.c +0
-0@@ -123,6 +123,15 @@ int board_late_init(void) mac_addr[5 ] = device_serial_number[0 ] +1 ;
Quoted 8 lines
Review int board_late_init(void) · line 132
Quoted 7 lines
(quoted diff) +5
-0+ node = fdt_path_offset(blob, "/soc/ethernet@20110000"); + if (node >= 0) { + ret = fdt_setprop(blob, node, "local-mac-address", mac_addr, 6); + if (ret) { + printf("Error setting local-mac-address property for ethernet@20112000\n");The print error is for ethernet@20110000 not ethernet@20112000.
Ah, good spot, thanks. I'll fix that up and resubmit.
Thanks,
Conor.