Skip to contentSkip to conversation

sunxi: dts: update devicetree files

PATCH In review Andre Przywara 2 participants 7 messages Oct 26, 2025

Subsystems (4)
lore
Share & tools
lore
#0 lore raw

cover sunxi: dts: update devicetree files

This series provides some DT updates for Allwinner boards. The first two patches switch boards using two SoCs over to use OF_UPSTREAM, since the DT copies in the kernel tree were found to be identical to those in the U-Boot tree. This affects the T113-s3 and A80 SoCs. One board DT is not upstream in the Linux kernel, so we keep the U-Boot copy.

The other two patches update the DT files for those SoCs that do not use OF_UPSTREAM yet. This is probably the last time I am doing this before switching them over to OF_UPSTREAM as well, although this will break compatibility with older Linux kernels, before v5.13.
The changes gained by this update are not groundbreaking, but the last update was a while ago, and some fixes have been accumulated since.

The OF_UPSTREAM part was verified by comparing the generated .dtb files before and after, to be found the same.

Please have a look and test, if possible.

Cheers,
Andre

Andre Przywara (4):
sunxi: switch the Allwinner T113 SoC to OF_UPSTREAM
sunxi: switch Allwinner A80 boards to OF_UPSTREAM
sunxi: dts: arm64: update devicetree files from Linux kernel tree
sunxi: dts: arm: update devicetree files from Linux kernel tree

 arch/arm/dts/Makefile                         |    4 -
 arch/arm/dts/sun50i-a64-pine64-lts.dts        |    2 +-
 arch/arm/dts/sun50i-a64-pine64-plus.dts       |    2 +-
 arch/arm/dts/sun50i-a64-pine64.dts            |   14 +-
 arch/arm/dts/sun50i-a64-pinebook.dts          |    4 +-
 arch/arm/dts/sun50i-a64-pinephone.dtsi        |   21 +
 .../dts/sun50i-a64-pinetab-early-adopter.dts  |    2 +-
 arch/arm/dts/sun50i-a64-pinetab.dts           |    2 +-
 arch/arm/dts/sun50i-a64-sopine-baseboard.dts  |   21 +-
 arch/arm/dts/sun50i-a64-teres-i.dts           |    2 +
 arch/arm/dts/sun50i-a64.dtsi                  |   55 +-
 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts   |   38 +
 arch/arm/dts/sun50i-h5-nanopi-neo2.dts        |    1 +
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts      |    1 +
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts       |    1 +
 arch/arm/dts/sun50i-h5-orangepi-prime.dts     |    1 +
 arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts |    1 +
 .../arm/dts/sun50i-h5-orangepi-zero-plus2.dts |    1 +
 arch/arm/dts/sun50i-h5.dtsi                   |    6 +-
 arch/arm/dts/sun50i-h6-beelink-gs1.dts        |   39 +-
 arch/arm/dts/sun50i-h6-orangepi-3.dts         |   17 +-
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts     |    2 +-
 arch/arm/dts/sun50i-h6-orangepi.dtsi          |   23 +-
 arch/arm/dts/sun50i-h6-pine-h64-model-b.dts   |    2 +-
 arch/arm/dts/sun50i-h6-pine-h64.dts           |    3 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi             |    1 +
 arch/arm/dts/sun50i-h6.dtsi                   |   41 +-
 arch/arm/dts/sun7i-a20-bananapi.dts           |   27 +
 arch/arm/dts/sun8i-a23-a33.dtsi               |   20 +
 arch/arm/dts/sun8i-a33-vstar-core1.dtsi       |   96 ++
 arch/arm/dts/sun8i-a33-vstar.dts              |  205 +++
 arch/arm/dts/sun8i-a83t.dtsi                  |    4 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |   14 +
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |    2 +-
 arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts |   14 +
 arch/arm/dts/sun8i-h3.dtsi                    |    2 +-
 .../sun8i-orangepi-zero-interface-board.dtso  |   46 +
 arch/arm/dts/sun8i-q8-common.dtsi             |    2 +-
 arch/arm/dts/sun8i-r40.dtsi                   |    4 +-
 .../arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts |   35 -
 arch/arm/dts/sun8i-t113s.dtsi                 |   59 -
 arch/arm/dts/sun9i-a80-cubieboard4.dts        |  508 -------
 arch/arm/dts/sun9i-a80-optimus.dts            |  510 -------
 arch/arm/dts/sun9i-a80.dtsi                   | 1253 -----------------
 arch/arm/mach-sunxi/Kconfig                   |    2 +
 arch/riscv/dts/sunxi-d1-t113.dtsi             |   15 -
 arch/riscv/dts/sunxi-d1s-t113.dtsi            |  927 ------------
 configs/Cubieboard4_defconfig                 |    2 +-
 configs/Merrii_A80_Optimus_defconfig          |    2 +-
 configs/Sunchip_CX-A99_defconfig              |    1 +
 configs/mangopi_mq_r_defconfig                |    2 +-
 51 files changed, 676 insertions(+), 3383 deletions(-)
 create mode 100644 arch/arm/dts/sun8i-a33-vstar-core1.dtsi
 create mode 100644 arch/arm/dts/sun8i-a33-vstar.dts
 create mode 100644 arch/arm/dts/sun8i-orangepi-zero-interface-board.dtso
 delete mode 100644 arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts
 delete mode 100644 arch/arm/dts/sun8i-t113s.dtsi
 delete mode 100644 arch/arm/dts/sun9i-a80-cubieboard4.dts
 delete mode 100644 arch/arm/dts/sun9i-a80-optimus.dts
 delete mode 100644 arch/arm/dts/sun9i-a80.dtsi
 delete mode 100644 arch/riscv/dts/sunxi-d1-t113.dtsi
 delete mode 100644 arch/riscv/dts/sunxi-d1s-t113.dtsi
