[PATCH v5 2/2] arm64: dts: rockchip: add support for Radxa ROCK Pi E v3.0

[Heiko Stübner]

Am Freitag, 16. August 2024, 23:34:29 CEST schrieb FUKAUMI Naoki:
> Radxa ROCK Pi E v3.0 is a compact networking SBC[1] using the Rockchip
> RK3328 chip that ships in a number of RAM/eMMC/WiFi/BT configurations:
> 
> - Rockchip RK3328 SoC
> - Quad A53 CPU
> - 512MB/1GB/2GB DDR4 RAM
> - 4/8/16/32GB eMMC
> - Micro SD Card slot
> - WiFi 4 and BT 4, or WiFi 5 and BT 5
> - 1x 1000M Ethernet supporting PoE with add‑on PoE HAT
> - 1x 100M Ethernet
> - 1x USB 3.0 Type-A port (Host)
> - 1x 4-ring 3.5mm headphone jack
> - 40 Pin GPIO header
> 
> [1] https://radxa.com/products/rockpi/pie
> 
> Signed-off-by: FUKAUMI Naoki <naoki at radxa.com>
> ---
> Changes in v5:
> - revert compatible string
> Changes in v4:
> - update compatible string for OpenWrt
> Changes in v3:
> - fix conflict for recent change
> Changes in v2:
> - fix typo in commit message
> - add missing --- in commit message
> ---
>  arch/arm64/boot/dts/rockchip/Makefile         |   1 +
>  .../boot/dts/rockchip/rk3328-rock-pi-e-v3.dts |  15 +
>  .../boot/dts/rockchip/rk3328-rock-pi-e.dts    | 460 +-----------------
>  ...28-rock-pi-e.dts => rk3328-rock-pi-e.dtsi} |   5 -
>  4 files changed, 31 insertions(+), 450 deletions(-)
>  create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e-v3.dts
>  rewrite arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts (97%)
>  copy arch/arm64/boot/dts/rockchip/{rk3328-rock-pi-e.dts => rk3328-rock-pi-e.dtsi} (98%)
> 
> diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
> index cb309b1975ba..cc74cd17850a 100644
> --- a/arch/arm64/boot/dts/rockchip/Makefile
> +++ b/arch/arm64/boot/dts/rockchip/Makefile
> @@ -25,6 +25,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-nanopi-r2s-plus.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-orangepi-r1-plus-lts.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock64.dtb
> +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e-v3.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-rock-pi-e.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-cc.dtb
>  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3328-roc-pc.dtb
> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e-v3.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e-v3.dts
> new file mode 100644
> index 000000000000..ad9c4c562914
> --- /dev/null
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e-v3.dts
> @@ -0,0 +1,15 @@
> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include "rk3328-rock-pi-e.dtsi"
> +
> +/ {
> +	model = "Radxa ROCK Pi E v3.0";
> +	compatible = "radxa,rockpi-e-v3", "rockchip,rk3328";
> +
> +	aliases {
> +		mmc0 = &emmc;
> +		mmc1 = &sdmmc;
> +	};
> +};

> diff --git a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> dissimilarity index 97%
> index 3e08e2fd0a78..0929df3c803a 100644
> --- a/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> +++ b/arch/arm64/boot/dts/rockchip/rk3328-rock-pi-e.dts
> @@ -1,445 +1,15 @@

[...]

> +// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
> +
> +/dts-v1/;
> +
> +#include "rk3328-rock-pi-e.dtsi"
> +
> +/ {
> +	model = "Radxa ROCK Pi E";
> +	compatible = "radxa,rockpi-e", "rockchip,rk3328";
> +
> +	aliases {
> +		mmc0 = &sdmmc;
> +		mmc1 = &emmc;
> +	};
> +};

can you please describe what is different in that v3 board?
Describing what is different to require a separate board should've been
part of the commit message.

Because from those changes, the bottom line currently seems to be
the same board with swapped mmc aliases?

Heiko