[PATCH v9 0/3] arm64: mvebu: Support for Marvell 98DX2530 (and variants)

[PATCH v9 0/3] arm64: mvebu: Support for Marvell 98DX2530 (and variants)

[Vadym Kochan]

This series adds support for the Marvell 98DX2530 SoC which is the Control and
Management CPU integrated into the AlleyCat5/AlleyCat5X series of Marvell
switches.

The CPU core is an ARM Cortex-A55 with neon, simd and crypto extensions.

This is fairly similar to the Armada-3700 SoC so most of the required
peripherals are already supported. This series adds a devicetree and pinctrl
driver for the SoC and the RD-AC5X-32G16HVG6HLG reference board.

The pinctrl changes from v4 have been picked up and are in linux-next so I
haven't included them in this round. That leaves just the dts files and a minor
Kconfig update for arm64.

Changes:

v9 (proposed by Marvell):
   It was discussed with Chris that Marvell will add some changes:
      1) Rename "armada-" prefix in dts(i) file names to ac5, because
         Armada has not much common with AC5 SoC.

      2) Add clock fixes:
         a) rename core_clock to cnm_clock

         b) remove axi_clock

         c) change cnm_clock to 325MHZ

         d) use cnm_clock for the UART

Chris Packham (3):
  dt-bindings: marvell: Document the AC5/AC5X compatibles
  arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board
  arm64: marvell: enable the 98DX2530 pinctrl driver

 .../bindings/arm/marvell/ac5-98dx25xx.yaml    |  32 ++
 arch/arm64/Kconfig.platforms                  |   2 +
 arch/arm64/boot/dts/marvell/Makefile          |   1 +
 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
 .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
 6 files changed, 440 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi

-- 
2.17.1

[PATCH v9 1/3] dt-bindings: marvell: Document the AC5/AC5X compatibles

[Vadym Kochan]

From: Chris Packham <chris.packham@alliedtelesis.co.nz>

Describe the compatible properties for the Marvell Alleycat5/5X switches
with integrated CPUs.

Alleycat5:
* 98DX2538: 24x1G + 2x10G + 2x10G Stack
* 98DX2535: 24x1G + 4x1G Stack
* 98DX2532: 8x1G + 2x10G + 2x1G Stack
* 98DX2531: 8x1G + 4x1G Stack
* 98DX2528: 24x1G + 2x10G + 2x10G Stack
* 98DX2525: 24x1G + 4x1G Stack
* 98DX2522: 8x1G + 2x10G + 2x1G Stack
* 98DX2521: 8x1G + 4x1G Stack
* 98DX2518: 24x1G + 2x10G + 2x10G Stack
* 98DX2515: 24x1G + 4x1G Stack
* 98DX2512: 8x1G + 2x10G + 2x1G Stack
* 98DX2511: 8x1G + 4x1G Stack

Alleycat5X:
* 98DX3500: 24x1G + 6x25G
* 98DX3501: 16x1G + 6x10G
* 98DX3510: 48x1G + 6x25G
* 98DX3520: 24x2.5G + 6x25G
* 98DX3530: 48x2.5G + 6x25G
* 98DX3540: 12x5G/6x10G + 6x25G
* 98DX3550: 24x5G/12x10G + 6x25G

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
---

Notes:
    Changes in v9:
    - Renamed $id with "ac5" prefix
    Changes in v8:
    - Add review from Krzysztof
    Changes in v7:
    - Add rd-ac5 and rd-ac5x boards to binding.
    - Rename to armada-98dx25xx.yaml
    Changes in v6:
    - New

 .../bindings/arm/marvell/ac5-98dx25xx.yaml    | 32 +++++++++++++++++++
 1 file changed, 32 insertions(+)
 create mode 100644 Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml

diff --git a/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
new file mode 100644
index 000000000000..1d8dd7c00c1a
--- /dev/null
+++ b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
@@ -0,0 +1,32 @@
+# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
+%YAML 1.2
+---
+$id: http://devicetree.org/schemas/arm/marvell/ac5-98dx25xx.yaml#
+$schema: http://devicetree.org/meta-schemas/core.yaml#
+
+title: Marvell Alleycat5/5X Platforms
+
+maintainers:
+  - Chris Packham <chris.packham@alliedtelesis.co.nz>
+
+properties:
+  $nodename:
+    const: '/'
+  compatible:
+    oneOf:
+      - description: Alleycat5 (98DX25xx) Reference Design
+        items:
+          - enum:
+              - marvell,rd-ac5
+          - const: marvell,ac5
+
+      - description: Alleycat5X (98DX35xx) Reference Design
+        items:
+          - enum:
+              - marvell,rd-ac5x
+          - const: marvell,ac5x
+          - const: marvell,ac5
+
+additionalProperties: true
+
+...
-- 
2.17.1

Re: [PATCH v9 1/3] dt-bindings: marvell: Document the AC5/AC5X compatibles

[Chris Packham]

On 14/06/22 10:53, Vadym Kochan wrote:
> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>
> Describe the compatible properties for the Marvell Alleycat5/5X switches
> with integrated CPUs.
>
> Alleycat5:
> * 98DX2538: 24x1G + 2x10G + 2x10G Stack
> * 98DX2535: 24x1G + 4x1G Stack
> * 98DX2532: 8x1G + 2x10G + 2x1G Stack
> * 98DX2531: 8x1G + 4x1G Stack
> * 98DX2528: 24x1G + 2x10G + 2x10G Stack
> * 98DX2525: 24x1G + 4x1G Stack
> * 98DX2522: 8x1G + 2x10G + 2x1G Stack
> * 98DX2521: 8x1G + 4x1G Stack
> * 98DX2518: 24x1G + 2x10G + 2x10G Stack
> * 98DX2515: 24x1G + 4x1G Stack
> * 98DX2512: 8x1G + 2x10G + 2x1G Stack
> * 98DX2511: 8x1G + 4x1G Stack
>
> Alleycat5X:
> * 98DX3500: 24x1G + 6x25G
> * 98DX3501: 16x1G + 6x10G
> * 98DX3510: 48x1G + 6x25G
> * 98DX3520: 24x2.5G + 6x25G
> * 98DX3530: 48x2.5G + 6x25G
> * 98DX3540: 12x5G/6x10G + 6x25G
> * 98DX3550: 24x5G/12x10G + 6x25G
>
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> ---
>
> Notes:
>      Changes in v9:
>      - Renamed $id with "ac5" prefix
>      Changes in v8:
>      - Add review from Krzysztof
>      Changes in v7:
>      - Add rd-ac5 and rd-ac5x boards to binding.
>      - Rename to armada-98dx25xx.yaml
>      Changes in v6:
>      - New
>
>   .../bindings/arm/marvell/ac5-98dx25xx.yaml    | 32 +++++++++++++++++++
>   1 file changed, 32 insertions(+)
>   create mode 100644 Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
>
> diff --git a/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
> new file mode 100644
> index 000000000000..1d8dd7c00c1a
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
> @@ -0,0 +1,32 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://scanmail.trustwave.com/?c=20988&d=0sCn4rSkm8Ye1wgojwzEuDgNKxy8xoaJJBOHo3uhXA&u=http%3a%2f%2fdevicetree%2eorg%2fschemas%2farm%2fmarvell%2fac5-98dx25xx%2eyaml%23
> +$schema: http://scanmail.trustwave.com/?c=20988&d=0sCn4rSkm8Ye1wgojwzEuDgNKxy8xoaJJBeG8i72WQ&u=http%3a%2f%2fdevicetree%2eorg%2fmeta-schemas%2fcore%2eyaml%23
> +

Apologies for the above. Our incoming email likes to even the playing 
field by making all links look like phishing attempts.

> +title: Marvell Alleycat5/5X Platforms
> +
> +maintainers:
> +  - Chris Packham <chris.packham@alliedtelesis.co.nz>
Do you want to add yourself here?
> +
> +properties:
> +  $nodename:
> +    const: '/'
> +  compatible:
> +    oneOf:
> +      - description: Alleycat5 (98DX25xx) Reference Design
> +        items:
> +          - enum:
> +              - marvell,rd-ac5
> +          - const: marvell,ac5
> +
> +      - description: Alleycat5X (98DX35xx) Reference Design
> +        items:
> +          - enum:
> +              - marvell,rd-ac5x
> +          - const: marvell,ac5x
> +          - const: marvell,ac5
> +
> +additionalProperties: true
> +
> +...

Re: [PATCH v9 1/3] dt-bindings: marvell: Document the AC5/AC5X compatibles

[Rob Herring]

On Tue, Jun 14, 2022 at 01:53:22AM +0300, Vadym Kochan wrote:
> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
> 
> Describe the compatible properties for the Marvell Alleycat5/5X switches
> with integrated CPUs.
> 
> Alleycat5:
> * 98DX2538: 24x1G + 2x10G + 2x10G Stack
> * 98DX2535: 24x1G + 4x1G Stack
> * 98DX2532: 8x1G + 2x10G + 2x1G Stack
> * 98DX2531: 8x1G + 4x1G Stack
> * 98DX2528: 24x1G + 2x10G + 2x10G Stack
> * 98DX2525: 24x1G + 4x1G Stack
> * 98DX2522: 8x1G + 2x10G + 2x1G Stack
> * 98DX2521: 8x1G + 4x1G Stack
> * 98DX2518: 24x1G + 2x10G + 2x10G Stack
> * 98DX2515: 24x1G + 4x1G Stack
> * 98DX2512: 8x1G + 2x10G + 2x1G Stack
> * 98DX2511: 8x1G + 4x1G Stack
> 
> Alleycat5X:
> * 98DX3500: 24x1G + 6x25G
> * 98DX3501: 16x1G + 6x10G
> * 98DX3510: 48x1G + 6x25G
> * 98DX3520: 24x2.5G + 6x25G
> * 98DX3530: 48x2.5G + 6x25G
> * 98DX3540: 12x5G/6x10G + 6x25G
> * 98DX3550: 24x5G/12x10G + 6x25G
> 
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> ---
> 
> Notes:
>     Changes in v9:
>     - Renamed $id with "ac5" prefix
>     Changes in v8:
>     - Add review from Krzysztof
>     Changes in v7:
>     - Add rd-ac5 and rd-ac5x boards to binding.
>     - Rename to armada-98dx25xx.yaml
>     Changes in v6:
>     - New
> 
>  .../bindings/arm/marvell/ac5-98dx25xx.yaml    | 32 +++++++++++++++++++

Use compatible string for filename:

marvell,ac5.yaml

>  1 file changed, 32 insertions(+)
>  create mode 100644 Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
> 
> diff --git a/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
> new file mode 100644
> index 000000000000..1d8dd7c00c1a
> --- /dev/null
> +++ b/Documentation/devicetree/bindings/arm/marvell/ac5-98dx25xx.yaml
> @@ -0,0 +1,32 @@
> +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause)
> +%YAML 1.2
> +---
> +$id: http://devicetree.org/schemas/arm/marvell/ac5-98dx25xx.yaml#
> +$schema: http://devicetree.org/meta-schemas/core.yaml#
> +
> +title: Marvell Alleycat5/5X Platforms
> +
> +maintainers:
> +  - Chris Packham <chris.packham@alliedtelesis.co.nz>
> +
> +properties:
> +  $nodename:
> +    const: '/'
> +  compatible:
> +    oneOf:
> +      - description: Alleycat5 (98DX25xx) Reference Design
> +        items:
> +          - enum:
> +              - marvell,rd-ac5
> +          - const: marvell,ac5
> +
> +      - description: Alleycat5X (98DX35xx) Reference Design
> +        items:
> +          - enum:
> +              - marvell,rd-ac5x
> +          - const: marvell,ac5x
> +          - const: marvell,ac5
> +
> +additionalProperties: true
> +
> +...
> -- 
> 2.17.1
> 
> 

Re: [PATCH v9 1/3] dt-bindings: marvell: Document the AC5/AC5X compatibles

