[PATCH v5] mvebu: add support for iEi Puzzle-M901/Puzzle-M902

[Hauke Mehrtens]

On 7/20/21 5:10 AM, eveans2002 at gmail.com wrote:
> From: Ian Chang <ianchang at ieiworld.com>
> 
>   Hardware specification
>   ----------------------
>   * CN9130 SoC, Quad-core ARMv8 Cortex-72 @ 2200 MHz
>   * 4 GB DDR
>   * 4 GB eMMC
>   * mmcblk0
>   - mmcblk0p164M  kernel_1
>   - mmcblk0p264M  kernel_2
>   - mmcblk0p3   512M  rootfs_1
>   - mmcblk0p4   512M  rootfs_2
>   - mmcblk0p5   512M  Reserved
>   - mmcblk0p6    64M  Reserved
>   - mmcblk0p7   1.8G  rootfs_data
> 
>   * 4 MB (SPI Flash)
>   * 6 x 2.5 Gigabit  ports (Puzzle-M901)
>   - External PHY with 6 ports (AQR112R)
>   * 6 x 2.5 Gigabit ports (Puzzle-M902)
>   - External PHY with 6 ports (AQR112R)
>     3 x 10 Gigabit ports (Puzzle-M902)
>   - External PHY with 3 ports (AQR113R)
> 
>   * 4 x Front panel LED
>   * 1 x USB 3.0
>   * Reset button on Rear panel
>   * UART (115200 8N1,header on PCB)
> 
>   Flash instructions:
> 	The original firmware is based on OpenWrt.
> 	Flash firmware using LuCI and CLI
> 
> Signed-off-by: Ian Chang <ianchang at ieiworld.com>
> ---
>   .../base-files/etc/board.d/02_network         |   6 +
>   .../cortexa72/base-files/lib/upgrade/emmc.sh  |  36 ++
>   .../base-files/lib/upgrade/platform.sh        |   8 +
>   .../boot/dts/marvell/cn9131-puzzle-m901.dts   | 319 ++++++++++++
>   .../boot/dts/marvell/cn9132-puzzle-m902.dts   | 481 ++++++++++++++++++
>   target/linux/mvebu/image/cortexa72.mk         |  18 +
>   ...l-Add-support-for-Marvell-CN9130-SoC.patch |  61 +++
>   7 files changed, 929 insertions(+)
>   create mode 100644 target/linux/mvebu/cortexa72/base-files/lib/upgrade/emmc.sh
>   create mode 100644 target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9131-puzzle-m901.dts
>   create mode 100644 target/linux/mvebu/files/arch/arm64/boot/dts/marvell/cn9132-puzzle-m902.dts
>   create mode 100644 target/linux/mvebu/patches-5.4/000-v5.5-arm64-dts-marvell-Add-support-for-Marvell-CN9130-SoC.patch

.....

> diff --git a/target/linux/mvebu/patches-5.4/000-v5.5-arm64-dts-marvell-Add-support-for-Marvell-CN9130-SoC.patch b/target/linux/mvebu/patches-5.4/000-v5.5-arm64-dts-marvell-Add-support-for-Marvell-CN9130-SoC.patch
> new file mode 100644
> index 0000000000..008bf9e24d
> --- /dev/null
> +++ b/target/linux/mvebu/patches-5.4/000-v5.5-arm64-dts-marvell-Add-support-for-Marvell-CN9130-SoC.patch
> @@ -0,0 +1,61 @@
> +From 6b8970bd8d7a17a648e31f3996d9b21336b4a2cf Mon Sep 17 00:00:00 2001
> +From: Miquel Raynal <miquel.raynal at bootlin.com>
> +Date: Fri, 4 Oct 2019 16:27:35 +0200
> +Subject: [PATCH] arm64: dts: marvell: Add support for Marvell CN9130 SoC
> + support
> +
> +A CN9130 SoC has one AP807 and one internal CP115.
> +
> +Signed-off-by: Miquel Raynal <miquel.raynal at bootlin.com>
> +Signed-off-by: Gregory CLEMENT <gregory.clement at bootlin.com>
> +---
> + arch/arm64/boot/dts/marvell/cn9130.dtsi | 37 +++++++++++++++++++++++++
> + 1 file changed, 37 insertions(+)
> + create mode 100644 arch/arm64/boot/dts/marvell/cn9130.dtsi
> +
> +diff --git a/arch/arm64/boot/dts/marvell/cn9130.dtsi b/arch/arm64/boot/dts/marvell/cn9130.dtsi
> +new file mode 100644
> +index 000000000000..a2b7e5ec979d
> +--- /dev/null
> ++++ b/arch/arm64/boot/dts/marvell/cn9130.dtsi
> +@@ -0,0 +1,37 @@
> ++// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> ++/*
> ++ * Copyright (C) 2019 Marvell International Ltd.
> ++ *
> ++ * Device tree for the CN9130 SoC.
> ++ */
> ++
> ++#include "armada-ap807-quad.dtsi"

When I compile this code in OpenWrt master with kernel 5.4 I am getting 
this error message:
/build_dir/target-aarch64_cortex-a72_musl/linux-mvebu_cortexa72/linux-5.4.134/arch/arm64/boot/dts/marvell/cn9130.dtsi:8:10: 
fatal error: armada-ap807-quad.dtsi: No such file or directory
  #include "armada-ap807-quad.dtsi"

The file armada-ap807-quad.dtsi was only added with kernel 5.5, see here:
https://git.kernel.org/linus/cbafcad0641e99831ff7c57ac8f79aed502f33e5

Hauke