33c413c679
* Rework patches for sunxi 5.15.4
* Rework patches sunxi for 5.15.5
* Kernel switch tag=v5.15.5 for sunxi EDGE
* Temporarily disabled, requires rework.
drivers/clk/sunxi-ng/sun8i-de33.c: In function ‘sunxi_de33_clk_probe’:
drivers/clk/sunxi-ng/sun8i-de33.c:155:8:
error: implicit declaration of function ‘sunxi_ccu_probe’;
did you mean ‘of_sunxi_ccu_probe’? [-Werror=implicit-function-declarati>
ret = sunxi_ccu_probe(pdev->dev.of_node, reg, ccu_desc);
^~~~~~~~~~~~~~~
of_sunxi_ccu_probe
cc1: some warnings being treated as errors
make[3]: *** [scripts/Makefile.build:277:
drivers/clk/sunxi-ng/sun8i-de33.o] Error 1
make[2]: *** [scripts/Makefile.build:540: drivers/clk/sunxi-ng] Error 2
* Correct the comment.
59 lines
2.3 KiB
Diff
59 lines
2.3 KiB
Diff
From 92cf94a9df24e0d74170d1e7b79afeb97d7ac0c2 Mon Sep 17 00:00:00 2001
|
|
From: Alex Bee <knaerzche@gmail.com>
|
|
Date: Fri, 18 Jun 2021 20:12:53 +0200
|
|
Subject: [PATCH 017/467] arm64: dts: rockchip: Add RK3399 ROCK Pi 4A+ board
|
|
|
|
ROCK Pi 4A+ board is the successor of ROCK Pi 4A board.
|
|
|
|
Differences to the original version are
|
|
- has RK3399 OP1 SoC revision
|
|
- has eMMC (16 or 32 GB) soldered on board (no changes required,
|
|
since it is enabled in rk3399-rock-pi-4.dtsi)
|
|
- dev boards have SPI flash soldered, but as per manufacturer response,
|
|
this won't be the case for mass production boards
|
|
|
|
Signed-off-by: Alex Bee <knaerzche@gmail.com>
|
|
Link: https://lore.kernel.org/r/20210618181256.27992-3-knaerzche@gmail.com
|
|
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
|
---
|
|
arch/arm64/boot/dts/rockchip/Makefile | 1 +
|
|
.../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 14 ++++++++++++++
|
|
2 files changed, 15 insertions(+)
|
|
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
|
|
|
|
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
|
|
index 2890756c2..5e2e852c5 100644
|
|
--- a/arch/arm64/boot/dts/rockchip/Makefile
|
|
+++ b/arch/arm64/boot/dts/rockchip/Makefile
|
|
@@ -45,6 +45,7 @@ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-plus.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a.dtb
|
|
+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4a-plus.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4b.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock-pi-4c.dtb
|
|
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-rock960.dtb
|
|
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
|
|
new file mode 100644
|
|
index 000000000..281a04b2f
|
|
--- /dev/null
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts
|
|
@@ -0,0 +1,14 @@
|
|
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
|
+/*
|
|
+ * Copyright (c) 2019 Akash Gajjar <Akash_Gajjar@mentor.com>
|
|
+ * Copyright (c) 2019 Pragnesh Patel <Pragnesh_Patel@mentor.com>
|
|
+ */
|
|
+
|
|
+/dts-v1/;
|
|
+#include "rk3399-rock-pi-4.dtsi"
|
|
+#include "rk3399-op1-opp.dtsi"
|
|
+
|
|
+/ {
|
|
+ model = "Radxa ROCK Pi 4A+";
|
|
+ compatible = "radxa,rockpi4a-plus", "radxa,rockpi4", "rockchip,rk3399";
|
|
+};
|
|
--
|
|
2.34.0
|
|
|