[Krzysztof Kozlowski]

On 13/06/2022 15:53, Vadym Kochan wrote:
> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
> 
> Describe the compatible properties for the Marvell Alleycat5/5X switches
> with integrated CPUs.
> 
> Alleycat5:
> * 98DX2538: 24x1G + 2x10G + 2x10G Stack
> * 98DX2535: 24x1G + 4x1G Stack
> * 98DX2532: 8x1G + 2x10G + 2x1G Stack
> * 98DX2531: 8x1G + 4x1G Stack
> * 98DX2528: 24x1G + 2x10G + 2x10G Stack
> * 98DX2525: 24x1G + 4x1G Stack
> * 98DX2522: 8x1G + 2x10G + 2x1G Stack
> * 98DX2521: 8x1G + 4x1G Stack
> * 98DX2518: 24x1G + 2x10G + 2x10G Stack
> * 98DX2515: 24x1G + 4x1G Stack
> * 98DX2512: 8x1G + 2x10G + 2x1G Stack
> * 98DX2511: 8x1G + 4x1G Stack
> 
> Alleycat5X:
> * 98DX3500: 24x1G + 6x25G
> * 98DX3501: 16x1G + 6x10G
> * 98DX3510: 48x1G + 6x25G
> * 98DX3520: 24x2.5G + 6x25G
> * 98DX3530: 48x2.5G + 6x25G
> * 98DX3540: 12x5G/6x10G + 6x25G
> * 98DX3550: 24x5G/12x10G + 6x25G
> 
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> ---
> 
> Notes:
>     Changes in v9:
>     - Renamed $id with "ac5" prefix

I guess this was the reason to drop review? Anyway this is unexpected
change considering the name does not appear in compatibles.

>     Changes in v8:
>     - Add review from Krzysztof

Best regards,
Krzysztof

[PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Vadym Kochan]

From: Chris Packham <chris.packham@alliedtelesis.co.nz>

The 98DX2530 SoC is the Control and Management CPU integrated into
the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
referred to as AlleyCat5 and AlleyCat5X).

These files have been taken from the Marvell SDK and lightly cleaned
up with the License and copyright retained.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
---

Notes:
    The Marvell SDK has a number of new compatible strings. I've brought
    through some of the drivers or where possible used an in-tree
    alternative (e.g. there is SDK code for a ac5-gpio but two instances of
    the existing marvell,orion-gpio seems to cover what is needed if you use
    an appropriate binding). I expect that there will a new series of
    patches when I get some different hardware (or additions to this series
    depending on if/when it lands).
    
    Changes in v9 (proposed by Marvell):
      It was discussed with Chris that Marvell will add some changes:

         1) Rename "armada-" prefix in dts(i) file names to ac5, because
            Armada has not much common with AC5 SoC.

         2) Add clock fixes:
            - rename core_clock to cnm_clock
            - remove axi_clock
            - change cnm_clock to 325MHZ
            - use cnm_clock for the UART

    Changes in v8:
    - Remove unnecessary clock-frequency property on armv8-timer
    - Remove unnecessary redistributor-stride property on gic
    - Add GIC_SPI interrupts for gpios
    Changes in v7:
    - Add missing compatible on usb1
    - Add "rd-ac5x" compatible for board
    - Move aliases to board dts
    - Move board specific usb info to board dts
    - Consolidate usb1 board settings and remove unnecessary compatible
    - Add Allied Telesis copyright
    - Rename files after mailng-list discussion
    Changes in v6:
    - Move CPU nodes above the SoC (Krzysztof)
    - Minor formatting clean ups (Krzysztof)
    - Run through `make dtbs_check`
    - Move gic nodes inside SoC
    - Group clocks under a clock node
    Changes in v5:
    - add #{address,size}-cells property to i2c nodes
    - make i2c nodes disabled in the SoC and enable them in the board
    - add interrupt controller attributes to gpio nodes
    - Move fixed-clock nodes up a level and remove unnecessary @0
    Changes in v4:
    - use 'phy-handle' instead of 'phy'
    - move status="okay" on usb nodes to board dts
    - Add review from Andrew
    Changes in v3:
    - Move memory node to board
    - Use single digit reg value for phy address
    - Remove MMC node (driver needs work)
    - Remove syscon & simple-mfd for pinctrl
    Changes in v2:
    - Make pinctrl a child node of a syscon node
    - Use marvell,armada-8k-gpio instead of orion-gpio
    - Remove nand peripheral. The Marvell SDK does have some changes for the
      ac5-nand-controller but I currently lack hardware with NAND fitted so
      I can't test it right now. I've therefore chosen to omit the node and
      not attempted to bring in the driver or binding.
    - Remove pcie peripheral. Again there are changes in the SDK and I have
      no way of testing them.
    - Remove prestera node.
    - Remove "marvell,ac5-ehci" compatible from USB node as
      "marvell,orion-ehci" is sufficient
    - Remove watchdog node. There is a buggy driver for the ac5 watchdog in
      the SDK but it needs some work so I've dropped the node for now.

 arch/arm64/boot/dts/marvell/Makefile          |   1 +
 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
 .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
 4 files changed, 406 insertions(+)
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
 create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi

diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
index 1c794cdcb8e6..b6d493e34dc5 100644
--- a/arch/arm64/boot/dts/marvell/Makefile
+++ b/arch/arm64/boot/dts/marvell/Makefile
@@ -24,3 +24,4 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb
 dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb
+dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb
diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
new file mode 100644
index 000000000000..cf0b4a7de323
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
@@ -0,0 +1,291 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For AC5.
+ *
+ * Copyright (C) 2021 Marvell
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+
+#include <dt-bindings/gpio/gpio.h>
+#include <dt-bindings/interrupt-controller/arm-gic.h>
+
+/ {
+	model = "Marvell AC5 SoC";
+	compatible = "marvell,ac5";
+	interrupt-parent = <&gic>;
+	#address-cells = <2>;
+	#size-cells = <2>;
+
+	cpus {
+		#address-cells = <2>;
+		#size-cells = <0>;
+
+		cpu-map {
+			cluster0 {
+				core0 {
+					cpu = <&cpu0>;
+				};
+				core1 {
+					cpu = <&cpu1>;
+				};
+			};
+		};
+
+		cpu0: cpu@0 {
+			device_type = "cpu";
+			compatible = "arm,armv8";
+			reg = <0x0 0x0>;
+			enable-method = "psci";
+			next-level-cache = <&l2>;
+		};
+
+		cpu1: cpu@1 {
+			device_type = "cpu";
+			compatible = "arm,armv8";
+			reg = <0x0 0x100>;
+			enable-method = "psci";
+			next-level-cache = <&l2>;
+		};
+
+		l2: l2-cache {
+			compatible = "cache";
+		};
+	};
+
+	psci {
+		compatible = "arm,psci-0.2";
+		method = "smc";
+	};
+
+	timer {
+		compatible = "arm,armv8-timer";
+		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>,
+			     <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	pmu {
+		compatible = "arm,armv8-pmuv3";
+		interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>;
+	};
+
+	soc {
+		compatible = "simple-bus";
+		#address-cells = <2>;
+		#size-cells = <2>;
+		ranges;
+		dma-ranges;
+
+		internal-regs@7f000000 {
+			#address-cells = <1>;
+			#size-cells = <1>;
+			compatible = "simple-bus";
+			/* 16M internal register @ 0x7f00_0000 */
+			ranges = <0x0 0x0 0x7f000000 0x1000000>;
+			dma-coherent;
+
+			uart0: serial@12000 {
+				compatible = "snps,dw-apb-uart";
+				reg = <0x12000 0x100>;
+				reg-shift = <2>;
+				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
+				reg-io-width = <1>;
+				clocks = <&cnm_clock>;
+				status = "okay";
+			};
+
+			mdio: mdio@22004 {
+				#address-cells = <1>;
+				#size-cells = <0>;
+				compatible = "marvell,orion-mdio";
+				reg = <0x22004 0x4>;
+				clocks = <&cnm_clock>;
+			};
+
+			i2c0: i2c@11000{
+				compatible = "marvell,mv78230-i2c";
+				reg = <0x11000 0x20>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				clocks = <&cnm_clock>;
+				clock-names = "core";
+				interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency=<100000>;
+
+				pinctrl-names = "default", "gpio";
+				pinctrl-0 = <&i2c0_pins>;
+				pinctrl-1 = <&i2c0_gpio>;
+				scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
+				sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>;
+				status = "disabled";
+			};
+
+			i2c1: i2c@11100{
+				compatible = "marvell,mv78230-i2c";
+				reg = <0x11100 0x20>;
+				#address-cells = <1>;
+				#size-cells = <0>;
+
+				clocks = <&cnm_clock>;
+				clock-names = "core";
+				interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
+				clock-frequency=<100000>;
+
+				pinctrl-names = "default", "gpio";
+				pinctrl-0 = <&i2c1_pins>;
+				pinctrl-1 = <&i2c1_gpio>;
+				scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;
+				sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
+				status = "disabled";
+			};
+
+			gpio0: gpio@18100 {
+				compatible = "marvell,orion-gpio";
+				reg = <0x18100 0x40>;
+				ngpios = <32>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				gpio-ranges = <&pinctrl0 0 0 32>;
+				marvell,pwm-offset = <0x1f0>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
+			};
+
+			gpio1: gpio@18140 {
+				reg = <0x18140 0x40>;
+				compatible = "marvell,orion-gpio";
+				ngpios = <14>;
+				gpio-controller;
+				#gpio-cells = <2>;
+				gpio-ranges = <&pinctrl0 0 32 14>;
+				marvell,pwm-offset = <0x1f0>;
+				interrupt-controller;
+				#interrupt-cells = <2>;
+				interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
+					     <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
+			};
+		};
+
+		/*
+		 * Dedicated section for devices behind 32bit controllers so we
+		 * can configure specific DMA mapping for them
+		 */
+		behind-32bit-controller@7f000000 {
+			compatible = "simple-bus";
+			#address-cells = <0x2>;
+			#size-cells = <0x2>;
+			ranges = <0x0 0x0 0x0 0x7f000000 0x0 0x1000000>;
+			/* Host phy ram starts at 0x200M */
+			dma-ranges = <0x0 0x0 0x2 0x0 0x1 0x0>;
+			dma-coherent;
+
+			eth0: ethernet@20000 {
+				compatible = "marvell,armada-ac5-neta";
+				reg = <0x0 0x20000 0x0 0x4000>;
+				interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&cnm_clock>;
+				phy-mode = "sgmii";
+				status = "disabled";
+			};
+
+			eth1: ethernet@24000 {
+				compatible = "marvell,armada-ac5-neta";
+				reg = <0x0 0x24000 0x0 0x4000>;
+				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
+				clocks = <&cnm_clock>;
+				phy-mode = "sgmii";
+				status = "disabled";
+			};
+
+			usb0: usb@80000 {
+				compatible = "marvell,orion-ehci";
+				reg = <0x0 0x80000 0x0 0x500>;
+				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
+				status = "disabled";
+			};
+
+			usb1: usb@a0000 {
+				compatible = "marvell,orion-ehci";
+				reg = <0x0 0xa0000 0x0 0x500>;
+				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
+				status = "disabled";
+			};
+		};
+
+		pinctrl0: pinctrl@80020100 {
+			compatible = "marvell,ac5-pinctrl";
+			reg = <0 0x80020100 0 0x20>;
+
+			i2c0_pins: i2c0-pins {
+				marvell,pins = "mpp26", "mpp27";
+				marvell,function = "i2c0";
+			};
+
+			i2c0_gpio: i2c0-gpio-pins {
+				marvell,pins = "mpp26", "mpp27";
+				marvell,function = "gpio";
+			};
+
+			i2c1_pins: i2c1-pins {
+				marvell,pins = "mpp20", "mpp21";
+				marvell,function = "i2c1";
+			};
+
+			i2c1_gpio: i2c1-gpio-pins {
+				marvell,pins = "mpp20", "mpp21";
+				marvell,function = "i2c1";
+			};
+		};
+
+		spi0: spi@805a0000 {
+			compatible = "marvell,armada-3700-spi";
+			reg = <0x0 0x805a0000 0x0 0x50>;
+			#address-cells = <0x1>;
+			#size-cells = <0x0>;
+			clocks = <&spi_clock>;
+			interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
+			num-cs = <1>;
+			status = "disabled";
+		};
+
+		spi1: spi@805a8000 {
+			compatible = "marvell,armada-3700-spi";
+			reg = <0x0 0x805a8000 0x0 0x50>;
+			#address-cells = <0x1>;
+			#size-cells = <0x0>;
+			clocks = <&spi_clock>;
+			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
+			num-cs = <1>;
+			status = "disabled";
+		};
+
+		gic: interrupt-controller@80600000 {
+			compatible = "arm,gic-v3";
+			#interrupt-cells = <3>;
+			interrupt-controller;
+			reg = <0x0 0x80600000 0x0 0x10000>, /* GICD */
+			      <0x0 0x80660000 0x0 0x40000>; /* GICR */
+			interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>;
+		};
+	};
+
+	clocks {
+		cnm_clock: core-clock {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <325000000>;
+		};
+
+		spi_clock: spi-clock {
+			compatible = "fixed-clock";
+			#clock-cells = <0>;
+			clock-frequency = <200000000>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
new file mode 100644
index 000000000000..f0ebdb84eec9
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
@@ -0,0 +1,101 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For RD-AC5X.
+ *
+ * Copyright (C) 2021 Marvell
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+/*
+ * Device Tree file for Marvell Alleycat 5X development board
+ * This board file supports the B configuration of the board
+ */
+
+/dts-v1/;
+
+#include "ac5-98dx35xx.dtsi"
+
+/ {
+	model = "Marvell RD-AC5X Board";
+	compatible = "marvell,rd-ac5x", "marvell,ac5x", "marvell,ac5";
+
+	aliases {
+		serial0 = &uart0;
+		spiflash0 = &spiflash0;
+		gpio0 = &gpio0;
+		gpio1 = &gpio1;
+		ethernet0 = &eth0;
+		ethernet1 = &eth1;
+	};
+
+	memory@0 {
+		device_type = "memory";
+		reg = <0x2 0x00000000 0x0 0x40000000>;
+	};
+
+	usb1phy: usb-phy {
+		compatible = "usb-nop-xceiv";
+		#phy-cells = <0>;
+	};
+};
+
+&mdio {
+	phy0: ethernet-phy@0 {
+		reg = <0>;
+	};
+};
+
+&i2c0 {
+	status = "okay";
+};
+
+&i2c1 {
+	status = "okay";
+};
+
+&eth0 {
+	status = "okay";
+	phy-handle = <&phy0>;
+};
+
+/* USB0 is a host USB */
+&usb0 {
+	status = "okay";
+};
+
+/* USB1 is a peripheral USB */
+&usb1 {
+	status = "okay";
+	phys = <&usb1phy>;
+	phy-names = "usb-phy";
+	dr_mode = "peripheral";
+};
+
+&spi0 {
+	status = "okay";
+
+	spiflash0: flash@0 {
+		compatible = "jedec,spi-nor";
+		spi-max-frequency = <50000000>;
+		spi-tx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
+		spi-rx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
+		reg = <0>;
+
+		#address-cells = <1>;
+		#size-cells = <1>;
+
+		partition@0 {
+			label = "spi_flash_part0";
+			reg = <0x0 0x800000>;
+		};
+
+		parition@1 {
+			label = "spi_flash_part1";
+			reg = <0x800000 0x700000>;
+		};
+
+		parition@2 {
+			label = "spi_flash_part2";
+			reg = <0xF00000 0x100000>;
+		};
+	};
+};
diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
new file mode 100644
index 000000000000..50d464d9d2f4
--- /dev/null
+++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
@@ -0,0 +1,13 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Device Tree For AC5X.
+ *
+ * Copyright (C) 2022 Allied Telesis Labs
+ */
+
+#include "ac5-98dx25xx.dtsi"
+
+/ {
+	model = "Marvell AC5X SoC";
+	compatible = "marvell,ac5x", "marvell,ac5";
+};
-- 
2.17.1

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Chris Packham]

On 14/06/22 10:53, Vadym Kochan wrote:
> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>
> The 98DX2530 SoC is the Control and Management CPU integrated into
> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
> referred to as AlleyCat5 and AlleyCat5X).
>
> These files have been taken from the Marvell SDK and lightly cleaned
> up with the License and copyright retained.
>
> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> ---
>
> Notes:
>      The Marvell SDK has a number of new compatible strings. I've brought
>      through some of the drivers or where possible used an in-tree
>      alternative (e.g. there is SDK code for a ac5-gpio but two instances of
>      the existing marvell,orion-gpio seems to cover what is needed if you use
>      an appropriate binding). I expect that there will a new series of
>      patches when I get some different hardware (or additions to this series
>      depending on if/when it lands).
>      
>      Changes in v9 (proposed by Marvell):
>        It was discussed with Chris that Marvell will add some changes:
>
>           1) Rename "armada-" prefix in dts(i) file names to ac5, because
>              Armada has not much common with AC5 SoC.
>
>           2) Add clock fixes:
>              - rename core_clock to cnm_clock
>              - remove axi_clock
>              - change cnm_clock to 325MHZ
>              - use cnm_clock for the UART
>
>      Changes in v8:
>      - Remove unnecessary clock-frequency property on armv8-timer
>      - Remove unnecessary redistributor-stride property on gic
>      - Add GIC_SPI interrupts for gpios
>      Changes in v7:
>      - Add missing compatible on usb1
>      - Add "rd-ac5x" compatible for board
>      - Move aliases to board dts
>      - Move board specific usb info to board dts
>      - Consolidate usb1 board settings and remove unnecessary compatible
>      - Add Allied Telesis copyright
>      - Rename files after mailng-list discussion
>      Changes in v6:
>      - Move CPU nodes above the SoC (Krzysztof)
>      - Minor formatting clean ups (Krzysztof)
>      - Run through `make dtbs_check`
>      - Move gic nodes inside SoC
>      - Group clocks under a clock node
>      Changes in v5:
>      - add #{address,size}-cells property to i2c nodes
>      - make i2c nodes disabled in the SoC and enable them in the board
>      - add interrupt controller attributes to gpio nodes
>      - Move fixed-clock nodes up a level and remove unnecessary @0
>      Changes in v4:
>      - use 'phy-handle' instead of 'phy'
>      - move status="okay" on usb nodes to board dts
>      - Add review from Andrew
>      Changes in v3:
>      - Move memory node to board
>      - Use single digit reg value for phy address
>      - Remove MMC node (driver needs work)
>      - Remove syscon & simple-mfd for pinctrl
>      Changes in v2:
>      - Make pinctrl a child node of a syscon node
>      - Use marvell,armada-8k-gpio instead of orion-gpio
>      - Remove nand peripheral. The Marvell SDK does have some changes for the
>        ac5-nand-controller but I currently lack hardware with NAND fitted so
>        I can't test it right now. I've therefore chosen to omit the node and
>        not attempted to bring in the driver or binding.
>      - Remove pcie peripheral. Again there are changes in the SDK and I have
>        no way of testing them.
>      - Remove prestera node.
>      - Remove "marvell,ac5-ehci" compatible from USB node as
>        "marvell,orion-ehci" is sufficient
>      - Remove watchdog node. There is a buggy driver for the ac5 watchdog in
>        the SDK but it needs some work so I've dropped the node for now.
>
>   arch/arm64/boot/dts/marvell/Makefile          |   1 +
>   arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
>   .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
>   arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
>   4 files changed, 406 insertions(+)
>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>
> diff --git a/arch/arm64/boot/dts/marvell/Makefile b/arch/arm64/boot/dts/marvell/Makefile
> index 1c794cdcb8e6..b6d493e34dc5 100644
> --- a/arch/arm64/boot/dts/marvell/Makefile
> +++ b/arch/arm64/boot/dts/marvell/Makefile
> @@ -24,3 +24,4 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
>   dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
>   dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb
>   dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb
> +dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb
> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> new file mode 100644
> index 000000000000..cf0b4a7de323
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> @@ -0,0 +1,291 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Device Tree For AC5.
> + *
> + * Copyright (C) 2021 Marvell
> + * Copyright (C) 2022 Allied Telesis Labs
> + */
> +
> +#include <dt-bindings/gpio/gpio.h>
> +#include <dt-bindings/interrupt-controller/arm-gic.h>
> +
> +/ {
> +	model = "Marvell AC5 SoC";
> +	compatible = "marvell,ac5";
> +	interrupt-parent = <&gic>;
> +	#address-cells = <2>;
> +	#size-cells = <2>;
> +
> +	cpus {
> +		#address-cells = <2>;
> +		#size-cells = <0>;
> +
> +		cpu-map {
> +			cluster0 {
> +				core0 {
> +					cpu = <&cpu0>;
> +				};
> +				core1 {
> +					cpu = <&cpu1>;
> +				};
> +			};
> +		};
> +
> +		cpu0: cpu@0 {
> +			device_type = "cpu";
> +			compatible = "arm,armv8";
> +			reg = <0x0 0x0>;
> +			enable-method = "psci";
> +			next-level-cache = <&l2>;
> +		};
> +
> +		cpu1: cpu@1 {
> +			device_type = "cpu";
> +			compatible = "arm,armv8";
> +			reg = <0x0 0x100>;
> +			enable-method = "psci";
> +			next-level-cache = <&l2>;
> +		};
> +
> +		l2: l2-cache {
> +			compatible = "cache";
> +		};
> +	};
> +
> +	psci {
> +		compatible = "arm,psci-0.2";
> +		method = "smc";
> +	};
> +
> +	timer {
> +		compatible = "arm,armv8-timer";
> +		interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>,
> +			     <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
Marvell confirmed to me that the EL2 virtual timer is not connected to 
an interrupt.
> +	};
> +
> +	pmu {
> +		compatible = "arm,armv8-pmuv3";
> +		interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>;
> +	};
> +
> +	soc {
> +		compatible = "simple-bus";
> +		#address-cells = <2>;
> +		#size-cells = <2>;
> +		ranges;
> +		dma-ranges;
> +
> +		internal-regs@7f000000 {
> +			#address-cells = <1>;
> +			#size-cells = <1>;
> +			compatible = "simple-bus";
> +			/* 16M internal register @ 0x7f00_0000 */
> +			ranges = <0x0 0x0 0x7f000000 0x1000000>;
> +			dma-coherent;
> +
> +			uart0: serial@12000 {
> +				compatible = "snps,dw-apb-uart";
> +				reg = <0x12000 0x100>;
> +				reg-shift = <2>;
> +				interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
> +				reg-io-width = <1>;
> +				clocks = <&cnm_clock>;

With this change I see some garbled output when the "Serial: AMBA PL011 
UART" driver starts.

It could be that my bootloader has the same wrong clock value as the 
earlier iteration of this device tree.

> +				status = "okay";
> +			};
> +
> +			mdio: mdio@22004 {
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +				compatible = "marvell,orion-mdio";
> +				reg = <0x22004 0x4>;
> +				clocks = <&cnm_clock>;
> +			};
> +
> +			i2c0: i2c@11000{
> +				compatible = "marvell,mv78230-i2c";
> +				reg = <0x11000 0x20>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				clocks = <&cnm_clock>;
> +				clock-names = "core";
> +				interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
> +				clock-frequency=<100000>;
> +
> +				pinctrl-names = "default", "gpio";
> +				pinctrl-0 = <&i2c0_pins>;
> +				pinctrl-1 = <&i2c0_gpio>;
> +				scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
> +				sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>;
> +				status = "disabled";
> +			};
> +
> +			i2c1: i2c@11100{
> +				compatible = "marvell,mv78230-i2c";
> +				reg = <0x11100 0x20>;
> +				#address-cells = <1>;
> +				#size-cells = <0>;
> +
> +				clocks = <&cnm_clock>;
> +				clock-names = "core";
> +				interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
> +				clock-frequency=<100000>;
> +
> +				pinctrl-names = "default", "gpio";
> +				pinctrl-0 = <&i2c1_pins>;
> +				pinctrl-1 = <&i2c1_gpio>;
> +				scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;
> +				sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
> +				status = "disabled";
> +			};
> +
> +			gpio0: gpio@18100 {
> +				compatible = "marvell,orion-gpio";
> +				reg = <0x18100 0x40>;
> +				ngpios = <32>;
> +				gpio-controller;
> +				#gpio-cells = <2>;
> +				gpio-ranges = <&pinctrl0 0 0 32>;
> +				marvell,pwm-offset = <0x1f0>;
> +				interrupt-controller;
> +				#interrupt-cells = <2>;
> +				interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
> +					     <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
> +					     <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
> +					     <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
> +			};
> +
> +			gpio1: gpio@18140 {
> +				reg = <0x18140 0x40>;
> +				compatible = "marvell,orion-gpio";
> +				ngpios = <14>;
> +				gpio-controller;
> +				#gpio-cells = <2>;
> +				gpio-ranges = <&pinctrl0 0 32 14>;
> +				marvell,pwm-offset = <0x1f0>;
> +				interrupt-controller;
> +				#interrupt-cells = <2>;
> +				interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
> +					     <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
> +			};
> +		};
> +
> +		/*
> +		 * Dedicated section for devices behind 32bit controllers so we
> +		 * can configure specific DMA mapping for them
> +		 */
> +		behind-32bit-controller@7f000000 {
> +			compatible = "simple-bus";
> +			#address-cells = <0x2>;
> +			#size-cells = <0x2>;
> +			ranges = <0x0 0x0 0x0 0x7f000000 0x0 0x1000000>;
> +			/* Host phy ram starts at 0x200M */
> +			dma-ranges = <0x0 0x0 0x2 0x0 0x1 0x0>;
> +			dma-coherent;
> +
> +			eth0: ethernet@20000 {
> +				compatible = "marvell,armada-ac5-neta";
> +				reg = <0x0 0x20000 0x0 0x4000>;
> +				interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&cnm_clock>;
> +				phy-mode = "sgmii";
> +				status = "disabled";
> +			};
> +
> +			eth1: ethernet@24000 {
> +				compatible = "marvell,armada-ac5-neta";
> +				reg = <0x0 0x24000 0x0 0x4000>;
> +				interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
> +				clocks = <&cnm_clock>;
> +				phy-mode = "sgmii";
> +				status = "disabled";
> +			};
> +
> +			usb0: usb@80000 {
> +				compatible = "marvell,orion-ehci";
> +				reg = <0x0 0x80000 0x0 0x500>;
> +				interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
> +				status = "disabled";
> +			};
> +
> +			usb1: usb@a0000 {
> +				compatible = "marvell,orion-ehci";
> +				reg = <0x0 0xa0000 0x0 0x500>;
> +				interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
> +				status = "disabled";
> +			};
> +		};
> +
> +		pinctrl0: pinctrl@80020100 {
> +			compatible = "marvell,ac5-pinctrl";
> +			reg = <0 0x80020100 0 0x20>;
> +
> +			i2c0_pins: i2c0-pins {
> +				marvell,pins = "mpp26", "mpp27";
> +				marvell,function = "i2c0";
> +			};
> +
> +			i2c0_gpio: i2c0-gpio-pins {
> +				marvell,pins = "mpp26", "mpp27";
> +				marvell,function = "gpio";
> +			};
> +
> +			i2c1_pins: i2c1-pins {
> +				marvell,pins = "mpp20", "mpp21";
> +				marvell,function = "i2c1";
> +			};
> +
> +			i2c1_gpio: i2c1-gpio-pins {
> +				marvell,pins = "mpp20", "mpp21";
> +				marvell,function = "i2c1";
> +			};
> +		};
> +
> +		spi0: spi@805a0000 {
> +			compatible = "marvell,armada-3700-spi";
> +			reg = <0x0 0x805a0000 0x0 0x50>;
> +			#address-cells = <0x1>;
> +			#size-cells = <0x0>;
> +			clocks = <&spi_clock>;
> +			interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
> +			num-cs = <1>;
> +			status = "disabled";
> +		};
> +
> +		spi1: spi@805a8000 {
> +			compatible = "marvell,armada-3700-spi";
> +			reg = <0x0 0x805a8000 0x0 0x50>;
> +			#address-cells = <0x1>;
> +			#size-cells = <0x0>;
> +			clocks = <&spi_clock>;
> +			interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
> +			num-cs = <1>;
> +			status = "disabled";
> +		};
> +
> +		gic: interrupt-controller@80600000 {
> +			compatible = "arm,gic-v3";
> +			#interrupt-cells = <3>;
> +			interrupt-controller;
> +			reg = <0x0 0x80600000 0x0 0x10000>, /* GICD */
> +			      <0x0 0x80660000 0x0 0x40000>; /* GICR */
> +			interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>;
> +		};
> +	};
> +
> +	clocks {
> +		cnm_clock: core-clock {
> +			compatible = "fixed-clock";
> +			#clock-cells = <0>;
> +			clock-frequency = <325000000>;
> +		};
> +
> +		spi_clock: spi-clock {
> +			compatible = "fixed-clock";
> +			#clock-cells = <0>;
> +			clock-frequency = <200000000>;
> +		};
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
> new file mode 100644
> index 000000000000..f0ebdb84eec9
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
> @@ -0,0 +1,101 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Device Tree For RD-AC5X.
> + *
> + * Copyright (C) 2021 Marvell
> + * Copyright (C) 2022 Allied Telesis Labs
> + */
> +/*
> + * Device Tree file for Marvell Alleycat 5X development board
> + * This board file supports the B configuration of the board
> + */
> +
> +/dts-v1/;
> +
> +#include "ac5-98dx35xx.dtsi"
> +
> +/ {
> +	model = "Marvell RD-AC5X Board";
> +	compatible = "marvell,rd-ac5x", "marvell,ac5x", "marvell,ac5";
> +
> +	aliases {
> +		serial0 = &uart0;
> +		spiflash0 = &spiflash0;
> +		gpio0 = &gpio0;
> +		gpio1 = &gpio1;
> +		ethernet0 = &eth0;
> +		ethernet1 = &eth1;
> +	};
> +
> +	memory@0 {
> +		device_type = "memory";
> +		reg = <0x2 0x00000000 0x0 0x40000000>;
> +	};
> +
> +	usb1phy: usb-phy {
> +		compatible = "usb-nop-xceiv";
> +		#phy-cells = <0>;
> +	};
> +};
> +
> +&mdio {
> +	phy0: ethernet-phy@0 {
> +		reg = <0>;
> +	};
> +};
> +
> +&i2c0 {
> +	status = "okay";
> +};
> +
> +&i2c1 {
> +	status = "okay";
> +};
> +
> +&eth0 {
> +	status = "okay";
> +	phy-handle = <&phy0>;
> +};
> +
> +/* USB0 is a host USB */
> +&usb0 {
> +	status = "okay";
> +};
> +
> +/* USB1 is a peripheral USB */
> +&usb1 {
> +	status = "okay";
> +	phys = <&usb1phy>;
> +	phy-names = "usb-phy";
> +	dr_mode = "peripheral";
> +};
> +
> +&spi0 {
> +	status = "okay";
> +
> +	spiflash0: flash@0 {
> +		compatible = "jedec,spi-nor";
> +		spi-max-frequency = <50000000>;
> +		spi-tx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
> +		spi-rx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
> +		reg = <0>;
> +
> +		#address-cells = <1>;
> +		#size-cells = <1>;
> +
> +		partition@0 {
> +			label = "spi_flash_part0";
> +			reg = <0x0 0x800000>;
> +		};
> +
> +		parition@1 {
> +			label = "spi_flash_part1";
> +			reg = <0x800000 0x700000>;
> +		};
> +
> +		parition@2 {
> +			label = "spi_flash_part2";
> +			reg = <0xF00000 0x100000>;
> +		};
> +	};
> +};
> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
> new file mode 100644
> index 000000000000..50d464d9d2f4
> --- /dev/null
> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
> @@ -0,0 +1,13 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +/*
> + * Device Tree For AC5X.
> + *
> + * Copyright (C) 2022 Allied Telesis Labs
> + */
> +
> +#include "ac5-98dx25xx.dtsi"
> +
> +/ {
> +	model = "Marvell AC5X SoC";
> +	compatible = "marvell,ac5x", "marvell,ac5";
> +};

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Chris Packham]

On 14/06/22 17:11, Chris Packham wrote:
>
> On 14/06/22 10:53, Vadym Kochan wrote:
>> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>
>> The 98DX2530 SoC is the Control and Management CPU integrated into
>> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
>> referred to as AlleyCat5 and AlleyCat5X).
>>
>> These files have been taken from the Marvell SDK and lightly cleaned
>> up with the License and copyright retained.
>>
>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
>> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
>> ---
>>
>> Notes:
>>      The Marvell SDK has a number of new compatible strings. I've 
>> brought
>>      through some of the drivers or where possible used an in-tree
>>      alternative (e.g. there is SDK code for a ac5-gpio but two 
>> instances of
>>      the existing marvell,orion-gpio seems to cover what is needed if 
>> you use
>>      an appropriate binding). I expect that there will a new series of
>>      patches when I get some different hardware (or additions to this 
>> series
>>      depending on if/when it lands).
>>           Changes in v9 (proposed by Marvell):
>>        It was discussed with Chris that Marvell will add some changes:
>>
>>           1) Rename "armada-" prefix in dts(i) file names to ac5, 
>> because
>>              Armada has not much common with AC5 SoC.
>>
>>           2) Add clock fixes:
>>              - rename core_clock to cnm_clock
>>              - remove axi_clock
>>              - change cnm_clock to 325MHZ
>>              - use cnm_clock for the UART
>>
>>      Changes in v8:
>>      - Remove unnecessary clock-frequency property on armv8-timer
>>      - Remove unnecessary redistributor-stride property on gic
>>      - Add GIC_SPI interrupts for gpios
>>      Changes in v7:
>>      - Add missing compatible on usb1
>>      - Add "rd-ac5x" compatible for board
>>      - Move aliases to board dts
>>      - Move board specific usb info to board dts
>>      - Consolidate usb1 board settings and remove unnecessary compatible
>>      - Add Allied Telesis copyright
>>      - Rename files after mailng-list discussion
>>      Changes in v6:
>>      - Move CPU nodes above the SoC (Krzysztof)
>>      - Minor formatting clean ups (Krzysztof)
>>      - Run through `make dtbs_check`
>>      - Move gic nodes inside SoC
>>      - Group clocks under a clock node
>>      Changes in v5:
>>      - add #{address,size}-cells property to i2c nodes
>>      - make i2c nodes disabled in the SoC and enable them in the board
>>      - add interrupt controller attributes to gpio nodes
>>      - Move fixed-clock nodes up a level and remove unnecessary @0
>>      Changes in v4:
>>      - use 'phy-handle' instead of 'phy'
>>      - move status="okay" on usb nodes to board dts
>>      - Add review from Andrew
>>      Changes in v3:
>>      - Move memory node to board
>>      - Use single digit reg value for phy address
>>      - Remove MMC node (driver needs work)
>>      - Remove syscon & simple-mfd for pinctrl
>>      Changes in v2:
>>      - Make pinctrl a child node of a syscon node
>>      - Use marvell,armada-8k-gpio instead of orion-gpio
>>      - Remove nand peripheral. The Marvell SDK does have some changes 
>> for the
>>        ac5-nand-controller but I currently lack hardware with NAND 
>> fitted so
>>        I can't test it right now. I've therefore chosen to omit the 
>> node and
>>        not attempted to bring in the driver or binding.
>>      - Remove pcie peripheral. Again there are changes in the SDK and 
>> I have
>>        no way of testing them.
>>      - Remove prestera node.
>>      - Remove "marvell,ac5-ehci" compatible from USB node as
>>        "marvell,orion-ehci" is sufficient
>>      - Remove watchdog node. There is a buggy driver for the ac5 
>> watchdog in
>>        the SDK but it needs some work so I've dropped the node for now.
>>
>>   arch/arm64/boot/dts/marvell/Makefile          |   1 +
>>   arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
>>   .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
>>   arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
>>   4 files changed, 406 insertions(+)
>>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>>
>> diff --git a/arch/arm64/boot/dts/marvell/Makefile 
>> b/arch/arm64/boot/dts/marvell/Makefile
>> index 1c794cdcb8e6..b6d493e34dc5 100644
>> --- a/arch/arm64/boot/dts/marvell/Makefile
>> +++ b/arch/arm64/boot/dts/marvell/Makefile
>> @@ -24,3 +24,4 @@ dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db.dtb
>>   dtb-$(CONFIG_ARCH_MVEBU) += cn9132-db-B.dtb
>>   dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-A.dtb
>>   dtb-$(CONFIG_ARCH_MVEBU) += cn9130-crb-B.dtb
>> +dtb-$(CONFIG_ARCH_MVEBU) += ac5-98dx35xx-rd.dtb
>> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi 
>> b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>> new file mode 100644
>> index 000000000000..cf0b4a7de323
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>> @@ -0,0 +1,291 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Device Tree For AC5.
>> + *
>> + * Copyright (C) 2021 Marvell
>> + * Copyright (C) 2022 Allied Telesis Labs
>> + */
>> +
>> +#include <dt-bindings/gpio/gpio.h>
>> +#include <dt-bindings/interrupt-controller/arm-gic.h>
>> +
>> +/ {
>> +    model = "Marvell AC5 SoC";
>> +    compatible = "marvell,ac5";
>> +    interrupt-parent = <&gic>;
>> +    #address-cells = <2>;
>> +    #size-cells = <2>;
>> +
>> +    cpus {
>> +        #address-cells = <2>;
>> +        #size-cells = <0>;
>> +
>> +        cpu-map {
>> +            cluster0 {
>> +                core0 {
>> +                    cpu = <&cpu0>;
>> +                };
>> +                core1 {
>> +                    cpu = <&cpu1>;
>> +                };
>> +            };
>> +        };
>> +
>> +        cpu0: cpu@0 {
>> +            device_type = "cpu";
>> +            compatible = "arm,armv8";
>> +            reg = <0x0 0x0>;
>> +            enable-method = "psci";
>> +            next-level-cache = <&l2>;
>> +        };
>> +
>> +        cpu1: cpu@1 {
>> +            device_type = "cpu";
>> +            compatible = "arm,armv8";
>> +            reg = <0x0 0x100>;
>> +            enable-method = "psci";
>> +            next-level-cache = <&l2>;
>> +        };
>> +
>> +        l2: l2-cache {
>> +            compatible = "cache";
>> +        };
>> +    };
>> +
>> +    psci {
>> +        compatible = "arm,psci-0.2";
>> +        method = "smc";
>> +    };
>> +
>> +    timer {
>> +        compatible = "arm,armv8-timer";
>> +        interrupts = <GIC_PPI 9 IRQ_TYPE_LEVEL_HIGH>,
>> +                 <GIC_PPI 8 IRQ_TYPE_LEVEL_HIGH>,
>> +                 <GIC_PPI 10 IRQ_TYPE_LEVEL_HIGH>,
>> +                 <GIC_PPI 7 IRQ_TYPE_LEVEL_HIGH>;
> Marvell confirmed to me that the EL2 virtual timer is not connected to 
> an interrupt.
>> +    };
>> +
>> +    pmu {
>> +        compatible = "arm,armv8-pmuv3";
>> +        interrupts = <GIC_PPI 12 IRQ_TYPE_LEVEL_HIGH>;
>> +    };
>> +
>> +    soc {
>> +        compatible = "simple-bus";
>> +        #address-cells = <2>;
>> +        #size-cells = <2>;
>> +        ranges;
>> +        dma-ranges;
>> +
>> +        internal-regs@7f000000 {
>> +            #address-cells = <1>;
>> +            #size-cells = <1>;
>> +            compatible = "simple-bus";
>> +            /* 16M internal register @ 0x7f00_0000 */
>> +            ranges = <0x0 0x0 0x7f000000 0x1000000>;
>> +            dma-coherent;
>> +
>> +            uart0: serial@12000 {
>> +                compatible = "snps,dw-apb-uart";
>> +                reg = <0x12000 0x100>;
>> +                reg-shift = <2>;
>> +                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>> +                reg-io-width = <1>;
>> +                clocks = <&cnm_clock>;
>
> With this change I see some garbled output when the "Serial: AMBA 
> PL011 UART" driver starts.
>
> It could be that my bootloader has the same wrong clock value as the 
> earlier iteration of this device tree.
Fixing u-boot doesn't help but there are also references to 328000000 in 
mv-ddr and ATF so I'll look to see if updating them fixes the issue 
tomorrow.
>
>> +                status = "okay";
>> +            };
>> +
>> +            mdio: mdio@22004 {
>> +                #address-cells = <1>;
>> +                #size-cells = <0>;
>> +                compatible = "marvell,orion-mdio";
>> +                reg = <0x22004 0x4>;
>> +                clocks = <&cnm_clock>;
>> +            };
>> +
>> +            i2c0: i2c@11000{
>> +                compatible = "marvell,mv78230-i2c";
>> +                reg = <0x11000 0x20>;
>> +                #address-cells = <1>;
>> +                #size-cells = <0>;
>> +
>> +                clocks = <&cnm_clock>;
>> +                clock-names = "core";
>> +                interrupts = <GIC_SPI 87 IRQ_TYPE_LEVEL_HIGH>;
>> +                clock-frequency=<100000>;
>> +
>> +                pinctrl-names = "default", "gpio";
>> +                pinctrl-0 = <&i2c0_pins>;
>> +                pinctrl-1 = <&i2c0_gpio>;
>> +                scl_gpio = <&gpio0 26 GPIO_ACTIVE_HIGH>;
>> +                sda_gpio = <&gpio0 27 GPIO_ACTIVE_HIGH>;
>> +                status = "disabled";
>> +            };
>> +
>> +            i2c1: i2c@11100{
>> +                compatible = "marvell,mv78230-i2c";
>> +                reg = <0x11100 0x20>;
>> +                #address-cells = <1>;
>> +                #size-cells = <0>;
>> +
>> +                clocks = <&cnm_clock>;
>> +                clock-names = "core";
>> +                interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
>> +                clock-frequency=<100000>;
>> +
>> +                pinctrl-names = "default", "gpio";
>> +                pinctrl-0 = <&i2c1_pins>;
>> +                pinctrl-1 = <&i2c1_gpio>;
>> +                scl_gpio = <&gpio0 20 GPIO_ACTIVE_HIGH>;
>> +                sda_gpio = <&gpio0 21 GPIO_ACTIVE_HIGH>;
>> +                status = "disabled";
>> +            };
>> +
>> +            gpio0: gpio@18100 {
>> +                compatible = "marvell,orion-gpio";
>> +                reg = <0x18100 0x40>;
>> +                ngpios = <32>;
>> +                gpio-controller;
>> +                #gpio-cells = <2>;
>> +                gpio-ranges = <&pinctrl0 0 0 32>;
>> +                marvell,pwm-offset = <0x1f0>;
>> +                interrupt-controller;
>> +                #interrupt-cells = <2>;
>> +                interrupts = <GIC_SPI 75 IRQ_TYPE_LEVEL_HIGH>,
>> +                         <GIC_SPI 76 IRQ_TYPE_LEVEL_HIGH>,
>> +                         <GIC_SPI 77 IRQ_TYPE_LEVEL_HIGH>,
>> +                         <GIC_SPI 78 IRQ_TYPE_LEVEL_HIGH>;
>> +            };
>> +
>> +            gpio1: gpio@18140 {
>> +                reg = <0x18140 0x40>;
>> +                compatible = "marvell,orion-gpio";
>> +                ngpios = <14>;
>> +                gpio-controller;
>> +                #gpio-cells = <2>;
>> +                gpio-ranges = <&pinctrl0 0 32 14>;
>> +                marvell,pwm-offset = <0x1f0>;
>> +                interrupt-controller;
>> +                #interrupt-cells = <2>;
>> +                interrupts = <GIC_SPI 79 IRQ_TYPE_LEVEL_HIGH>,
>> +                         <GIC_SPI 80 IRQ_TYPE_LEVEL_HIGH>;
>> +            };
>> +        };
>> +
>> +        /*
>> +         * Dedicated section for devices behind 32bit controllers so we
>> +         * can configure specific DMA mapping for them
>> +         */
>> +        behind-32bit-controller@7f000000 {
>> +            compatible = "simple-bus";
>> +            #address-cells = <0x2>;
>> +            #size-cells = <0x2>;
>> +            ranges = <0x0 0x0 0x0 0x7f000000 0x0 0x1000000>;
>> +            /* Host phy ram starts at 0x200M */
>> +            dma-ranges = <0x0 0x0 0x2 0x0 0x1 0x0>;
>> +            dma-coherent;
>> +
>> +            eth0: ethernet@20000 {
>> +                compatible = "marvell,armada-ac5-neta";
>> +                reg = <0x0 0x20000 0x0 0x4000>;
>> +                interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
>> +                clocks = <&cnm_clock>;
>> +                phy-mode = "sgmii";
>> +                status = "disabled";
>> +            };
>> +
>> +            eth1: ethernet@24000 {
>> +                compatible = "marvell,armada-ac5-neta";
>> +                reg = <0x0 0x24000 0x0 0x4000>;
>> +                interrupts = <GIC_SPI 55 IRQ_TYPE_LEVEL_HIGH>;
>> +                clocks = <&cnm_clock>;
>> +                phy-mode = "sgmii";
>> +                status = "disabled";
>> +            };
>> +
>> +            usb0: usb@80000 {
>> +                compatible = "marvell,orion-ehci";
>> +                reg = <0x0 0x80000 0x0 0x500>;
>> +                interrupts = <GIC_SPI 67 IRQ_TYPE_LEVEL_HIGH>;
>> +                status = "disabled";
>> +            };
>> +
>> +            usb1: usb@a0000 {
>> +                compatible = "marvell,orion-ehci";
>> +                reg = <0x0 0xa0000 0x0 0x500>;
>> +                interrupts = <GIC_SPI 69 IRQ_TYPE_LEVEL_HIGH>;
>> +                status = "disabled";
>> +            };
>> +        };
>> +
>> +        pinctrl0: pinctrl@80020100 {
>> +            compatible = "marvell,ac5-pinctrl";
>> +            reg = <0 0x80020100 0 0x20>;
>> +
>> +            i2c0_pins: i2c0-pins {
>> +                marvell,pins = "mpp26", "mpp27";
>> +                marvell,function = "i2c0";
>> +            };
>> +
>> +            i2c0_gpio: i2c0-gpio-pins {
>> +                marvell,pins = "mpp26", "mpp27";
>> +                marvell,function = "gpio";
>> +            };
>> +
>> +            i2c1_pins: i2c1-pins {
>> +                marvell,pins = "mpp20", "mpp21";
>> +                marvell,function = "i2c1";
>> +            };
>> +
>> +            i2c1_gpio: i2c1-gpio-pins {
>> +                marvell,pins = "mpp20", "mpp21";
>> +                marvell,function = "i2c1";
>> +            };
>> +        };
>> +
>> +        spi0: spi@805a0000 {
>> +            compatible = "marvell,armada-3700-spi";
>> +            reg = <0x0 0x805a0000 0x0 0x50>;
>> +            #address-cells = <0x1>;
>> +            #size-cells = <0x0>;
>> +            clocks = <&spi_clock>;
>> +            interrupts = <GIC_SPI 90 IRQ_TYPE_LEVEL_HIGH>;
>> +            num-cs = <1>;
>> +            status = "disabled";
>> +        };
>> +
>> +        spi1: spi@805a8000 {
>> +            compatible = "marvell,armada-3700-spi";
>> +            reg = <0x0 0x805a8000 0x0 0x50>;
>> +            #address-cells = <0x1>;
>> +            #size-cells = <0x0>;
>> +            clocks = <&spi_clock>;
>> +            interrupts = <GIC_SPI 91 IRQ_TYPE_LEVEL_HIGH>;
>> +            num-cs = <1>;
>> +            status = "disabled";
>> +        };
>> +
>> +        gic: interrupt-controller@80600000 {
>> +            compatible = "arm,gic-v3";
>> +            #interrupt-cells = <3>;
>> +            interrupt-controller;
>> +            reg = <0x0 0x80600000 0x0 0x10000>, /* GICD */
>> +                  <0x0 0x80660000 0x0 0x40000>; /* GICR */
>> +            interrupts = <GIC_PPI 6 IRQ_TYPE_LEVEL_HIGH>;
>> +        };
>> +    };
>> +
>> +    clocks {
>> +        cnm_clock: core-clock {
>> +            compatible = "fixed-clock";
>> +            #clock-cells = <0>;
>> +            clock-frequency = <325000000>;
>> +        };
>> +
>> +        spi_clock: spi-clock {
>> +            compatible = "fixed-clock";
>> +            #clock-cells = <0>;
>> +            clock-frequency = <200000000>;
>> +        };
>> +    };
>> +};
>> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts 
>> b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>> new file mode 100644
>> index 000000000000..f0ebdb84eec9
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>> @@ -0,0 +1,101 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Device Tree For RD-AC5X.
>> + *
>> + * Copyright (C) 2021 Marvell
>> + * Copyright (C) 2022 Allied Telesis Labs
>> + */
>> +/*
>> + * Device Tree file for Marvell Alleycat 5X development board
>> + * This board file supports the B configuration of the board
>> + */
>> +
>> +/dts-v1/;
>> +
>> +#include "ac5-98dx35xx.dtsi"
>> +
>> +/ {
>> +    model = "Marvell RD-AC5X Board";
>> +    compatible = "marvell,rd-ac5x", "marvell,ac5x", "marvell,ac5";
>> +
>> +    aliases {
>> +        serial0 = &uart0;
>> +        spiflash0 = &spiflash0;
>> +        gpio0 = &gpio0;
>> +        gpio1 = &gpio1;
>> +        ethernet0 = &eth0;
>> +        ethernet1 = &eth1;
>> +    };
>> +
>> +    memory@0 {
>> +        device_type = "memory";
>> +        reg = <0x2 0x00000000 0x0 0x40000000>;
>> +    };
>> +
>> +    usb1phy: usb-phy {
>> +        compatible = "usb-nop-xceiv";
>> +        #phy-cells = <0>;
>> +    };
>> +};
>> +
>> +&mdio {
>> +    phy0: ethernet-phy@0 {
>> +        reg = <0>;
>> +    };
>> +};
>> +
>> +&i2c0 {
>> +    status = "okay";
>> +};
>> +
>> +&i2c1 {
>> +    status = "okay";
>> +};
>> +
>> +&eth0 {
>> +    status = "okay";
>> +    phy-handle = <&phy0>;
>> +};
>> +
>> +/* USB0 is a host USB */
>> +&usb0 {
>> +    status = "okay";
>> +};
>> +
>> +/* USB1 is a peripheral USB */
>> +&usb1 {
>> +    status = "okay";
>> +    phys = <&usb1phy>;
>> +    phy-names = "usb-phy";
>> +    dr_mode = "peripheral";
>> +};
>> +
>> +&spi0 {
>> +    status = "okay";
>> +
>> +    spiflash0: flash@0 {
>> +        compatible = "jedec,spi-nor";
>> +        spi-max-frequency = <50000000>;
>> +        spi-tx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
>> +        spi-rx-bus-width = <1>; /* 1-single, 2-dual, 4-quad */
>> +        reg = <0>;
>> +
>> +        #address-cells = <1>;
>> +        #size-cells = <1>;
>> +
>> +        partition@0 {
>> +            label = "spi_flash_part0";
>> +            reg = <0x0 0x800000>;
>> +        };
>> +
>> +        parition@1 {
>> +            label = "spi_flash_part1";
>> +            reg = <0x800000 0x700000>;
>> +        };
>> +
>> +        parition@2 {
>> +            label = "spi_flash_part2";
>> +            reg = <0xF00000 0x100000>;
>> +        };
>> +    };
>> +};
>> diff --git a/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi 
>> b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>> new file mode 100644
>> index 000000000000..50d464d9d2f4
>> --- /dev/null
>> +++ b/arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>> @@ -0,0 +1,13 @@
>> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
>> +/*
>> + * Device Tree For AC5X.
>> + *
>> + * Copyright (C) 2022 Allied Telesis Labs
>> + */
>> +
>> +#include "ac5-98dx25xx.dtsi"
>> +
>> +/ {
>> +    model = "Marvell AC5X SoC";
>> +    compatible = "marvell,ac5x", "marvell,ac5";
>> +};

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Vadym Kochan]