Signature · 1 line
2.46.4
#1 lore raw

PATCH 1/4 sunxi: switch the Allwinner T113 SoC to OF_UPSTREAM

In contrast to some other Allwinner SoCs, there is no difference between the DTs for the Allwinner T113-s3 SoC (sun20i) between the U-Boot and the Linux kernel repository.

Remove the old copies of the T113-s3 related .dts and .dtsi files, and switch the whole SoC (represented by just one board) over to use OF_UPSTREAM.

---
 arch/arm/dts/Makefile                         |   2 -
 .../arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts |  35 -
 arch/arm/dts/sun8i-t113s.dtsi                 |  59 --
 arch/arm/mach-sunxi/Kconfig                   |   1 +
 arch/riscv/dts/sunxi-d1-t113.dtsi             |  15 -
 arch/riscv/dts/sunxi-d1s-t113.dtsi            | 927 ------------------
 configs/mangopi_mq_r_defconfig                |   2 +-
 7 files changed, 2 insertions(+), 1039 deletions(-)
 delete mode 100644 arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts
 delete mode 100644 arch/arm/dts/sun8i-t113s.dtsi
 delete mode 100644 arch/riscv/dts/sunxi-d1-t113.dtsi
 delete mode 100644 arch/riscv/dts/sunxi-d1s-t113.dtsi
arch/arm/dts/Makefile +0 -2
index b329e04be9a..bf0b52d4c4b 100644
@@ -650,8 +650,6 @@ dtb-$(CONFIG_MACH_SUN8I_R40) += \
 	sun8i-r40-oka40i-c.dtb \
 	sun8i-t3-cqa3t-bv3.dtb \
 	sun8i-v40-bananapi-m2-berry.dtb
-dtb-$(CONFIG_MACH_SUN8I_R528) += \
-	sun8i-t113s-mangopi-mq-r-t113.dtb
 dtb-$(CONFIG_MACH_SUN50I_H5) += \
 	sun50i-h5-bananapi-m2-plus.dtb \
 	sun50i-h5-emlid-neutis-n5-devboard.dtb \
arch/arm/dts/sun8i-t113s-mangopi-mq-r-t113.dts deleted +0 -35
deleted file mode 100644
index 8b3a7538381..00000000000
@@ -1,35 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-// Copyright (C) 2022 Arm Ltd.
-
-#include <dt-bindings/interrupt-controller/irq.h>
-
-/dts-v1/;
-
-#include "sun8i-t113s.dtsi"
-#include "sunxi-d1s-t113-mangopi-mq-r.dtsi"
-
-/ {
-	model = "MangoPi MQ-R-T113";
-	compatible = "widora,mangopi-mq-r-t113", "allwinner,sun8i-t113s";
-
-	aliases {
-		ethernet0 = &rtl8189ftv;
-	};
-};
-
-&cpu0 {
-	cpu-supply = <&reg_vcc_core>;
-};
-
-&cpu1 {
-	cpu-supply = <&reg_vcc_core>;
-};
-
-&mmc1 {
-	rtl8189ftv: wifi@1 {
-		reg = <1>;
-		interrupt-parent = <&pio>;
-		interrupts = <6 10 IRQ_TYPE_LEVEL_LOW>; /* PG10 = WL_WAKE_AP */
-		interrupt-names = "host-wake";
-	};
-};
arch/arm/dts/sun8i-t113s.dtsi deleted +0 -59

59 lines not on this page · raw message

arch/arm/mach-sunxi/Kconfig +1 -0
index b04ec671696..d4c13f21027 100644
@@ -475,6 +475,7 @@ config MACH_SUN8I_R528
 	select MMC_SUNXI_HAS_NEW_MODE
 	select SUPPORT_SPL
 	select DRAM_SUN20I_D1
+	imply OF_UPSTREAM
 
 config MACH_SUN8I_V3S
 	bool "sun8i (Allwinner V3/V3s/S3/S3L)"
arch/riscv/dts/sunxi-d1-t113.dtsi deleted +0 -15
deleted file mode 100644
index b7156123df5..00000000000
@@ -1,15 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ or MIT)
-// Copyright (C) 2021-2022 Samuel Holland <[email protected]>
-
-/ {
-	soc {
-		dsp_wdt: watchdog@1700400 {
-			compatible = "allwinner,sun20i-d1-wdt";
-			reg = <0x1700400 0x20>;
-			interrupts = <SOC_PERIPHERAL_IRQ(122) IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&dcxo>, <&rtc CLK_OSC32K>;
-			clock-names = "hosc", "losc";
-			status = "reserved";
-		};
-	};
-};
arch/riscv/dts/sunxi-d1s-t113.dtsi deleted +0 -927

927 lines not on this page · raw message

configs/mangopi_mq_r_defconfig +1 -1
index 9017df040cf..5b754905d7c 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="sun8i-t113s-mangopi-mq-r-t113"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun8i-t113s-mangopi-mq-r-t113"
 CONFIG_SPL=y
 CONFIG_DRAM_SUNXI_ODT_EN=0
 CONFIG_DRAM_SUNXI_TPR0=0x004a2195
Signature · 1 line
2.46.4
maintainer Reviewed-by on v1 1/4
#2 lore raw

Re: [PATCH 1/4] sunxi: switch the Allwinner T113 SoC to OF_UPSTREAM

Dne nedelja, 26. oktober 2025 ob 02:23:53 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 9 lines

In contrast to some other Allwinner SoCs, there is no difference between the DTs for the Allwinner T113-s3 SoC (sun20i) between the U-Boot and the Linux kernel repository.

Remove the old copies of the T113-s3 related .dts and .dtsi files, and switch the whole SoC (represented by just one board) over to use OF_UPSTREAM.

