Commit e315c7b3 authored by Olof Johansson's avatar Olof Johansson
Browse files

Merge tag 'mvebu-dt64-5.5-1' of git://git.infradead.org/linux-mvebu into arm/dt 

mvebu dt64 for 5.5 (part 1)

 - Add new Marvell CN9130 SoC support (CN9130 is made of one AP807 and
   one internal CP115, similar to the Armada 7K/8K using AP806 and
   CP110).
 - Reorganize EspressoBin device tree to add new variant of the boards
   (Armada 3270 based)
 - Add firmware node for turris Mox (Armada 3720 based)

* tag 'mvebu-dt64-5.5-1' of git://git.infradead.org/linux-mvebu: (23 commits)
  arm64: dts: armada-3720-turris-mox: add firmware node
  arm64: dts: marvell: add ESPRESSObin variants
  arm64: dts: marvell: Add support for Marvell CN9132-DB
  arm64: dts: marvell: Add support for Marvell CN9131-DB
  arm64: dts: marvell: Add support for Marvell CN9130-DB
  arm64: dts: marvell: Add support for Marvell CN9130 SoC support
  arm64: dts: marvell: Add support for CP115
  arm64: dts: marvell: Externalize PCIe macros from CP11x file
  arm64: dts: marvell: Drop PCIe I/O ranges from CP11x file
  arm64: dts: marvell: Prepare the introduction of CP115
  arm64: dts: marvell: Fix CP110 NAND controller node multi-line comment alignment
  arm64: dts: marvell: Add AP807-quad cache description
  arm64: dts: marvell: Add AP806-quad cache description
  arm64: dts: marvell: Add AP806-dual cache description
  arm64: dts: marvell: Add support for AP807/AP807-quad
  dt-bindings: marvell: Declare the CN913x SoC compatibles
  dt-bindings: marvell: Convert the SoC compatibles description to YAML
  arm64: dts: marvell: Move clocks to AP806 specific file
  arm64: dts: marvell: Prepare the introduction of AP807 based SoCs
  MAINTAINERS: Add new Marvell CN9130-based files to track
  ...

Link: https://lore.kernel.org/r/87zhhc3bo6.fsf@FE-laptop


Signed-off-by: default avatarOlof Johansson <olof@lixom.net>
parents 3c8b2e2c 46d2f6d0

Documentation/devicetree/bindings/arm/marvell/ap806-system-controller.txt→Documentation/devicetree/bindings/arm/marvell/ap80x-system-controller.txt

+7 −7
Original line number Diff line number Diff line 
Marvell Armada AP806 System Controller

Marvell Armada AP80x System Controller

======================================



The AP806 is one of the two core HW blocks of the Marvell Armada 7K/8K

SoCs. It contains system controllers, which provide several registers

giving access to numerous features: clocks, pin-muxing and many other

SoC configuration items. This DT binding allows to describe these

system controllers.

The AP806/AP807 is one of the two core HW blocks of the Marvell Armada

7K/8K/931x SoCs. It contains system controllers, which provide several

registers giving access to numerous features: clocks, pin-muxing and

many other SoC configuration items. This DT binding allows to describe

these system controllers.



For the top level node:

 - compatible: must be: "syscon", "simple-mfd";

 - reg: register area of the AP806 system controller

 - reg: register area of the AP80x system controller



SYSTEM CONTROLLER 0

===================

Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.txt

deleted100644 → 0
+0 −24
Original line number Diff line number Diff line 
Marvell Armada 7K/8K Platforms Device Tree Bindings

---------------------------------------------------



Boards using a SoC of the Marvell Armada 7K or 8K families must carry

the following root node property:



 - compatible, with one of the following values:



   - "marvell,armada7020", "marvell,armada-ap806-dual", "marvell,armada-ap806"

      when the SoC being used is the Armada 7020



   - "marvell,armada7040", "marvell,armada-ap806-quad", "marvell,armada-ap806"

      when the SoC being used is the Armada 7040



   - "marvell,armada8020", "marvell,armada-ap806-dual", "marvell,armada-ap806"

      when the SoC being used is the Armada 8020



   - "marvell,armada8040", "marvell,armada-ap806-quad", "marvell,armada-ap806"

      when the SoC being used is the Armada 8040