Hi Chris,

On Tue, Jun 14, 2022 at 05:26:39AM +0000, Chris Packham wrote:
> 
> On 14/06/22 17:11, Chris Packham wrote:
> >
> > On 14/06/22 10:53, Vadym Kochan wrote:
> >> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
> >>
> >> The 98DX2530 SoC is the Control and Management CPU integrated into
> >> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
> >> referred to as AlleyCat5 and AlleyCat5X).
> >>
> >> These files have been taken from the Marvell SDK and lightly cleaned
> >> up with the License and copyright retained.
> >>
> >> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
> >> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
> >> ---
> >>
> >> Notes:
> >>      The Marvell SDK has a number of new compatible strings. I've 
> >> brought
> >>      through some of the drivers or where possible used an in-tree
> >>      alternative (e.g. there is SDK code for a ac5-gpio but two 
> >> instances of
> >>      the existing marvell,orion-gpio seems to cover what is needed if 
> >> you use
> >>      an appropriate binding). I expect that there will a new series of
> >>      patches when I get some different hardware (or additions to this 
> >> series
> >>      depending on if/when it lands).
> >>           Changes in v9 (proposed by Marvell):
> >>        It was discussed with Chris that Marvell will add some changes:
> >>
> >>           1) Rename "armada-" prefix in dts(i) file names to ac5, 
> >> because
> >>              Armada has not much common with AC5 SoC.
> >>
> >>           2) Add clock fixes:
> >>              - rename core_clock to cnm_clock
> >>              - remove axi_clock
> >>              - change cnm_clock to 325MHZ
> >>              - use cnm_clock for the UART
> >>
> >>      Changes in v8:
> >>      - Remove unnecessary clock-frequency property on armv8-timer
> >>      - Remove unnecessary redistributor-stride property on gic
> >>      - Add GIC_SPI interrupts for gpios
> >>      Changes in v7:
> >>      - Add missing compatible on usb1
> >>      - Add "rd-ac5x" compatible for board
> >>      - Move aliases to board dts
> >>      - Move board specific usb info to board dts
> >>      - Consolidate usb1 board settings and remove unnecessary compatible
> >>      - Add Allied Telesis copyright
> >>      - Rename files after mailng-list discussion
> >>      Changes in v6:
> >>      - Move CPU nodes above the SoC (Krzysztof)
> >>      - Minor formatting clean ups (Krzysztof)
> >>      - Run through `make dtbs_check`
> >>      - Move gic nodes inside SoC
> >>      - Group clocks under a clock node
> >>      Changes in v5:
> >>      - add #{address,size}-cells property to i2c nodes
> >>      - make i2c nodes disabled in the SoC and enable them in the board
> >>      - add interrupt controller attributes to gpio nodes
> >>      - Move fixed-clock nodes up a level and remove unnecessary @0
> >>      Changes in v4:
> >>      - use 'phy-handle' instead of 'phy'
> >>      - move status="okay" on usb nodes to board dts
> >>      - Add review from Andrew
> >>      Changes in v3:
> >>      - Move memory node to board
> >>      - Use single digit reg value for phy address
> >>      - Remove MMC node (driver needs work)
> >>      - Remove syscon & simple-mfd for pinctrl
> >>      Changes in v2:
> >>      - Make pinctrl a child node of a syscon node
> >>      - Use marvell,armada-8k-gpio instead of orion-gpio
> >>      - Remove nand peripheral. The Marvell SDK does have some changes 
> >> for the
> >>        ac5-nand-controller but I currently lack hardware with NAND 
> >> fitted so
> >>        I can't test it right now. I've therefore chosen to omit the 
> >> node and
> >>        not attempted to bring in the driver or binding.
> >>      - Remove pcie peripheral. Again there are changes in the SDK and 
> >> I have
> >>        no way of testing them.
> >>      - Remove prestera node.
> >>      - Remove "marvell,ac5-ehci" compatible from USB node as
> >>        "marvell,orion-ehci" is sufficient
> >>      - Remove watchdog node. There is a buggy driver for the ac5 
> >> watchdog in
> >>        the SDK but it needs some work so I've dropped the node for now.
> >>
> >>   arch/arm64/boot/dts/marvell/Makefile          |   1 +
> >>   arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
> >>   .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
> >>   arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
> >>   4 files changed, 406 insertions(+)
> >>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
> >>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
> >>   create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
> >>