While I haven't actually compared files, those weren't changed for some time now. It makes sense to switch them over:

Best regards,
Jernej

#3 lore raw

PATCH 2/4 sunxi: switch Allwinner A80 boards to OF_UPSTREAM

In reply to Andre Przywara

In contrast to some other Allwinner SoCs, there is no difference between the DTs for the Allwinner A80 SoCs (sun9i) between the U-Boot and the Linux kernel repository.

Remove the old copies of the A80 related .dts and .dtsi files, and switch most of sun9i boards over to use OF_UPSTREAM.

There is the Sunchip CX-A99 (family of) board(s) for which we don't have a DT in the kernel tree. Keep the .dts file in the legacy U-Boot DT directory, and let the board's defconfig opt out of OF_UPSTREAM.

---
 arch/arm/dts/Makefile                  |    2 -
 arch/arm/dts/sun9i-a80-cubieboard4.dts |  508 ----------
 arch/arm/dts/sun9i-a80-optimus.dts     |  510 ----------
 arch/arm/dts/sun9i-a80.dtsi            | 1253 ------------------------
 arch/arm/mach-sunxi/Kconfig            |    1 +
 configs/Cubieboard4_defconfig          |    2 +-
 configs/Merrii_A80_Optimus_defconfig   |    2 +-
 configs/Sunchip_CX-A99_defconfig       |    1 +
 8 files changed, 4 insertions(+), 2275 deletions(-)
 delete mode 100644 arch/arm/dts/sun9i-a80-cubieboard4.dts
 delete mode 100644 arch/arm/dts/sun9i-a80-optimus.dts
 delete mode 100644 arch/arm/dts/sun9i-a80.dtsi
arch/arm/dts/Makefile +0 -2
index bf0b52d4c4b..865ceb65f9a 100644
@@ -691,8 +691,6 @@ dtb-$(CONFIG_MACH_SUN50I) += \
 	sun50i-a64-sopine-baseboard.dtb \
 	sun50i-a64-teres-i.dtb
 dtb-$(CONFIG_MACH_SUN9I) += \
-	sun9i-a80-optimus.dtb \
-	sun9i-a80-cubieboard4.dtb \
 	sun9i-a80-cx-a99.dtb
 
 dtb-$(CONFIG_VF610) += vf610-colibri-eval-v3.dtb \
arch/arm/dts/sun9i-a80-cubieboard4.dts deleted +0 -508

508 lines not on this page · raw message

arch/arm/dts/sun9i-a80-optimus.dts deleted +0 -510

510 lines not on this page · raw message

arch/arm/dts/sun9i-a80.dtsi deleted +0 -1253

1,253 lines not on this page · raw message

arch/arm/mach-sunxi/Kconfig +1 -0
index d4c13f21027..e979ee4a2cc 100644
@@ -499,6 +499,7 @@ config MACH_SUN9I
 	select SUN6I_PRCM
 	select SUNXI_GEN_SUN6I
 	select SUPPORT_SPL
+	imply OF_UPSTREAM
 
 config MACH_SUN50I
 	bool "sun50i (Allwinner A64)"
configs/Cubieboard4_defconfig +1 -1
index 5b8428f2714..33937abfb22 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-cubieboard4"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun9i-a80-cubieboard4"
 CONFIG_SPL=y
 CONFIG_MACH_SUN9I=y
 CONFIG_DRAM_CLK=672
configs/Merrii_A80_Optimus_defconfig +1 -1
index c47dc59399d..1bfbeec1d02 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="sun9i-a80-optimus"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/sun9i-a80-optimus"
 CONFIG_SPL=y
 CONFIG_MACH_SUN9I=y
 CONFIG_DRAM_CLK=672
configs/Sunchip_CX-A99_defconfig +1 -0
index 0d78a13bd71..e25f5457f1a 100644
@@ -8,3 +8,4 @@ CONFIG_DRAM_ZQ=3881915
 CONFIG_DRAM_ODT_EN=y
 CONFIG_MMC_SUNXI_SLOT_EXTRA=2
 # CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set
+# CONFIG_OF_UPSTREAM is not set
Signature · 1 line
2.46.4
maintainer Reviewed-by on v1 2/4
#4 lore raw

Re: [PATCH 2/4] sunxi: switch Allwinner A80 boards to OF_UPSTREAM

Dne nedelja, 26. oktober 2025 ob 02:23:54 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 4 lines

In contrast to some other Allwinner SoCs, there is no difference between the DTs for the Allwinner A80 SoCs (sun9i) between the U-Boot and the Linux kernel repository.

Quoted 8 lines

Remove the old copies of the A80 related .dts and .dtsi files, and switch most of sun9i boards over to use OF_UPSTREAM.

There is the Sunchip CX-A99 (family of) board(s) for which we don't have a DT in the kernel tree. Keep the .dts file in the legacy U-Boot DT directory, and let the board's defconfig opt out of OF_UPSTREAM.

Same comment as previous patch.

I'm not sure keeping Sunchip CX-A99 makes much sense. This means that there were never enough interest in it to at least upstream DT file to Linux.

Best regards,
Jernej

#5 lore raw

PATCH 3/4 sunxi: dts: arm64: update devicetree files from Linux kernel tree

In reply to Andre Przywara

Sync the devicetree files from the official Linux kernel tree, v6.18-rc1. This is covering Allwinner SoCs with 64-bit ARM cores.

The bulk is cosmetic changes: board model name changes, DT node renames, whitespace fixes.
The actual changes are not dramatic: the CPU cores get their caches described properly, some A64 video clocks get fixed, some A64 boards describe the header pins for the WiFi module, the Pinephone adds an alternative magnetometer used on some board revisions.
On the H5 side the microSD slots get marked as having no write-protect detection, and the NanoPi Neo Plus2 board describes its regulators better. The H6 boards switch from RSB to I2C for their PMIC connection.