Example:



compatible = "marvell,armada7040-db", "marvell,armada7040",

             "marvell,armada-ap806-quad", "marvell,armada-ap806";

Documentation/devicetree/bindings/arm/marvell/armada-7k-8k.yaml

0 → 100644
+61 −0
Original line number Diff line number Diff line 
# SPDX-License-Identifier: (GPL-2.0+ OR X11)

%YAML 1.2

---

$id: http://devicetree.org/schemas/arm/marvell/armada-7k-8k.yaml#

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



title: Marvell Armada 7K/8K Platforms Device Tree Bindings



maintainers:

  - Gregory CLEMENT <gregory.clement@bootlin.com>



properties:

  $nodename:

    const: '/'

  compatible:

    oneOf:



      - description: Armada 7020 SoC

        items:

          - const: marvell,armada7020

          - const: marvell,armada-ap806-dual

          - const: marvell,armada-ap806



      - description: Armada 7040 SoC

        items:

          - const: marvell,armada7040

          - const: marvell,armada-ap806-quad

          - const: marvell,armada-ap806



      - description: Armada 8020 SoC

        items:

          - const: marvell,armada8020

          - const: marvell,armada-ap806-dual

          - const: marvell,armada-ap806



      - description: Armada 8040 SoC

        items:

          - const: marvell,armada8040

          - const: marvell,armada-ap806-quad

          - const: marvell,armada-ap806



      - description: Armada CN9130 SoC with no external CP

        items:

          - const: marvell,cn9130

          - const: marvell,armada-ap807-quad

          - const: marvell,armada-ap807



      - description: Armada CN9131 SoC with one external CP

        items:

          - const: marvell,cn9131

          - const: marvell,cn9130

          - const: marvell,armada-ap807-quad

          - const: marvell,armada-ap807



      - description: Armada CN9132 SoC with two external CPs

        items:

          - const: marvell,cn9132

          - const: marvell,cn9131

          - const: marvell,cn9130

          - const: marvell,armada-ap807-quad

          - const: marvell,armada-ap807

MAINTAINERS

+2 −1
Original line number Diff line number Diff line
@@ -1897,7 +1897,7 @@ F: arch/arm/boot/dts/dove* 
F:	arch/arm/boot/dts/orion5x*

T:	git git://git.infradead.org/linux-mvebu.git













ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K SOC support













ARM/Marvell Kirkwood and Armada 370, 375, 38x, 39x, XP, 3700, 7K/8K, CN9130 SOC support















M:	Jason Cooper <jason@lakedaemon.net>















M:	Andrew Lunn <andrew@lunn.ch>















M:	Gregory Clement <gregory.clement@bootlin.com>









@@ -1909,6 +1909,7 @@ F:	arch/arm/boot/dts/kirkwood*













F:	arch/arm/configs/mvebu_*_defconfig















F:	arch/arm/mach-mvebu/















F:	arch/arm64/boot/dts/marvell/armada*













F:	arch/arm64/boot/dts/marvell/cn913*















F:	drivers/cpufreq/armada-37xx-cpufreq.c















F:	drivers/cpufreq/armada-8k-cpufreq.c















F:	drivers/cpufreq/mvebu-cpufreq.c

































arch/arm64/boot/dts/marvell/Makefile



+3
−0






























Original line number
Diff line number
Diff line








@@ -10,3 +10,6 @@ dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-db.dtb













dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin.dtb















dtb-$(CONFIG_ARCH_MVEBU) += armada-8040-mcbin-singleshot.dtb















dtb-$(CONFIG_ARCH_MVEBU) += armada-8080-db.dtb













dtb-$(CONFIG_ARCH_MVEBU) += cn9130-db.dtb













dtb-$(CONFIG_ARCH_MVEBU) += cn9131-db.dtb













dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
































































CRA Git | Maintained and supported by SUSTech CRA and CCSE