[snip]

> >> +
> >> +            uart0: serial@12000 {
> >> +                compatible = "snps,dw-apb-uart";
> >> +                reg = <0x12000 0x100>;
> >> +                reg-shift = <2>;
> >> +                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
> >> +                reg-io-width = <1>;
> >> +                clocks = <&cnm_clock>;
> >
> > With this change I see some garbled output when the "Serial: AMBA 
> > PL011 UART" driver starts.
> >
> > It could be that my bootloader has the same wrong clock value as the 
> > earlier iteration of this device tree.
> Fixing u-boot doesn't help but there are also references to 328000000 in 
> mv-ddr and ATF so I'll look to see if updating them fixes the issue 
> tomorrow.
> >

Interesting, because Marvell suggested to use cnm_clock with 328MHz for AC5, and 325MHz
for AC5X.

[snip]

> >> +
> >> +    clocks {
> >> +        cnm_clock: core-clock {
> >> +            compatible = "fixed-clock";
> >> +            #clock-cells = <0>;
> >> +            clock-frequency = <325000000>;
> >> +        };
> >> +
> >> +        spi_clock: spi-clock {
> >> +            compatible = "fixed-clock";
> >> +            #clock-cells = <0>;
> >> +            clock-frequency = <200000000>;
> >> +        };
> >> +    };
> >> +};