As before, this omits the non-backwards compatible changes to the R_INTC controller, to remain compatible with older kernels.

---
 arch/arm/dts/sun50i-a64-pine64-lts.dts        |  2 +-
 arch/arm/dts/sun50i-a64-pine64-plus.dts       |  2 +-
 arch/arm/dts/sun50i-a64-pine64.dts            | 14 ++++-
 arch/arm/dts/sun50i-a64-pinebook.dts          |  4 +-
 arch/arm/dts/sun50i-a64-pinephone.dtsi        | 21 +++++++
 .../dts/sun50i-a64-pinetab-early-adopter.dts  |  2 +-
 arch/arm/dts/sun50i-a64-pinetab.dts           |  2 +-
 arch/arm/dts/sun50i-a64-sopine-baseboard.dts  | 21 ++++++-
 arch/arm/dts/sun50i-a64-teres-i.dts           |  2 +
 arch/arm/dts/sun50i-a64.dtsi                  | 55 +++++++++++++++++--
 arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts   | 38 +++++++++++++
 arch/arm/dts/sun50i-h5-nanopi-neo2.dts        |  1 +
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts      |  1 +
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts       |  1 +
 arch/arm/dts/sun50i-h5-orangepi-prime.dts     |  1 +
 arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts |  1 +
 .../arm/dts/sun50i-h5-orangepi-zero-plus2.dts |  1 +
 arch/arm/dts/sun50i-h5.dtsi                   |  6 +-
 arch/arm/dts/sun50i-h6-beelink-gs1.dts        | 39 ++++++-------
 arch/arm/dts/sun50i-h6-orangepi-3.dts         | 17 +++---
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts     |  2 +-
 arch/arm/dts/sun50i-h6-orangepi.dtsi          | 23 ++++----
 arch/arm/dts/sun50i-h6-pine-h64-model-b.dts   |  2 +-
 arch/arm/dts/sun50i-h6-pine-h64.dts           |  3 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi             |  1 +
 arch/arm/dts/sun50i-h6.dtsi                   | 41 ++++++++++++--
 26 files changed, 241 insertions(+), 62 deletions(-)
arch/arm/dts/sun50i-a64-pine64-lts.dts +1 -1
index 596a2590743..709fe650a36 100644
@@ -5,7 +5,7 @@
 #include "sun50i-a64-sopine-baseboard.dts"
 
 / {
-	model = "Pine64 LTS";
+	model = "Pine64 PINE A64 LTS";
 	compatible = "pine64,pine64-lts", "allwinner,sun50i-r18",
 		     "allwinner,sun50i-a64";
 
arch/arm/dts/sun50i-a64-pine64-plus.dts +1 -1
index b54099b654c..026d843cd7e 100644
@@ -4,7 +4,7 @@
 #include "sun50i-a64-pine64.dts"
 
 / {
-	model = "Pine64+";
+	model = "Pine64 PINE A64+";
 	compatible = "pine64,pine64-plus", "allwinner,sun50i-a64";
 
 	/* TODO: Camera, touchscreen, etc. */
arch/arm/dts/sun50i-a64-pine64.dts +13 -1
index 329cf276561..a406e8f92d0 100644
@@ -9,7 +9,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Pine64";
+	model = "Pine64 PINE A64";
 	compatible = "pine64,pine64", "allwinner,sun50i-a64";
 
 	aliases {
@@ -124,6 +124,17 @@
 	status = "okay";
 };
 
+/* On Wifi/BT connector */
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+	vmmc-supply = <&reg_dldo4>;
+	vqmmc-supply = <&reg_eldo1>;
+	bus-width = <4>;
+	non-removable;
+	status = "disabled";
+};
+
 &ohci0 {
 	status = "okay";
 };
@@ -286,6 +297,7 @@
 &uart1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	uart-has-rtscts;
 	status = "disabled";
 };
 
arch/arm/dts/sun50i-a64-pinebook.dts +3 -1
index 1a85d5f60c3..5b7568edc32 100644
@@ -13,7 +13,7 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
-	model = "Pinebook";
+	model = "Pine64 Pinebook";
 	compatible = "pine64,pinebook", "allwinner,sun50i-a64";
 	chassis-type = "laptop";
 
@@ -390,6 +390,8 @@
 &tcon0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&lcd_rgb666_pins>;
+	assigned-clocks = <&ccu CLK_TCON0>;
+	assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>;
 
 	status = "okay";
 };
arch/arm/dts/sun50i-a64-pinephone.dtsi +21 -0
index c62dc937def..31b1f99898c 100644
@@ -188,12 +188,30 @@
 &i2c1 {
 	status = "okay";
 
+	/* Alternative magnetometer */
+	af8133j: magnetometer@1c {
+		compatible = "voltafield,af8133j";
+		reg = <0x1c>;
+		reset-gpios = <&pio 1 1 GPIO_ACTIVE_LOW>;
+		avdd-supply = <&reg_dldo1>;
+		dvdd-supply = <&reg_dldo1>;
+		mount-matrix = "0", "-1", "0",
+				"-1", "0", "0",
+				"0", "0", "-1";
+
+		/* status will be fixed up in firmware */
+		status = "disabled";
+	};
+
 	/* Magnetometer */
 	lis3mdl: magnetometer@1e {
 		compatible = "st,lis3mdl-magn";
 		reg = <0x1e>;
 		vdd-supply = <&reg_dldo1>;
 		vddio-supply = <&reg_dldo1>;
+		mount-matrix = "0", "1", "0",
+				"-1", "0", "0",
+				"0", "0", "1";
 	};
 
 	/* Light/proximity sensor */
@@ -212,6 +230,9 @@
 		interrupts = <7 5 IRQ_TYPE_EDGE_RISING>; /* PH5 */
 		vdd-supply = <&reg_dldo1>;
 		vddio-supply = <&reg_dldo1>;
+		mount-matrix = "0", "1", "0",
+			       "-1", "0", "0",
+			       "0", "0", "1";
 	};
 };
 
