sunxi-6.12: Add the missing pins to a separate patch

This commit is contained in:
The-going
2025-03-25 13:03:26 +03:00
committed by Igor
parent 748e04ed20
commit 09b0af1cdd
4 changed files with 88 additions and 94 deletions

View File

@@ -1,13 +1,12 @@
From 84b1d4a5c7ccea11cf80e5839ed257604c61a6be Mon Sep 17 00:00:00 2001
From 3170a1b29c14dcd7f5ffa0b68eb9b9aea7961c41 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:34:14 +0300
Date: Mon, 24 Mar 2025 22:19:31 +0300
Subject: arm64: allwinner: Add sun50i-h618-bananapi-m4-berry support
---
arch/arm64/boot/dts/allwinner/Makefile | 1 +
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 54 ++-
.../sun50i-h618-bananapi-m4-berry.dts | 418 ++++++++++++++++++
3 files changed, 468 insertions(+), 5 deletions(-)
.../sun50i-h618-bananapi-m4-berry.dts | 419 ++++++++++++++++++
2 files changed, 420 insertions(+)
create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts
diff --git a/arch/arm64/boot/dts/allwinner/Makefile b/arch/arm64/boot/dts/allwinner/Makefile
@@ -22,98 +21,12 @@ index a676c57aad1d..a34f2dbcc9b4 100644
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-bananapi-m4-zero.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-longanpi-3h.dtb
dtb-$(CONFIG_ARCH_SUNXI) += sun50i-h618-orangepi-zero2w.dtb
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 8124eeff75c7..2fa14c490a30 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -389,6 +389,12 @@ i2c2_pi_pins: i2c2-pi-pins {
function = "i2c2";
};
+ i2c3_pa_pins: i2c3-pa-pins {
+ pins = "PA10", "PA11";
+ function = "i2c3";
+ bias-pull-up;
+ };
+
/omit-if-no-ref/
i2c3_pg_pins: i2c3-pg-pins {
pins = "PG17", "PG18";
@@ -444,6 +450,48 @@ mmc2_pins: mmc2-pins {
bias-pull-up;
};
+ /omit-if-no-ref/
+ pwm1_pg_pin: pwm1-pg-pin {
+ pins = "PG19";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm1_ph_pin: pwm1-ph-pin {
+ pins = "PH3";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm1_pi_pin: pwm1-pi-pin {
+ pins = "PI11";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm2_ph_pin: pwm2-ph-pin {
+ pins = "PH2";
+ function = "pwm2";
+ };
+
+ /omit-if-no-ref/
+ pwm3_ph_pin: pwm3-ph-pin {
+ pins = "PH0";
+ function = "pwm3";
+ };
+
+ /omit-if-no-ref/
+ pwm4_ph_pin: pwm4-ph-pin {
+ pins = "PH1";
+ function = "pwm4";
+ };
+
+ pwm5_pin: pwm5-pin {
+ pins = "PA12";
+ function = "pwm5";
+ bias-pull-up;
+ };
+
/omit-if-no-ref/
spi0_pins: spi0-pins {
pins = "PC0", "PC2", "PC4";
@@ -861,10 +909,6 @@ emac1: ethernet@5030000 {
pinctrl-names = "default";
tx-delay = <7>;
rx-delay = <31>;
- phy-rst;
- gmac-power0;
- gmac-power1;
- gmac-power2;
status = "disabled";
mdio1: mdio {
@@ -923,7 +967,7 @@ lradc: lradc@5070800 {
status = "disabled";
};
- codec: codec@05096000 {
+ codec: codec@5096000 {
#sound-dai-cells = <0>;
compatible = "allwinner,sun50i-h616-codec";
reg = <0x05096000 0x31c>;
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts
new file mode 100644
index 000000000000..33e4b4ed4e7d
index 000000000000..bef45411d1de
--- /dev/null
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h618-bananapi-m4-berry.dts
@@ -0,0 +1,418 @@
@@ -0,0 +1,419 @@
+// SPDX-License-Identifier: (GPL-2.0+ or MIT)
+/*
+ * Copyright (C) 2020 Arm Ltd.
@@ -351,7 +264,7 @@ index 000000000000..33e4b4ed4e7d
+};
+
+&emac0 {
+ compatible = "allwinner,sun50i-h616-emac0";
+ compatible = "allwinner,sun50i-h616-emac";
+ pinctrl-names = "default";
+ pinctrl-0 = <&ext_rgmii_pins>;
+ phy-mode = "rgmii";
@@ -360,6 +273,7 @@ index 000000000000..33e4b4ed4e7d
+ phy-io-supply = <&reg_dldo1>;
+ allwinner,rx-delay-ps = <3100>;
+ allwinner,tx-delay-ps = <700>;
+ use_ephy25m = <0x00>;
+ status = "okay";
+};
+

View File

@@ -0,0 +1,78 @@
From ac477ea8e7834d208783e9088299b17a9b603960 Mon Sep 17 00:00:00 2001
From: The-going <48602507+The-going@users.noreply.github.com>
Date: Mon, 10 Feb 2025 13:34:14 +0300
Subject: arm64: dts: sun50i-h616: Add i2c3-pa, pwm pins
---
.../arm64/boot/dts/allwinner/sun50i-h616.dtsi | 48 +++++++++++++++++++
1 file changed, 48 insertions(+)
diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
index 8124eeff75c7..851cf3e5444d 100644
--- a/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi
@@ -389,6 +389,12 @@ i2c2_pi_pins: i2c2-pi-pins {
function = "i2c2";
};
+ i2c3_pa_pins: i2c3-pa-pins {
+ pins = "PA10", "PA11";
+ function = "i2c3";
+ bias-pull-up;
+ };
+
/omit-if-no-ref/
i2c3_pg_pins: i2c3-pg-pins {
pins = "PG17", "PG18";
@@ -444,6 +450,48 @@ mmc2_pins: mmc2-pins {
bias-pull-up;
};
+ /omit-if-no-ref/
+ pwm1_pg_pin: pwm1-pg-pin {
+ pins = "PG19";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm1_ph_pin: pwm1-ph-pin {
+ pins = "PH3";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm1_pi_pin: pwm1-pi-pin {
+ pins = "PI11";
+ function = "pwm1";
+ };
+
+ /omit-if-no-ref/
+ pwm2_ph_pin: pwm2-ph-pin {
+ pins = "PH2";
+ function = "pwm2";
+ };
+
+ /omit-if-no-ref/
+ pwm3_ph_pin: pwm3-ph-pin {
+ pins = "PH0";
+ function = "pwm3";
+ };
+
+ /omit-if-no-ref/
+ pwm4_ph_pin: pwm4-ph-pin {
+ pins = "PH1";
+ function = "pwm4";
+ };
+
+ pwm5_pin: pwm5-pin {
+ pins = "PA12";
+ function = "pwm5";
+ bias-pull-up;
+ };
+
/omit-if-no-ref/
spi0_pins: spi0-pins {
pins = "PC0", "PC2", "PC4";
--
2.35.3

View File

@@ -178,4 +178,5 @@
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch
patches.armbian/BigTreeTech-CB1-dts-i2c-gpio-mode-adjustment-and-ws2812-rgb_val.patch
patches.armbian/arm64-dts-sun50i-h616-Add-i2c3-pa-pwm-pins.patch
patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch

View File

@@ -474,4 +474,5 @@
patches.armbian/Fix-ghost-touches-on-tsc2007-tft-screen.patch
patches.armbian/arm-dts-sun8i-h2-plus-orangepi-zero-fix-usb_otg-dr_mode.patch
patches.armbian/BigTreeTech-CB1-dts-i2c-gpio-mode-adjustment-and-ws2812-rgb_val.patch
patches.armbian/arm64-dts-sun50i-h616-Add-i2c3-pa-pwm-pins.patch
patches.armbian/arm64-allwinner-Add-sun50i-h618-bananapi-m4-berry-support.patch