[snip]

Regards,

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Chris Packham]

+cc: Elad

On 14/06/22 20:16, Vadym Kochan wrote:
> Hi Chris,
>
> On Tue, Jun 14, 2022 at 05:26:39AM +0000, Chris Packham wrote:
>> On 14/06/22 17:11, Chris Packham wrote:
>>> On 14/06/22 10:53, Vadym Kochan wrote:
>>>> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>>
>>>> The 98DX2530 SoC is the Control and Management CPU integrated into
>>>> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
>>>> referred to as AlleyCat5 and AlleyCat5X).
>>>>
>>>> These files have been taken from the Marvell SDK and lightly cleaned
>>>> up with the License and copyright retained.
>>>>
>>>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
>>>> ---
>>>>
>>>> Notes:
>>>>       The Marvell SDK has a number of new compatible strings. I've
>>>> brought
>>>>       through some of the drivers or where possible used an in-tree
>>>>       alternative (e.g. there is SDK code for a ac5-gpio but two
>>>> instances of
>>>>       the existing marvell,orion-gpio seems to cover what is needed if
>>>> you use
>>>>       an appropriate binding). I expect that there will a new series of
>>>>       patches when I get some different hardware (or additions to this
>>>> series
>>>>       depending on if/when it lands).
>>>>            Changes in v9 (proposed by Marvell):
>>>>         It was discussed with Chris that Marvell will add some changes:
>>>>
>>>>            1) Rename "armada-" prefix in dts(i) file names to ac5,
>>>> because
>>>>               Armada has not much common with AC5 SoC.
>>>>
>>>>            2) Add clock fixes:
>>>>               - rename core_clock to cnm_clock
>>>>               - remove axi_clock
>>>>               - change cnm_clock to 325MHZ
>>>>               - use cnm_clock for the UART
>>>>
>>>>       Changes in v8:
>>>>       - Remove unnecessary clock-frequency property on armv8-timer
>>>>       - Remove unnecessary redistributor-stride property on gic
>>>>       - Add GIC_SPI interrupts for gpios
>>>>       Changes in v7:
>>>>       - Add missing compatible on usb1
>>>>       - Add "rd-ac5x" compatible for board
>>>>       - Move aliases to board dts
>>>>       - Move board specific usb info to board dts
>>>>       - Consolidate usb1 board settings and remove unnecessary compatible
>>>>       - Add Allied Telesis copyright
>>>>       - Rename files after mailng-list discussion
>>>>       Changes in v6:
>>>>       - Move CPU nodes above the SoC (Krzysztof)
>>>>       - Minor formatting clean ups (Krzysztof)
>>>>       - Run through `make dtbs_check`
>>>>       - Move gic nodes inside SoC
>>>>       - Group clocks under a clock node
>>>>       Changes in v5:
>>>>       - add #{address,size}-cells property to i2c nodes
>>>>       - make i2c nodes disabled in the SoC and enable them in the board
>>>>       - add interrupt controller attributes to gpio nodes
>>>>       - Move fixed-clock nodes up a level and remove unnecessary @0
>>>>       Changes in v4:
>>>>       - use 'phy-handle' instead of 'phy'
>>>>       - move status="okay" on usb nodes to board dts
>>>>       - Add review from Andrew
>>>>       Changes in v3:
>>>>       - Move memory node to board
>>>>       - Use single digit reg value for phy address
>>>>       - Remove MMC node (driver needs work)
>>>>       - Remove syscon & simple-mfd for pinctrl
>>>>       Changes in v2:
>>>>       - Make pinctrl a child node of a syscon node
>>>>       - Use marvell,armada-8k-gpio instead of orion-gpio
>>>>       - Remove nand peripheral. The Marvell SDK does have some changes
>>>> for the
>>>>         ac5-nand-controller but I currently lack hardware with NAND
>>>> fitted so
>>>>         I can't test it right now. I've therefore chosen to omit the
>>>> node and
>>>>         not attempted to bring in the driver or binding.
>>>>       - Remove pcie peripheral. Again there are changes in the SDK and
>>>> I have
>>>>         no way of testing them.
>>>>       - Remove prestera node.
>>>>       - Remove "marvell,ac5-ehci" compatible from USB node as
>>>>         "marvell,orion-ehci" is sufficient
>>>>       - Remove watchdog node. There is a buggy driver for the ac5
>>>> watchdog in
>>>>         the SDK but it needs some work so I've dropped the node for now.
>>>>
>>>>    arch/arm64/boot/dts/marvell/Makefile          |   1 +
>>>>    arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 ++++++++++++++++++
>>>>    .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
>>>>    arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
>>>>    4 files changed, 406 insertions(+)
>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>>>>
> [snip]
>
>>>> +
>>>> +            uart0: serial@12000 {
>>>> +                compatible = "snps,dw-apb-uart";
>>>> +                reg = <0x12000 0x100>;
>>>> +                reg-shift = <2>;
>>>> +                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>>>> +                reg-io-width = <1>;
>>>> +                clocks = <&cnm_clock>;
>>> With this change I see some garbled output when the "Serial: AMBA
>>> PL011 UART" driver starts.
>>>
>>> It could be that my bootloader has the same wrong clock value as the
>>> earlier iteration of this device tree.
>> Fixing u-boot doesn't help but there are also references to 328000000 in
>> mv-ddr and ATF so I'll look to see if updating them fixes the issue
>> tomorrow.

Even  with changing ATF and mv_ddr to use 325000000 I still end up with 
the garbled output when the driver starts. I don't know if there's 
something special about the fact I have a RD-AC5X-SR2 board. As far as I 
know the only difference with the SR2 board was an increased DDR size.

> Interesting, because Marvell suggested to use cnm_clock with 328MHz for AC5, and 325MHz
> for AC5X.

Did you get that the right way round? The ac5-98dx25xx.dtsi is AC5 so if 
what you have written is correct shouldn't the cnm clock-frequency in 
ac5-98dx25xx.dtsi be 328MHz and the ac5-98dx35xx.dtsi (which is AC5X) 
override this to 325MHz?

Elad, can you shine any light on this?

> [snip]
>
>>>> +
>>>> +    clocks {
>>>> +        cnm_clock: core-clock {
>>>> +            compatible = "fixed-clock";
>>>> +            #clock-cells = <0>;
>>>> +            clock-frequency = <325000000>;
>>>> +        };
>>>> +
>>>> +        spi_clock: spi-clock {
>>>> +            compatible = "fixed-clock";
>>>> +            #clock-cells = <0>;
>>>> +            clock-frequency = <200000000>;
>>>> +        };
>>>> +    };
>>>> +};
> [snip]
>
> Regards,

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Chris Packham]