arch/arm/dts/sun50i-a64-pinetab-early-adopter.dts +1 -1
index 6265360ce62..86cc85eb3d4 100644
@@ -9,7 +9,7 @@
 #include "sun50i-a64-pinetab.dts"
 
 / {
-	model = "PineTab, Early Adopter's version";
+	model = "Pine64 PineTab Early Adopter";
 	compatible = "pine64,pinetab-early-adopter", "allwinner,sun50i-a64";
 };
 
arch/arm/dts/sun50i-a64-pinetab.dts +1 -1
index b6f42357b45..c66e0bd52ab 100644
@@ -14,7 +14,7 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
-	model = "PineTab, Development Sample";
+	model = "Pine64 PineTab Developer Sample";
 	compatible = "pine64,pinetab", "allwinner,sun50i-a64";
 	chassis-type = "tablet";
 
arch/arm/dts/sun50i-a64-sopine-baseboard.dts +20 -1
index 5e66ce1a334..231e652cab6 100644
@@ -8,7 +8,7 @@
 #include "sun50i-a64-sopine.dtsi"
 
 / {
-	model = "SoPine with baseboard";
+	model = "Pine64 SOPINE on Baseboard carrier board";
 	compatible = "pine64,sopine-baseboard", "pine64,sopine",
 		     "allwinner,sun50i-a64";
 
@@ -103,6 +103,17 @@
 	};
 };
 
+/* On Wifi/BT connector */
+&mmc1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&mmc1_pins>;
+	vmmc-supply = <&reg_dldo4>;
+	vqmmc-supply = <&reg_eldo1>;
+	bus-width = <4>;
+	non-removable;
+	status = "disabled";
+};
+
 &mmc2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&mmc2_pins>;
@@ -175,6 +186,14 @@
 	status = "okay";
 };
 
+/* On Wifi/BT connector, with RTS/CTS */
+&uart1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&uart1_pins>, <&uart1_rts_cts_pins>;
+	uart-has-rtscts;
+	status = "disabled";
+};
+
 /* On Pi-2 connector */
 &uart2 {
 	pinctrl-names = "default";
arch/arm/dts/sun50i-a64-teres-i.dts +2 -0
index 065b1861633..527bc4b46cd 100644
@@ -369,6 +369,8 @@
 &tcon0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&lcd_rgb666_pins>;
+	assigned-clocks = <&ccu CLK_TCON0>;
+	assigned-clock-parents = <&ccu CLK_PLL_VIDEO0_2X>;
 
 	status = "okay";
 };
arch/arm/dts/sun50i-a64.dtsi +50 -5

114 lines not on this page · raw message

arch/arm/dts/sun50i-h5-nanopi-neo-plus2.dts +38 -0
index b69032c4455..18fa541795a 100644
@@ -45,16 +45,40 @@
 		startup-delay-us = <100000>;
 		enable-active-high;
 		gpio = <&pio 3 6 GPIO_ACTIVE_HIGH>;
+		vin-supply = <&reg_vcc3v3>;
+	};
+
+	reg_gmac_2v5: gmac-2v5 {
+		/* 2V5 supply for GMAC PHY IO */
+		compatible = "regulator-fixed";
+		regulator-name = "gmac-2v5";
+		regulator-min-microvolt = <2500000>;
+		regulator-max-microvolt = <2500000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc3v3>;
+	};
+
+	reg_vcc5v: regulator-vcc5v {
+		/* board 5V supply from micro USB or pin headers */
+		compatible = "regulator-fixed";
+		regulator-name = "vcc-5v";
+		regulator-min-microvolt = <5000000>;
+		regulator-max-microvolt = <5000000>;
+		regulator-always-on;
 	};
 
 	reg_vcc3v3: vcc3v3 {
+		/* board 3V3 supply by SY8089A */
 		compatible = "regulator-fixed";
 		regulator-name = "vcc3v3";
 		regulator-min-microvolt = <3300000>;
 		regulator-max-microvolt = <3300000>;
+		regulator-always-on;
+		vin-supply = <&reg_vcc5v>;
 	};
 
 	vdd_cpux: gpio-regulator {
+		/* cpu voltage regulator MP2143DJ */
 		compatible = "regulator-gpio";
 		regulator-name = "vdd-cpux";
 		regulator-type = "voltage";
@@ -66,6 +90,7 @@
 		gpios = <&r_pio 0 6 GPIO_ACTIVE_HIGH>;
 		gpios-states = <0x1>;
 		states = <1100000 0>, <1300000 1>;
+		vin-supply = <&reg_vcc5v>;
 	};
 
 	wifi_pwrseq: pwrseq {
@@ -111,6 +136,7 @@
 	vmmc-supply = <&reg_vcc3v3>;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+	disable-wp;
 	status = "okay";
 };
 
@@ -146,6 +172,18 @@
 	status = "okay";
 };
 
