Unverified Commit 75dae633 authored by Arnd Bergmann's avatar Arnd Bergmann
Browse files

Merge tag 'riscv-soc-for-v6.3-mw0' of... 

Merge tag 'riscv-soc-for-v6.3-mw0' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux

 into soc/drivers

RISC-V SoC drivers for v6.3-mw0

It's all StarFive stuff this time:
Their new JH7110 SoC uses a SiFive core complex, and therefore a
SiFive cache controller too. That needed a compatible added to both the
binding and driver.
The JH7110 also has power domains, which are supported by a new driver
and a corresponding dt-binding.

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

* tag 'riscv-soc-for-v6.3-mw0' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux:
  soc: starfive: Add StarFive JH71XX pmu driver
  dt-bindings: power: Add starfive,jh7110-pmu
  soc: sifive: ccache: Add StarFive JH7110 support
  dt-bindings: sifive,ccache0: Support StarFive JH7110 SoC

Link: https://lore.kernel.org/r/Y9LNIm9pkr+Owv/e@spud


Signed-off-by: default avatarArnd Bergmann <arnd@arndb.de>
parents 0d01e090 f3460326

Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml

0 → 100644
+45 −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/power/starfive,jh7110-pmu.yaml#

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



title: StarFive JH7110 Power Management Unit



maintainers:

  - Walker Chen <walker.chen@starfivetech.com>



description: |

  StarFive JH7110 SoC includes support for multiple power domains which can be

  powered on/off by software based on different application scenes to save power.



properties:

  compatible:

    enum:

      - starfive,jh7110-pmu



  reg:

    maxItems: 1



  interrupts:

    maxItems: 1



  "#power-domain-cells":

    const: 1



required:

  - compatible

  - reg

  - interrupts

  - "#power-domain-cells"



additionalProperties: false



examples:

  - |

    pwrc: power-controller@17030000 {

        compatible = "starfive,jh7110-pmu";

        reg = <0x17030000 0x10000>;

        interrupts = <111>;

        #power-domain-cells = <1>;

    };

Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml

+8 −1
Original line number Diff line number Diff line
@@ -38,6 +38,10 @@ properties: 
              - sifive,fu540-c000-ccache

              - sifive,fu740-c000-ccache

          - const: cache

      - items:

          - const: starfive,jh7110-ccache

          - const: sifive,ccache0

          - const: cache

      - items:

          - const: microchip,mpfs-ccache

          - const: sifive,fu540-c000-ccache
@@ -85,6 +89,7 @@ allOf: 
          contains:

            enum:

              - sifive,fu740-c000-ccache

              - starfive,jh7110-ccache

              - microchip,mpfs-ccache



    then:
@@ -105,7 +110,9 @@ allOf: 
      properties:

        compatible:

          contains:

            const: sifive,fu740-c000-ccache

            enum:

              - sifive,fu740-c000-ccache

              - starfive,jh7110-ccache



    then:

      properties:

MAINTAINERS

+13 −0
Original line number Diff line number Diff line
@@ -19913,6 +19913,19 @@ F: Documentation/devicetree/bindings/reset/starfive,jh7100-reset.yaml 
F:	drivers/reset/reset-starfive-jh7100.c

F:	include/dt-bindings/reset/starfive-jh7100.h









STARFIVE SOC DRIVERS









M:	Conor Dooley <conor@kernel.org>









S:	Maintained









T:	git https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git/









F:	drivers/soc/starfive/

















STARFIVE JH71XX PMU CONTROLLER DRIVER









M:	Walker Chen <walker.chen@starfivetech.com>









S:	Supported









F:	Documentation/devicetree/bindings/power/starfive*









F:	drivers/soc/starfive/jh71xx_pmu.c









F:	include/dt-bindings/power/starfive,jh7110-pmu.h

















STATIC BRANCH/CALL









M:	Peter Zijlstra <peterz@infradead.org>









M:	Josh Poimboeuf <jpoimboe@kernel.org>

























drivers/soc/Kconfig



+1
−0






























Original line number
Diff line number
Diff line







@@ -22,6 +22,7 @@ source "drivers/soc/renesas/Kconfig"







source "drivers/soc/rockchip/Kconfig"









source "drivers/soc/samsung/Kconfig"









source "drivers/soc/sifive/Kconfig"









source "drivers/soc/starfive/Kconfig"









source "drivers/soc/sunxi/Kconfig"









source "drivers/soc/tegra/Kconfig"









source "drivers/soc/ti/Kconfig"
































drivers/soc/Makefile



+2
−1






























Original line number
Diff line number
Diff line







@@ -27,7 +27,8 @@ obj-y				+= qcom/







obj-y				+= renesas/









obj-y				+= rockchip/









obj-$(CONFIG_SOC_SAMSUNG)	+= samsung/









obj-$(CONFIG_SOC_SIFIVE)	+= sifive/









obj-y				+= sifive/









obj-$(CONFIG_SOC_STARFIVE)	+= starfive/









obj-y				+= sunxi/









obj-$(CONFIG_ARCH_TEGRA)	+= tegra/









obj-y				+= ti/