Unverified Commit 8c0650e0 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-dt-for-v6.18' of...

Merge tag 'riscv-dt-for-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into soc/dt

RISC-V Misc Devicetrees for v6.18

Starfive:
The main new addition is support for the JH7110 Milk-V Mars CM lite SoM.
Other than that, there's several cleanups done to the common JH7110 dtsi
file, some relating to properties used by U-Boot or encountered during
U-Boot development. Additionally, there's a binding and devicetree node
for the memory controller on the JH7110. The memory controller only sees
use in U-Boot, so the binding is here rather than in Krzysztof's
branch.

SiFive:
Support for SiFive vendor-specific extensions in the binding file for
extensions. These currently only see use in the SBI implementation.

Microchip:
Addition of support for the PolarFire SoC Discovery kit and
non-engineering sample Icicle kit. The latter differs very slightly from
the final ES devices due to bug fixes affecting functionality, and needs
its own dts. To reduce duplication, the common portion of the two Icicle
kits are moved into a dtsi. There's a few minor fixes here too, mostly
low-hanging fruit detected during the addition of the Discovery kit that
were then applied to the Icicle.

Signed-off-by: default avatarConor Dooley <conor.dooley@microchip.com>

* tag 'riscv-dt-for-v6.18' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  riscv: dts: starfive: add Milk-V Mars CM Lite system-on-module
  dt-bindings: riscv: starfive: add milkv,marscm-lite
  riscv: dts: starfive: add Milk-V Mars CM system-on-module
  dt-bindings: riscv: starfive: add milkv,marscm-emmc
  riscv: dts: starfive: add common board dtsi for Milk-V Mars CM variants
  riscv: dts: microchip: add a device tree for Discovery Kit
  dt-bindings: riscv: microchip: document Discovery Kit
  riscv: dts: microchip: rename icicle kit ccc clock and other minor fixes
  riscv: dts: microchip: add icicle kit with production device
  dt-bindings: riscv: microchip: document icicle kit with production device
  riscv: dts: microchip: add common board dtsi for icicle kit variants
  riscv: dts: starfive: jh7110-common: drop mmc post-power-on-delay-ms
  riscv: dts: starfive: jh7110-common: drop no-mmc property from mmc1
  riscv: dts: starfive: jh7110: bootph-pre-ram hinting needed by boot loader
  riscv: dts: starfive: jh7110: add DMC memory controller
  dt-bindings: memory-controllers: add StarFive JH7110 SoC DMC
  riscv: dts: starfive: jh7110-common: drop no-sdio property from mmc1
  riscv: dts: microchip: Minor whitespace cleanup
  dt-bindings: riscv: Add SiFive vendor extensions description

Link: https://lore.kernel.org/r/20250924-frighten-magazine-ee2f16e64638@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0d449512 4cce8b25
Loading
Loading
Loading
Loading
+74 −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/memory-controllers/starfive,jh7110-dmc.yaml#
$schema: http://devicetree.org/meta-schemas/core.yaml#

title: StarFive JH7110 DMC

maintainers:
  - E Shattow <e@freeshell.de>

description:
  JH7110 DDR external memory interface LPDDR4/DDR4/DDR3/LPDDR3 32-bit at
  2133Mbps (up to 2800Mbps).

properties:
  compatible:
    items:
      - const: starfive,jh7110-dmc

  reg:
    items:
      - description: controller registers
      - description: phy registers

  clocks:
    maxItems: 1

  clock-names:
    items:
      - const: pll

  resets:
    items:
      - description: axi
      - description: osc
      - description: apb

  reset-names:
    items:
      - const: axi
      - const: osc
      - const: apb

required:
  - compatible
  - reg
  - clocks
  - clock-names
  - resets
  - reset-names

additionalProperties: false

examples:
  - |
    #include <dt-bindings/clock/starfive,jh7110-crg.h>
    #include <dt-bindings/reset/starfive,jh7110-crg.h>
    soc {
      #address-cells = <2>;
      #size-cells = <2>;

      memory-controller@15700000 {
        compatible = "starfive,jh7110-dmc";
        reg = <0x0 0x15700000 0x0 0x10000>,
              <0x0 0x13000000 0x0 0x10000>;
        clocks = <&syscrg JH7110_PLLCLK_PLL1_OUT>;
        clock-names = "pll";
        resets = <&syscrg JH7110_SYSRST_DDR_AXI>,
                 <&syscrg JH7110_SYSRST_DDR_OSC>,
                 <&syscrg JH7110_SYSRST_DDR_APB>;
        reset-names = "axi", "osc", "apb";
      };
    };
+18 −0
Original line number Diff line number Diff line
@@ -663,6 +663,24 @@ properties:
            https://www.andestech.com/wp-content/uploads/AX45MP-1C-Rev.-5.0.0-Datasheet.pdf

        # SiFive
        - const: xsfcease
          description:
            SiFive CEASE Instruction Extensions Specification.
            See more details in
            https://www.sifive.com/document-file/freedom-u740-c000-manual

        - const: xsfcflushdlone
          description:
            SiFive L1D Cache Flush Instruction Extensions Specification.
            See more details in
            https://www.sifive.com/document-file/freedom-u740-c000-manual

        - const: xsfpgflushdlone
          description:
            SiFive PGFLUSH Instruction Extensions for the power management. The
            CPU will flush the L1D and enter the cease state after executing
            the instruction.

        - const: xsfvqmaccdod
          description:
            SiFive Int8 Matrix Multiplication Extensions Specification.
+13 −0
Original line number Diff line number Diff line
@@ -18,13 +18,26 @@ properties:
    const: '/'
  compatible:
    oneOf:
      - items:
          - const: microchip,mpfs-icicle-prod-reference-rtl-v2507
          - const: microchip,mpfs-icicle-kit-prod
          - const: microchip,mpfs-icicle-kit
          - const: microchip,mpfs-prod
          - const: microchip,mpfs

      - items:
          - enum:
              - microchip,mpfs-icicle-reference-rtlv2203
              - microchip,mpfs-icicle-reference-rtlv2210
              - microchip,mpfs-icicle-es-reference-rtl-v2507
          - const: microchip,mpfs-icicle-kit
          - const: microchip,mpfs

      - items:
          - const: microchip,mpfs-disco-kit-reference-rtl-v2507
          - const: microchip,mpfs-disco-kit
          - const: microchip,mpfs

      - items:
          - enum:
              - aldec,tysom-m-mpfs250t-rev2
+2 −0
Original line number Diff line number Diff line
@@ -28,6 +28,8 @@ properties:
          - enum:
              - deepcomputing,fml13v01
              - milkv,mars
              - milkv,marscm-emmc
              - milkv,marscm-lite
              - pine64,star64
              - starfive,visionfive-2-v1.2a
              - starfive,visionfive-2-v1.3b
+2 −0
Original line number Diff line number Diff line
# SPDX-License-Identifier: GPL-2.0
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-beaglev-fire.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-disco-kit.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-icicle-kit.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-icicle-kit-prod.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-m100pfsevp.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-polarberry.dtb
dtb-$(CONFIG_ARCH_MICROCHIP_POLARFIRE) += mpfs-sev-kit.dtb
Loading