+&pio {
+	vcc-pa-supply = <&reg_vcc3v3>;
+	vcc-pc-supply = <&reg_vcc3v3>;
+	vcc-pd-supply = <&reg_gmac_2v5>;
+	vcc-pf-supply = <&reg_vcc3v3>;
+	vcc-pg-supply = <&reg_vcc3v3>;
+};
+
+&r_pio {
+	vcc-pl-supply = <&reg_vcc3v3>;
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pa_pins>;
arch/arm/dts/sun50i-h5-nanopi-neo2.dts +1 -0
index 05486cccee1..128295f5a5d 100644
@@ -88,6 +88,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
 	status = "okay";
arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts +1 -0
index 3a7ee44708a..44fdc8b3f79 100644
@@ -157,6 +157,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
 	status = "okay";
arch/arm/dts/sun50i-h5-orangepi-pc2.dts +1 -0
index ce3ae19e72d..0f29da7d51e 100644
@@ -153,6 +153,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
 	status = "okay";
arch/arm/dts/sun50i-h5-orangepi-prime.dts +1 -0
index b699bb900e1..d4fc4e60e4e 100644
@@ -153,6 +153,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
 	status = "okay";
arch/arm/dts/sun50i-h5-orangepi-zero-plus.dts +1 -0
index ae85131aac9..3322cc4d9aa 100644
@@ -82,6 +82,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
 	status = "okay";
arch/arm/dts/sun50i-h5-orangepi-zero-plus2.dts +1 -0
index 734481e998b..3eb986c354a 100644
@@ -79,6 +79,7 @@
 
 &mmc0 {
 	vmmc-supply = <&reg_vcc3v3>;
+	disable-wp;
 	bus-width = <4>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
 	status = "okay";
arch/arm/dts/sun50i-h5.dtsi +1 -5
index 9b3462b13cc..14c7c74c4ad 100644
@@ -16,7 +16,6 @@
 			reg = <0>;
 			enable-method = "psci";
 			clocks = <&ccu CLK_CPUX>;
-			clock-latency-ns = <244144>; /* 8 32k periods */
 			#cooling-cells = <2>;
 		};
 
@@ -26,7 +25,6 @@
 			reg = <1>;
 			enable-method = "psci";
 			clocks = <&ccu CLK_CPUX>;
-			clock-latency-ns = <244144>; /* 8 32k periods */
 			#cooling-cells = <2>;
 		};
 
@@ -36,7 +34,6 @@
 			reg = <2>;
 			enable-method = "psci";
 			clocks = <&ccu CLK_CPUX>;
-			clock-latency-ns = <244144>; /* 8 32k periods */
 			#cooling-cells = <2>;
 		};
 
@@ -46,7 +43,6 @@
 			reg = <3>;
 			enable-method = "psci";
 			clocks = <&ccu CLK_CPUX>;
-			clock-latency-ns = <244144>; /* 8 32k periods */
 			#cooling-cells = <2>;
 		};
 	};
