Unverified Commit 0bcf3ac1 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'spacemit-dt-for-6.14-1' of https://github.com/spacemit-com/linux into soc/newsoc 

RISC-V SpacemiT DT changes for 6.14

This adds support for the SpacemiT K1 SoC and the Banana Pi F3
board using it:

- basic device tree support
- pinctrl dt node info
- update MAINTAINERS info

* tag 'spacemit-dt-for-6.14-1' of https://github.com/spacemit-com/linux:
  riscv: dts: spacemit: move aliases to board dts
  riscv: dts: spacemit: add pinctrl property to uart0 in BPI-F3
  riscv: defconfig: enable SpacemiT SoC
  riscv: dts: spacemit: add Banana Pi BPI-F3 board device tree
  riscv: dts: add initial SpacemiT K1 SoC device tree
  riscv: add SpacemiT SoC family Kconfig support
  dt-bindings: serial: 8250: Add SpacemiT K1 uart compatible
  dt-bindings: interrupt-controller: Add SpacemiT K1 PLIC
  dt-bindings: timer: Add SpacemiT K1 CLINT
  dt-bindings: riscv: add SpacemiT K1 bindings
  dt-bindings: riscv: Add SpacemiT X60 compatibles
  MAINTAINERS: setup support for SpacemiT SoC tree

Link: https://wiki.banana-pi.org/Banana_Pi_BPI-F3
Link: https://www.spacemit.com/en/key-stone-k1/
Link: https://lore.kernel.org/r/20250117004911-GYA25021@gentoo


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents d4c0d167 3d72d603

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: 
          - enum:

              - canaan,k210-plic

              - sifive,fu540-c000-plic

              - spacemit,k1-plic

              - starfive,jh7100-plic

              - starfive,jh7110-plic

          - const: sifive,plic-1.0.0

Documentation/devicetree/bindings/riscv/cpus.yaml

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

              - sifive,u74

              - sifive,u74-mc

              - spacemit,x60

              - thead,c906

              - thead,c908

              - thead,c910

Documentation/devicetree/bindings/riscv/spacemit.yaml

0 → 100644
+28 −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/spacemit.yaml#

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



title: SpacemiT SoC-based boards



maintainers:

  - Yangyu Chen <cyy@cyyself.name>

  - Yixun Lan <dlan@gentoo.org>



description:

  SpacemiT SoC-based boards



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:

      - items:

          - enum:

              - bananapi,bpi-f3

          - const: spacemit,k1



additionalProperties: true



...

Documentation/devicetree/bindings/serial/8250.yaml

+3 −1
Original line number Diff line number Diff line
@@ -111,7 +111,9 @@ properties: 
              - mediatek,mt7623-btif

          - const: mediatek,mtk-btif

      - items:

          - const: mrvl,mmp-uart

          - enum:

              - mrvl,mmp-uart

              - spacemit,k1-uart

          - const: intel,xscale-uart

      - items:

          - enum:

Documentation/devicetree/bindings/timer/sifive,clint.yaml

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ properties: 
          - enum:

              - canaan,k210-clint       # Canaan Kendryte K210

              - sifive,fu540-c000-clint # SiFive FU540

              - spacemit,k1-clint       # SpacemiT K1

              - starfive,jh7100-clint   # StarFive JH7100

              - starfive,jh7110-clint   # StarFive JH7110

              - starfive,jh8100-clint   # StarFive JH8100