Commit a8253f80 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'soc-newsoc-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 

Pull new SoC support from Arnd Bergmann:
 "Pinkesh Vaghela adds support for the ESWIN EIC7700 SoC consisting of
  SiFive Quad-Core P550 CPU cluster and the first development board that
  uses it, the SiFive HiFive Premier P550 [1].

  This adds initial device tree and also adds ESWIN architecture
  support.

  Boot-tested using intiramfs with Linux v6.17-rc3 on HiFive Premier
  P550 board using U-Boot 2024.01 and OpenSBI 1.4"

Link: https://lore.kernel.org/linux-riscv/20250825132427.1618089-1-pinkesh.vaghela@einfochips.com/ [1]

* tag 'soc-newsoc-6.18' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc:
  riscv: dts: eswin: add HiFive Premier P550 board device tree
  riscv: dts: add initial support for EIC7700 SoC
  dt-bindings: interrupt-controller: Add ESWIN EIC7700 PLIC
  dt-bindings: riscv: Add SiFive HiFive Premier P550 board
  riscv: Add Kconfig option for ESWIN platforms
  dt-bindings: riscv: Add SiFive P550 CPU compatible
parents 9792d660 fee2f45d

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+1 −0
Original line number Diff line number Diff line
@@ -59,6 +59,7 @@ properties: 
      - items:

          - enum:

              - canaan,k210-plic

              - eswin,eic7700-plic

              - sifive,fu540-c000-plic

              - spacemit,k1-plic

              - starfive,jh7100-plic

Documentation/devicetree/bindings/riscv/cpus.yaml

+1 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ properties: 
              - sifive,e5

              - sifive,e7

              - sifive,e71

              - sifive,p550

              - sifive,rocket0

              - sifive,s7

              - sifive,u5

Documentation/devicetree/bindings/riscv/eswin.yaml

0 → 100644
+29 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)

%YAML 1.2

---

$id: http://devicetree.org/schemas/riscv/eswin.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: ESWIN SoC-based boards



maintainers:

  - Min Lin <linmin@eswincomputing.com>

  - Pinkesh Vaghela <pinkesh.vaghela@einfochips.com>

  - Pritesh Patel <pritesh.patel@einfochips.com>



description:

  ESWIN SoC-based boards



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - enum:

              - sifive,hifive-premier-p550

          - const: eswin,eic7700



additionalProperties: true



...

MAINTAINERS

+9 −0
Original line number Diff line number Diff line
@@ -9123,6 +9123,15 @@ L: linux-can@vger.kernel.org 
S:	Maintained

F:	drivers/net/can/usb/esd_usb.c









ESWIN DEVICETREES









M:	Min Lin <linmin@eswincomputing.com>









M:	Pinkesh Vaghela <pinkesh.vaghela@einfochips.com>









M:	Pritesh Patel <pritesh.patel@einfochips.com>









S:	Maintained









T:	git https://github.com/eswincomputing/linux-next.git









F:	Documentation/devicetree/bindings/riscv/eswin.yaml









F:	arch/riscv/boot/dts/eswin/

















ET131X NETWORK DRIVER









M:	Mark Einon <mark.einon@gmail.com>









S:	Odd Fixes
































arch/riscv/Kconfig.socs



+6
−0






























Original line number
Diff line number
Diff line







@@ -7,6 +7,12 @@ config ARCH_ANDES







	help









	  This enables support for Andes SoC platform hardware.



















config ARCH_ESWIN









	bool "ESWIN SoCs"









	help









	  This enables support for ESWIN SoC platform hardware,









	  including the ESWIN EIC7700 SoC.



















config ARCH_MICROCHIP_POLARFIRE









	def_bool ARCH_MICROCHIP