armbian_build/patch/kernel/archive/sunxi-6.6/patches.armbian/add-dtb-overlay-for-zero2w.patch
The-going dbdb03ddb8 sunxi-6.6: armbian: delete unused ones, replace changed ones.
Now the names of the patch files correspond to the entry
in the commit message.
Patches that have been transferred (copied) since time
immemorial and require revision have been removed.
No one wants to deal with them.
2024-08-02 17:21:36 +02:00

216 lines
7.2 KiB
Diff

From ee00f965c88e0a4a5f158b6eafb5fe2e5ce12c71 Mon Sep 17 00:00:00 2001
From: chraac <chraac@gmail.com>
Date: Fri, 5 Apr 2024 10:57:18 +0800
Subject: add dtb overlay for zero2w
---
.../arm64/boot/dts/allwinner/overlay/Makefile | 16 ++++++++-----
.../allwinner/overlay/sun50i-h616-gpu.dtso | 14 +++++++++++
.../overlay/sun50i-h616-i2c0-pi.dtso | 23 +++++++++++++++++++
.../overlay/sun50i-h616-i2c1-pi.dtso | 16 +++++++++++++
...616-i2c2.dtso => sun50i-h616-i2c2-ph.dtso} | 0
.../overlay/sun50i-h616-i2c2-pi.dtso | 23 +++++++++++++++++++
...616-i2c3.dtso => sun50i-h616-i2c3-ph.dtso} | 0
...616-i2c4.dtso => sun50i-h616-i2c4-ph.dtso} | 0
...6-uart2.dtso => sun50i-h616-uart2-ph.dtso} | 0
...6-uart5.dtso => sun50i-h616-uart5-ph.dtso} | 0
.../allwinner/sun50i-h618-orangepi-zero2w.dts | 12 ----------
11 files changed, 86 insertions(+), 18 deletions(-)
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-gpu.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c0-pi.dtso
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c1-pi.dtso
rename arch/arm64/boot/dts/allwinner/overlay/{sun50i-h616-i2c2.dtso => sun50i-h616-i2c2-ph.dtso} (100%)
create mode 100644 arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-pi.dtso
rename arch/arm64/boot/dts/allwinner/overlay/{sun50i-h616-i2c3.dtso => sun50i-h616-i2c3-ph.dtso} (100%)
rename arch/arm64/boot/dts/allwinner/overlay/{sun50i-h616-i2c4.dtso => sun50i-h616-i2c4-ph.dtso} (100%)
rename arch/arm64/boot/dts/allwinner/overlay/{sun50i-h616-uart2.dtso => sun50i-h616-uart2-ph.dtso} (100%)
rename arch/arm64/boot/dts/allwinner/overlay/{sun50i-h616-uart5.dtso => sun50i-h616-uart5-ph.dtso} (100%)
diff --git a/arch/arm64/boot/dts/allwinner/overlay/Makefile b/arch/arm64/boot/dts/allwinner/overlay/Makefile
index 369b2976b1bb..24383cb63770 100644
--- a/arch/arm64/boot/dts/allwinner/overlay/Makefile
+++ b/arch/arm64/boot/dts/allwinner/overlay/Makefile
@@ -49,11 +49,11 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
sun50i-h6-uart2.dtbo \
sun50i-h6-uart3.dtbo \
sun50i-h6-w1-gpio.dtbo \
- sun50i-h616-i2c2.dtbo \
- sun50i-h616-i2c3.dtbo \
- sun50i-h616-i2c4.dtbo \
- sun50i-h616-uart2.dtbo \
- sun50i-h616-uart5.dtbo \
+ sun50i-h616-i2c2-ph.dtbo \
+ sun50i-h616-i2c3-ph.dtbo \
+ sun50i-h616-i2c4-ph.dtbo \
+ sun50i-h616-uart2-ph.dtbo \
+ sun50i-h616-uart5-ph.dtbo \
sun50i-h616-spi-spidev.dtbo \
sun50i-h616-spidev0_0.dtbo \
sun50i-h616-spidev1_0.dtbo \
@@ -63,7 +63,11 @@ dtb-$(CONFIG_ARCH_SUNXI) += \
sun50i-h616-tft35_spi.dtbo \
sun50i-h616-mcp2515.dtbo \
sun50i-h616-ws2812.dtbo \
- sun50i-h616-light.dtbo
+ sun50i-h616-light.dtbo \
+ sun50i-h616-i2c0-pi.dtbo \
+ sun50i-h616-i2c1-pi.dtbo \
+ sun50i-h616-i2c2-pi.dtbo \
+ sun50i-h616-gpu.dtbo
scr-$(CONFIG_ARCH_SUNXI) += \
sun50i-a64-fixup.scr \
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-gpu.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-gpu.dtso
new file mode 100644
index 000000000000..ac8846ac7d27
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-gpu.dtso
@@ -0,0 +1,14 @@
+/dts-v1/;
+/plugin/;
+
+
+/ {
+ compatible = "allwinner,sun50i-h616";
+
+ fragment@0 {
+ target = <&gpu>;
+ __overlay__ {
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c0-pi.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c0-pi.dtso
new file mode 100644
index 000000000000..b5003934c895
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c0-pi.dtso
@@ -0,0 +1,23 @@
+/dts-v1/;
+/plugin/;
+
+
+/ {
+ compatible = "allwinner,sun50i-h616";
+
+ fragment@0 {
+ target = <&i2c0>;
+ __overlay__ {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c0_pi_pins>;
+ status = "okay";
+ };
+ };
+
+ fragment@1 {
+ target = <&uart2>;
+ __overlay__ {
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c1-pi.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c1-pi.dtso
new file mode 100644
index 000000000000..05f3100967ff
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c1-pi.dtso
@@ -0,0 +1,16 @@
+/dts-v1/;
+/plugin/;
+
+
+/ {
+ compatible = "allwinner,sun50i-h616";
+
+ fragment@0 {
+ target = <&i2c1>;
+ __overlay__ {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c1_pi_pins>;
+ status = "okay";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-ph.dtso
similarity index 100%
rename from arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2.dtso
rename to arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-ph.dtso
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-pi.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-pi.dtso
new file mode 100644
index 000000000000..0f7d7e9968d6
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c2-pi.dtso
@@ -0,0 +1,23 @@
+/dts-v1/;
+/plugin/;
+
+
+/ {
+ compatible = "allwinner,sun50i-h616";
+
+ fragment@0 {
+ target = <&i2c2>;
+ __overlay__ {
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2c2_pi_pins>;
+ status = "okay";
+ };
+ };
+
+ fragment@1 {
+ target = <&uart3>;
+ __overlay__ {
+ status = "disabled";
+ };
+ };
+};
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c3.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c3-ph.dtso
similarity index 100%
rename from arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c3.dtso
rename to arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c3-ph.dtso
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c4.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c4-ph.dtso
similarity index 100%
rename from arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c4.dtso
rename to arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-i2c4-ph.dtso
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart2.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart2-ph.dtso
similarity index 100%
rename from arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart2.dtso
rename to arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart2-ph.dtso
diff --git a/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart5.dtso b/arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart5-ph.dtso
similarity index 100%
rename from arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart5.dtso
rename to arch/arm64/boot/dts/allwinner/overlay/sun50i-h616-uart5-ph.dtso
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
index b224902f5684..2a4c152b9294 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-orangepi-zero2w.dts
@@ -312,12 +312,6 @@ &uart4 {
status = "disabled";
};
-&uart5 {
- pinctrl-names = "default";
- pinctrl-0 = <&uart5_ph_pins>;
- status = "disabled";
-};
-
&i2c3 {
status = "okay";
pinctrl-names = "default";
@@ -447,12 +441,6 @@ uart4_pi_pins: uart4-pi-pins {
function = "uart4";
};
- /omit-if-no-ref/
- uart5_ph_pins: uart5-ph-pins {
- pins = "PH2", "PH3";
- function = "uart5";
- };
-
/omit-if-no-ref/
spi1_cs1_pin: spi1-cs1-pin {
pins = "PH9";
--
2.35.3