@@ -207,7 +203,7 @@
 			};
 
 			cooling-maps {
-				cpu-hot-limit {
+				map0 {
 					trip = <&cpu_hot_trip>;
 					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
arch/arm/dts/sun50i-h6-beelink-gs1.dts +20 -19
index 529285fc34f..6b4b621ef38 100644
@@ -129,6 +129,7 @@
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	disable-wp;
 	bus-width = <4>;
 	status = "okay";
 };
@@ -151,28 +152,12 @@
 	vcc-pg-supply = <&reg_aldo1>;
 };
 
-&r_ir {
-	linux,rc-map-name = "rc-beelink-gs1";
-	status = "okay";
-};
-
-&r_pio {
-	/*
-	 * FIXME: We can't add that supply for now since it would
-	 * create a circular dependency between pinctrl, the regulator
-	 * and the RSB Bus.
-	 *
-	 * vcc-pl-supply = <&reg_aldo1>;
-	 */
-	vcc-pm-supply = <&reg_aldo1>;
-};
-
-&r_rsb {
+&r_i2c {
 	status = "okay";
 
-	axp805: pmic@745 {
+	axp805: pmic@36 {
 		compatible = "x-powers,axp805", "x-powers,axp806";
-		reg = <0x745>;
+		reg = <0x36>;
 		interrupt-parent = <&r_intc>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		interrupt-controller;
@@ -290,6 +275,22 @@
 	};
 };
 
+&r_ir {
+	linux,rc-map-name = "rc-beelink-gs1";
+	status = "okay";
+};
+
+&r_pio {
+	/*
+	 * PL0 and PL1 are used for PMIC I2C
+	 * don't enable the pl-supply else
+	 * it will fail at boot
+	 *
+	 * vcc-pl-supply = <&reg_aldo1>;
+	 */
+	vcc-pm-supply = <&reg_aldo1>;
+};
+
 &spdif {
 	pinctrl-names = "default";
 	pinctrl-0 = <&spdif_tx_pin>;
arch/arm/dts/sun50i-h6-orangepi-3.dts +9 -8
index bdcec466246..007e74e9604 100644
@@ -131,6 +131,7 @@
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>; /* PF6 */
+	disable-wp;
 	bus-width = <4>;
 	status = "okay";
 };
@@ -143,7 +144,7 @@
 	non-removable;
 	status = "okay";
 
-	brcm: sdio-wifi@1 {
+	brcm: wifi@1 {
 		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 		interrupt-parent = <&r_pio>;
@@ -175,16 +176,12 @@
 	vcc-pg-supply = <&reg_vcc_wifi_io>;
 };
 
-&r_ir {
-	status = "okay";
-};
-
-&r_rsb {
+&r_i2c {
 	status = "okay";
 
-	axp805: pmic@745 {
+	axp805: pmic@36 {
 		compatible = "x-powers,axp805", "x-powers,axp806";
-		reg = <0x745>;
+		reg = <0x36>;
 		interrupt-parent = <&r_intc>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		interrupt-controller;
@@ -295,6 +292,10 @@
 	};
 };
 
+&r_ir {
+	status = "okay";
+};
+
 &rtc {
 	clocks = <&ext_osc32k>;
 };
arch/arm/dts/sun50i-h6-orangepi-lite2.dts +1 -1
index a3f65a45bd2..0911c537cc6 100644
@@ -28,7 +28,7 @@
 	non-removable;
 	status = "okay";
 
-	brcm: sdio-wifi@1 {
+	brcm: wifi@1 {
 		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 		interrupt-parent = <&r_pio>;
arch/arm/dts/sun50i-h6-orangepi.dtsi +12 -11
index 4403769fc36..f69658bde88 100644
@@ -94,6 +94,7 @@
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	disable-wp;
 	bus-width = <4>;
 	status = "okay";
 };
@@ -112,20 +113,12 @@
 	vcc-pg-supply = <&reg_aldo1>;
 };
 
-&r_ir {
-	status = "okay";
-};
-
-&r_pio {
-	vcc-pm-supply = <&reg_bldo3>;
-};
-
-&r_rsb {
+&r_i2c {
 	status = "okay";
 
-	axp805: pmic@745 {
+	axp805: pmic@36 {
 		compatible = "x-powers,axp805", "x-powers,axp806";
-		reg = <0x745>;
+		reg = <0x36>;
 		interrupt-parent = <&r_intc>;
 		interrupts = <0 IRQ_TYPE_LEVEL_LOW>;
 		interrupt-controller;
@@ -240,6 +233,14 @@
 	};
 };
 
+&r_ir {
+	status = "okay";
+};
+
+&r_pio {
+	vcc-pm-supply = <&reg_bldo3>;
+};
+
 &rtc {
 	clocks = <&ext_osc32k>;
 };
arch/arm/dts/sun50i-h6-pine-h64-model-b.dts +1 -1
index 66fe03910d5..066fbeff8bf 100644
@@ -8,7 +8,7 @@
 /delete-node/ &reg_gmac_3v3;
 
 / {
-	model = "Pine H64 model B";
+	model = "Pine64 PINE H64 Model B";
 	compatible = "pine64,pine-h64-model-b", "allwinner,sun50i-h6";
 
 	wifi_pwrseq: pwrseq {
arch/arm/dts/sun50i-h6-pine-h64.dts +2 -1
index bfb46572bda..108dad2b072 100644
@@ -9,7 +9,7 @@
 #include <dt-bindings/gpio/gpio.h>
 
 / {
-	model = "Pine H64 model A";
+	model = "Pine64 PINE H64 Model A";
 	compatible = "pine64,pine-h64", "allwinner,sun50i-h6";
 
 	aliases {
@@ -133,6 +133,7 @@
 &mmc0 {
 	vmmc-supply = <&reg_cldo1>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	disable-wp;
 	bus-width = <4>;
 	status = "okay";
 };
arch/arm/dts/sun50i-h6-tanix.dtsi +1 -0
index 855b7d43bc5..bb7de37c0d5 100644
@@ -124,6 +124,7 @@
 	pinctrl-0 = <&mmc0_pins>;
 	vmmc-supply = <&reg_vcc3v3>;
 	cd-gpios = <&pio 5 6 GPIO_ACTIVE_LOW>;
+	disable-wp;
 	bus-width = <4>;
 	status = "okay";
 };
arch/arm/dts/sun50i-h6.dtsi +37 -4

69 lines not on this page · raw message

Signature · 1 line
2.46.4
#6 lore raw

PATCH 4/4 sunxi: dts: arm: update devicetree files from Linux kernel tree

In reply to Andre Przywara

Sync the kernel devicetree source files for the Allwinner SoCs with 32-bit cores that do not use OF_UPSTREAM yet. The files were taken from a v6.18-rc1 tree.

To maintain ABI compatibility with existing LTS kernels, one change moving some IP blocks to the r_intc interrupt controller is excluded. This effectively reverts Linux commits 994e5818392c and 9fdef3c3d8c2.

This commit also adds a new board devicetree for the A33 Vstar board, plus one DT overlay for the OrangePi Zero interface board.

This update should not impact any existing U-Boot functionality.

---
 arch/arm/dts/sun7i-a20-bananapi.dts           |  27 +++
 arch/arm/dts/sun8i-a23-a33.dtsi               |  20 ++
 arch/arm/dts/sun8i-a33-vstar-core1.dtsi       |  96 ++++++++
 arch/arm/dts/sun8i-a33-vstar.dts              | 205 ++++++++++++++++++
 arch/arm/dts/sun8i-a83t.dtsi                  |   4 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |  14 ++
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |   2 +-
 arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts |  14 ++
 arch/arm/dts/sun8i-h3.dtsi                    |   2 +-
 .../sun8i-orangepi-zero-interface-board.dtso  |  46 ++++
 arch/arm/dts/sun8i-q8-common.dtsi             |   2 +-
 arch/arm/dts/sun8i-r40.dtsi                   |   4 +-
 12 files changed, 429 insertions(+), 7 deletions(-)
 create mode 100644 arch/arm/dts/sun8i-a33-vstar-core1.dtsi
 create mode 100644 arch/arm/dts/sun8i-a33-vstar.dts
 create mode 100644 arch/arm/dts/sun8i-orangepi-zero-interface-board.dtso
arch/arm/dts/sun7i-a20-bananapi.dts +27 -0
index 46ecf9db232..d8b362c9661 100644
@@ -48,6 +48,7 @@
 
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/interrupt-controller/irq.h>
+#include <dt-bindings/leds/common.h>
 
 / {
 	model = "LeMaker Banana Pi";
@@ -169,6 +170,32 @@
 &gmac_mdio {
 	phy1: ethernet-phy@1 {
 		reg = <1>;
+
+		leds {
+			#address-cells = <1>;
+			#size-cells = <0>;
+
+			led@0 {
+				reg = <0>;
+				color = <LED_COLOR_ID_GREEN>;
+				function = LED_FUNCTION_LAN;
+				linux,default-trigger = "netdev";
+			};
+
+			led@1 {
+				reg = <1>;
+				color = <LED_COLOR_ID_AMBER>;
+				function = LED_FUNCTION_LAN;
+				linux,default-trigger = "netdev";
+			};
+
+			led@2 {
+				reg = <2>;
+				color = <LED_COLOR_ID_BLUE>;
+				function = LED_FUNCTION_LAN;
+				linux,default-trigger = "netdev";
+			};
+		};
 	};
 };
 
arch/arm/dts/sun8i-a23-a33.dtsi +20 -0
index 4ebb0a7a78f..cca585c3829 100644
@@ -433,6 +433,11 @@
 				function = "pwm0";
 			};
 
+			spi0_pc_pins: spi0-pc-pins {
+				pins = "PC0", "PC1", "PC2", "PC3";
+				function = "spi0";
+			};
+
 			uart0_pf_pins: uart0-pf-pins {
 				pins = "PF2", "PF4";
 				function = "uart0";
@@ -610,6 +615,21 @@
 			assigned-clock-rates = <384000000>;
 		};
 
+		spi0: spi@1c68000 {
+			compatible = "allwinner,sun8i-a23-spi",
+				     "allwinner,sun8i-h3-spi";
+			reg = <0x01c68000 0x1000>;
+			interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
+			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_SPI0>;
+			clock-names = "ahb", "mod";
+			dmas = <&dma 23>, <&dma 23>;
+			dma-names = "rx", "tx";
+			resets = <&ccu RST_BUS_SPI0>;
+			status = "disabled";
+			#address-cells = <1>;
+			#size-cells = <0>;
+		};
+
 		gic: interrupt-controller@1c81000 {
 			compatible = "arm,gic-400";
 			reg = <0x01c81000 0x1000>,
arch/arm/dts/sun8i-a33-vstar-core1.dtsi new file +96 -0

96 lines not on this page · raw message

arch/arm/dts/sun8i-a33-vstar.dts new file +205 -0

205 lines not on this page · raw message

arch/arm/dts/sun8i-a83t.dtsi +2 -2
index 90f2c08d051..be01620a2c5 100644
@@ -1222,7 +1222,7 @@
 			};
 
 			cooling-maps {
-				cpu-hot-limit {
+				map0 {
 					trip = <&cpu0_hot>;
 					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -1252,7 +1252,7 @@
 			};
 
 			cooling-maps {
-				cpu-hot-limit {
+				map0 {
 					trip = <&cpu1_hot>;
 					cooling-device = <&cpu100 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&cpu101 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +14 -0
index 1b001f2ad0e..b23cec5b89e 100644
@@ -112,6 +112,20 @@
 	};
 };
 
+/*
+ * Audio input/output is exposed on the 13-pin header and can't be used for
+ * anything else. However, adapter boards may use different audio routing.
+ * - https://linux-sunxi.org/Xunlong_Orange_Pi_Zero#Expansion_Port
+ * - Allwinner H3 Datasheet, section 3.1. Pin Characteristics
+ */
+&codec {
+	allwinner,audio-routing =
+		"Line Out", "LINEOUT",
+		"MIC1", "Mic",
+		"Mic",  "MBIAS";
+	status = "disabled";
+};
+
 &cpu0 {
 	cpu-supply = <&reg_vdd_cpux>;
 };
arch/arm/dts/sun8i-h3-nanopi-neo-air.dts +1 -1
index 6d85370e04f..9a2742363cd 100644
@@ -94,7 +94,7 @@
 	non-removable;
 	status = "okay";
 
-	brcmf: bcrmf@1 {
+	brcmf: wifi@1 {
 		reg = <1>;
 		compatible = "brcm,bcm4329-fmac";
 		interrupt-parent = <&pio>;
arch/arm/dts/sun8i-h3-orangepi-zero-plus2.dts +14 -0
index 7a6444a10e2..97a3565ac7a 100644
@@ -99,6 +99,20 @@
 	};
 };
 
+/*
+ * Audio input/output is exposed on the 13-pin header and can't be used for
+ * anything else. However, adapter boards may use different audio routing.
+ * - http://www.orangepi.org/html/hardWare/computerAndMicrocontrollers/details/Orange-Pi-Zero-Plus-2.html
+ * - Allwinner H3 Datasheet, section 3.1. Pin Characteristics
+ */
+&codec {
+	allwinner,audio-routing =
+		"Line Out", "LINEOUT",
+		"MIC1", "Mic",
+		"Mic",  "MBIAS";
+	status = "disabled";
+};
+
 &de {
 	status = "okay";
 };
arch/arm/dts/sun8i-h3.dtsi +1 -1
index eac2349a238..cfd039840b4 100644
@@ -262,7 +262,7 @@
 			};
 
 			cooling-maps {
-				cpu-hot-limit {
+				map0 {
 					trip = <&cpu_hot_trip>;
 					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
arch/arm/dts/sun8i-orangepi-zero-interface-board.dtso new file +46 -0

46 lines not on this page · raw message

arch/arm/dts/sun8i-q8-common.dtsi +1 -1
index 272584881bb..a0f787581dd 100644
@@ -82,7 +82,7 @@
 };
 
 &ehci0 {
-	status  = "okay";
+	status = "okay";
 };
 
 &mmc1 {
arch/arm/dts/sun8i-r40.dtsi +2 -2
index a5b1f1e3900..f0ed802a9d0 100644
@@ -146,7 +146,7 @@
 			};
 
 			cooling-maps {
-				cpu-hot-limit {
+				map0 {
 					trip = <&cpu_hot_trip>;
 					cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
 							 <&cpu1 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>,
@@ -705,7 +705,7 @@
 			};
 
 			/omit-if-no-ref/
-			uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins{
+			uart2_rts_cts_pi_pins: uart2-rts-cts-pi-pins {
 				pins = "PI16", "PI17";
 				function = "uart2";
 			};
Signature · 1 line
2.46.4