Hi All,


On 15/06/22 09:25, Chris Packham wrote:
> +cc: Elad
>
> On 14/06/22 20:16, Vadym Kochan wrote:
>> Hi Chris,
>>
>> On Tue, Jun 14, 2022 at 05:26:39AM +0000, Chris Packham wrote:
>>> On 14/06/22 17:11, Chris Packham wrote:
>>>> On 14/06/22 10:53, Vadym Kochan wrote:
>>>>> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>>>
>>>>> The 98DX2530 SoC is the Control and Management CPU integrated into
>>>>> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
>>>>> referred to as AlleyCat5 and AlleyCat5X).
>>>>>
>>>>> These files have been taken from the Marvell SDK and lightly cleaned
>>>>> up with the License and copyright retained.
>>>>>
>>>>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>>> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
>>>>> ---
>>>>>
>>>>> Notes:
>>>>>       The Marvell SDK has a number of new compatible strings. I've
>>>>> brought
>>>>>       through some of the drivers or where possible used an in-tree
>>>>>       alternative (e.g. there is SDK code for a ac5-gpio but two
>>>>> instances of
>>>>>       the existing marvell,orion-gpio seems to cover what is 
>>>>> needed if
>>>>> you use
>>>>>       an appropriate binding). I expect that there will a new 
>>>>> series of
>>>>>       patches when I get some different hardware (or additions to 
>>>>> this
>>>>> series
>>>>>       depending on if/when it lands).
>>>>>            Changes in v9 (proposed by Marvell):
>>>>>         It was discussed with Chris that Marvell will add some 
>>>>> changes:
>>>>>
>>>>>            1) Rename "armada-" prefix in dts(i) file names to ac5,
>>>>> because
>>>>>               Armada has not much common with AC5 SoC.
>>>>>
>>>>>            2) Add clock fixes:
>>>>>               - rename core_clock to cnm_clock
>>>>>               - remove axi_clock
>>>>>               - change cnm_clock to 325MHZ
>>>>>               - use cnm_clock for the UART
>>>>>
>>>>>       Changes in v8:
>>>>>       - Remove unnecessary clock-frequency property on armv8-timer
>>>>>       - Remove unnecessary redistributor-stride property on gic
>>>>>       - Add GIC_SPI interrupts for gpios
>>>>>       Changes in v7:
>>>>>       - Add missing compatible on usb1
>>>>>       - Add "rd-ac5x" compatible for board
>>>>>       - Move aliases to board dts
>>>>>       - Move board specific usb info to board dts
>>>>>       - Consolidate usb1 board settings and remove unnecessary 
>>>>> compatible
>>>>>       - Add Allied Telesis copyright
>>>>>       - Rename files after mailng-list discussion
>>>>>       Changes in v6:
>>>>>       - Move CPU nodes above the SoC (Krzysztof)
>>>>>       - Minor formatting clean ups (Krzysztof)
>>>>>       - Run through `make dtbs_check`
>>>>>       - Move gic nodes inside SoC
>>>>>       - Group clocks under a clock node
>>>>>       Changes in v5:
>>>>>       - add #{address,size}-cells property to i2c nodes
>>>>>       - make i2c nodes disabled in the SoC and enable them in the 
>>>>> board
>>>>>       - add interrupt controller attributes to gpio nodes
>>>>>       - Move fixed-clock nodes up a level and remove unnecessary @0
>>>>>       Changes in v4:
>>>>>       - use 'phy-handle' instead of 'phy'
>>>>>       - move status="okay" on usb nodes to board dts
>>>>>       - Add review from Andrew
>>>>>       Changes in v3:
>>>>>       - Move memory node to board
>>>>>       - Use single digit reg value for phy address
>>>>>       - Remove MMC node (driver needs work)
>>>>>       - Remove syscon & simple-mfd for pinctrl
>>>>>       Changes in v2:
>>>>>       - Make pinctrl a child node of a syscon node
>>>>>       - Use marvell,armada-8k-gpio instead of orion-gpio
>>>>>       - Remove nand peripheral. The Marvell SDK does have some 
>>>>> changes
>>>>> for the
>>>>>         ac5-nand-controller but I currently lack hardware with NAND
>>>>> fitted so
>>>>>         I can't test it right now. I've therefore chosen to omit the
>>>>> node and
>>>>>         not attempted to bring in the driver or binding.
>>>>>       - Remove pcie peripheral. Again there are changes in the SDK 
>>>>> and
>>>>> I have
>>>>>         no way of testing them.
>>>>>       - Remove prestera node.
>>>>>       - Remove "marvell,ac5-ehci" compatible from USB node as
>>>>>         "marvell,orion-ehci" is sufficient
>>>>>       - Remove watchdog node. There is a buggy driver for the ac5
>>>>> watchdog in
>>>>>         the SDK but it needs some work so I've dropped the node 
>>>>> for now.
>>>>>
>>>>>    arch/arm64/boot/dts/marvell/Makefile          |   1 +
>>>>>    arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 
>>>>> ++++++++++++++++++
>>>>>    .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
>>>>>    arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
>>>>>    4 files changed, 406 insertions(+)
>>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>>>>>
>> [snip]
>>
>>>>> +
>>>>> +            uart0: serial@12000 {
>>>>> +                compatible = "snps,dw-apb-uart";
>>>>> +                reg = <0x12000 0x100>;
>>>>> +                reg-shift = <2>;
>>>>> +                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>>>>> +                reg-io-width = <1>;
>>>>> +                clocks = <&cnm_clock>;
>>>> With this change I see some garbled output when the "Serial: AMBA
>>>> PL011 UART" driver starts.
>>>>
>>>> It could be that my bootloader has the same wrong clock value as the
>>>> earlier iteration of this device tree.
>>> Fixing u-boot doesn't help but there are also references to 
>>> 328000000 in
>>> mv-ddr and ATF so I'll look to see if updating them fixes the issue
>>> tomorrow.
>
> Even  with changing ATF and mv_ddr to use 325000000 I still end up 
> with the garbled output when the driver starts. I don't know if 
> there's something special about the fact I have a RD-AC5X-SR2 board. 
> As far as I know the only difference with the SR2 board was an 
> increased DDR size.
>
Actually you might be off the hook. I've applied your patches on top of 
v5.18 (which is what I was using last time I worked on the series) and I 
don't see the garbled output. So I think the problem is actually new 
between v5.18 and v5.19-rc2.
>> Interesting, because Marvell suggested to use cnm_clock with 328MHz 
>> for AC5, and 325MHz
>> for AC5X.
>
> Did you get that the right way round? The ac5-98dx25xx.dtsi is AC5 so 
> if what you have written is correct shouldn't the cnm clock-frequency 
> in ac5-98dx25xx.dtsi be 328MHz and the ac5-98dx35xx.dtsi (which is 
> AC5X) override this to 325MHz?
>
> Elad, can you shine any light on this?
>
>> [snip]
>>
>>>>> +
>>>>> +    clocks {
>>>>> +        cnm_clock: core-clock {
>>>>> +            compatible = "fixed-clock";
>>>>> +            #clock-cells = <0>;
>>>>> +            clock-frequency = <325000000>;
>>>>> +        };
>>>>> +
>>>>> +        spi_clock: spi-clock {
>>>>> +            compatible = "fixed-clock";
>>>>> +            #clock-cells = <0>;
>>>>> +            clock-frequency = <200000000>;
>>>>> +        };
>>>>> +    };
>>>>> +};
>> [snip]
>>
>> Regards,

Re: [PATCH v9 2/3] arm64: dts: marvell: Add Armada 98DX2530 SoC and RD-AC5X board

[Chris Packham]

On 15/06/22 12:03, Chris Packham wrote:
> Hi All,
>
>
> On 15/06/22 09:25, Chris Packham wrote:
>> +cc: Elad
>>
>> On 14/06/22 20:16, Vadym Kochan wrote:
>>> Hi Chris,
>>>
>>> On Tue, Jun 14, 2022 at 05:26:39AM +0000, Chris Packham wrote:
>>>> On 14/06/22 17:11, Chris Packham wrote:
>>>>> On 14/06/22 10:53, Vadym Kochan wrote:
>>>>>> From: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>>>>
>>>>>> The 98DX2530 SoC is the Control and Management CPU integrated into
>>>>>> the Marvell 98DX25xx and 98DX35xx series of switch chip (internally
>>>>>> referred to as AlleyCat5 and AlleyCat5X).
>>>>>>
>>>>>> These files have been taken from the Marvell SDK and lightly cleaned
>>>>>> up with the License and copyright retained.
>>>>>>
>>>>>> Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
>>>>>> Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
>>>>>> ---
>>>>>>
>>>>>> Notes:
>>>>>>       The Marvell SDK has a number of new compatible strings. I've
>>>>>> brought
>>>>>>       through some of the drivers or where possible used an in-tree
>>>>>>       alternative (e.g. there is SDK code for a ac5-gpio but two
>>>>>> instances of
>>>>>>       the existing marvell,orion-gpio seems to cover what is 
>>>>>> needed if
>>>>>> you use
>>>>>>       an appropriate binding). I expect that there will a new 
>>>>>> series of
>>>>>>       patches when I get some different hardware (or additions to 
>>>>>> this
>>>>>> series
>>>>>>       depending on if/when it lands).
>>>>>>            Changes in v9 (proposed by Marvell):
>>>>>>         It was discussed with Chris that Marvell will add some 
>>>>>> changes:
>>>>>>
>>>>>>            1) Rename "armada-" prefix in dts(i) file names to ac5,
>>>>>> because
>>>>>>               Armada has not much common with AC5 SoC.
>>>>>>
>>>>>>            2) Add clock fixes:
>>>>>>               - rename core_clock to cnm_clock
>>>>>>               - remove axi_clock
>>>>>>               - change cnm_clock to 325MHZ
>>>>>>               - use cnm_clock for the UART
>>>>>>
>>>>>>       Changes in v8:
>>>>>>       - Remove unnecessary clock-frequency property on armv8-timer
>>>>>>       - Remove unnecessary redistributor-stride property on gic
>>>>>>       - Add GIC_SPI interrupts for gpios
>>>>>>       Changes in v7:
>>>>>>       - Add missing compatible on usb1
>>>>>>       - Add "rd-ac5x" compatible for board
>>>>>>       - Move aliases to board dts
>>>>>>       - Move board specific usb info to board dts
>>>>>>       - Consolidate usb1 board settings and remove unnecessary 
>>>>>> compatible
>>>>>>       - Add Allied Telesis copyright
>>>>>>       - Rename files after mailng-list discussion
>>>>>>       Changes in v6:
>>>>>>       - Move CPU nodes above the SoC (Krzysztof)
>>>>>>       - Minor formatting clean ups (Krzysztof)
>>>>>>       - Run through `make dtbs_check`
>>>>>>       - Move gic nodes inside SoC
>>>>>>       - Group clocks under a clock node
>>>>>>       Changes in v5:
>>>>>>       - add #{address,size}-cells property to i2c nodes
>>>>>>       - make i2c nodes disabled in the SoC and enable them in the 
>>>>>> board
>>>>>>       - add interrupt controller attributes to gpio nodes
>>>>>>       - Move fixed-clock nodes up a level and remove unnecessary @0
>>>>>>       Changes in v4:
>>>>>>       - use 'phy-handle' instead of 'phy'
>>>>>>       - move status="okay" on usb nodes to board dts
>>>>>>       - Add review from Andrew
>>>>>>       Changes in v3:
>>>>>>       - Move memory node to board
>>>>>>       - Use single digit reg value for phy address
>>>>>>       - Remove MMC node (driver needs work)
>>>>>>       - Remove syscon & simple-mfd for pinctrl
>>>>>>       Changes in v2:
>>>>>>       - Make pinctrl a child node of a syscon node
>>>>>>       - Use marvell,armada-8k-gpio instead of orion-gpio
>>>>>>       - Remove nand peripheral. The Marvell SDK does have some 
>>>>>> changes
>>>>>> for the
>>>>>>         ac5-nand-controller but I currently lack hardware with NAND
>>>>>> fitted so
>>>>>>         I can't test it right now. I've therefore chosen to omit the
>>>>>> node and
>>>>>>         not attempted to bring in the driver or binding.
>>>>>>       - Remove pcie peripheral. Again there are changes in the 
>>>>>> SDK and
>>>>>> I have
>>>>>>         no way of testing them.
>>>>>>       - Remove prestera node.
>>>>>>       - Remove "marvell,ac5-ehci" compatible from USB node as
>>>>>>         "marvell,orion-ehci" is sufficient
>>>>>>       - Remove watchdog node. There is a buggy driver for the ac5
>>>>>> watchdog in
>>>>>>         the SDK but it needs some work so I've dropped the node 
>>>>>> for now.
>>>>>>
>>>>>>    arch/arm64/boot/dts/marvell/Makefile          |   1 +
>>>>>>    arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 291 
>>>>>> ++++++++++++++++++
>>>>>>    .../boot/dts/marvell/ac5-98dx35xx-rd.dts      | 101 ++++++
>>>>>>    arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi |  13 +
>>>>>>    4 files changed, 406 insertions(+)
>>>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi
>>>>>>    create mode 100644 
>>>>>> arch/arm64/boot/dts/marvell/ac5-98dx35xx-rd.dts
>>>>>>    create mode 100644 arch/arm64/boot/dts/marvell/ac5-98dx35xx.dtsi
>>>>>>
>>> [snip]
>>>
>>>>>> +
>>>>>> +            uart0: serial@12000 {
>>>>>> +                compatible = "snps,dw-apb-uart";
>>>>>> +                reg = <0x12000 0x100>;
>>>>>> +                reg-shift = <2>;
>>>>>> +                interrupts = <GIC_SPI 83 IRQ_TYPE_LEVEL_HIGH>;
>>>>>> +                reg-io-width = <1>;
>>>>>> +                clocks = <&cnm_clock>;
>>>>> With this change I see some garbled output when the "Serial: AMBA
>>>>> PL011 UART" driver starts.
>>>>>
>>>>> It could be that my bootloader has the same wrong clock value as the
>>>>> earlier iteration of this device tree.
>>>> Fixing u-boot doesn't help but there are also references to 
>>>> 328000000 in
>>>> mv-ddr and ATF so I'll look to see if updating them fixes the issue
>>>> tomorrow.
>>
>> Even  with changing ATF and mv_ddr to use 325000000 I still end up 
>> with the garbled output when the driver starts. I don't know if 
>> there's something special about the fact I have a RD-AC5X-SR2 board. 
>> As far as I know the only difference with the SR2 board was an 
>> increased DDR size.
>>
> Actually you might be off the hook. I've applied your patches on top 
> of v5.18 (which is what I was using last time I worked on the series) 
> and I don't see the garbled output. So I think the problem is actually 
> new between v5.18 and v5.19-rc2.

Just nudging this thread. Things seem to have been fixed with commit 
07a22b61946f ("Revert "printk: add functions to prefer direct 
printing"") so testing wise things are all good.

Tested-by: Chris Packham <chris.packham@alliedtelesis.co.nz>

>>> Interesting, because Marvell suggested to use cnm_clock with 328MHz 
>>> for AC5, and 325MHz
>>> for AC5X.
>>
>> Did you get that the right way round? The ac5-98dx25xx.dtsi is AC5 so 
>> if what you have written is correct shouldn't the cnm clock-frequency 
>> in ac5-98dx25xx.dtsi be 328MHz and the ac5-98dx35xx.dtsi (which is 
>> AC5X) override this to 325MHz?
>>
>> Elad, can you shine any light on this?
>>
>>> [snip]
>>>
>>>>>> +
>>>>>> +    clocks {
>>>>>> +        cnm_clock: core-clock {
>>>>>> +            compatible = "fixed-clock";
>>>>>> +            #clock-cells = <0>;
>>>>>> +            clock-frequency = <325000000>;
>>>>>> +        };
>>>>>> +
>>>>>> +        spi_clock: spi-clock {
>>>>>> +            compatible = "fixed-clock";
>>>>>> +            #clock-cells = <0>;
>>>>>> +            clock-frequency = <200000000>;
>>>>>> +        };
>>>>>> +    };
>>>>>> +};
>>> [snip]
>>>
>>> Regards,

[PATCH v9 3/3] arm64: marvell: enable the 98DX2530 pinctrl driver

[Vadym Kochan]

From: Chris Packham <chris.packham@alliedtelesis.co.nz>

This commit makes sure the drivers for the 98DX2530 pin controller is
enabled.

Signed-off-by: Chris Packham <chris.packham@alliedtelesis.co.nz>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Vadym Kochan <vadym.kochan@plvision.eu>
---

Notes:
    Changes in v9:
    - None
    Changes in v8:
    - None
    Changes in v7:
    - None
    Changes in v6:
    - None
    Changes in v5:
    - None
    Changes in v4:
    - None
    Changes in v3:
    - Add review from Andrew
    Changes in v2:
    - None

 arch/arm64/Kconfig.platforms | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/arch/arm64/Kconfig.platforms b/arch/arm64/Kconfig.platforms
index 4e6d635a1731..8d96928a36ff 100644
--- a/arch/arm64/Kconfig.platforms
+++ b/arch/arm64/Kconfig.platforms
@@ -182,11 +182,13 @@ config ARCH_MVEBU
 	select PINCTRL_ARMADA_37XX
 	select PINCTRL_ARMADA_AP806
 	select PINCTRL_ARMADA_CP110
+	select PINCTRL_AC5
 	help
 	  This enables support for Marvell EBU familly, including:
 	   - Armada 3700 SoC Family
 	   - Armada 7K SoC Family
 	   - Armada 8K SoC Family
+	   - 98DX2530 SoC Family
 
 config ARCH_MXC
 	bool "ARMv8 based NXP i.MX SoC family"
-- 
2.17.1