Skip to contentSkip to conversation

sunxi: update devicetree files from the kernel

PATCH In review Andre Przywara 2 participants 5 messages Sep 13, 2022 – Oct 13, 2022

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

cover sunxi: update devicetree files from the kernel

This syncs the .dts and .dtsi files from the Linux kernel repository as of v6.0-rc4 into U-Boot. As before, we skip the r_intc change, as this breaks older kernels.
The first patch handles the 64-bit parts, the second one the 32-bit SoCs.

Thanks,
Andre

Andre Przywara (2):
sunxi: dts: arm64: update devicetree files
sunxi: dts: arm: update devicetree files

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       |  40 +--
 arch/arm/dts/sun4i-a10-pcduino.dts            |   6 +-
 arch/arm/dts/sun50i-a64-amarula-relic.dts     |   2 +-
 arch/arm/dts/sun50i-a64-bananapi-m64.dts      |   4 +-
 arch/arm/dts/sun50i-a64-nanopi-a64.dts        |   2 +-
 arch/arm/dts/sun50i-a64-olinuxino.dts         |  30 ++
 arch/arm/dts/sun50i-a64-orangepi-win.dts      |   6 +-
 arch/arm/dts/sun50i-a64-pinebook.dts          |   4 +-
 arch/arm/dts/sun50i-a64-pinephone-1.0.dts     |   4 +
 arch/arm/dts/sun50i-a64-pinephone-1.1.dts     |   4 +
 arch/arm/dts/sun50i-a64-teres-i.dts           |   8 +
 arch/arm/dts/sun50i-a64.dtsi                  |  10 +-
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts      |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts       |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-prime.dts     |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-3.dts         |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts     |   4 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi             |   2 +-
 arch/arm/dts/sun50i-h6.dtsi                   |  12 +-
 arch/arm/dts/sun50i-h616-orangepi-zero2.dts   |  55 +---
 arch/arm/dts/sun50i-h616-x96-mate.dts         | 177 +++++++++++
 arch/arm/dts/sun50i-h616.dtsi                 | 286 +++++-------------
 arch/arm/dts/sun5i-a13-licheepi-one.dts       |   6 +-
 arch/arm/dts/sun6i-a31.dtsi                   |  13 +-
 arch/arm/dts/sun7i-a20-pcduino3.dts           |   6 +-
 arch/arm/dts/sun8i-a23-a33.dtsi               |   9 +-
 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts      |  74 +----
 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts        |  74 +----
 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts         |  58 +---
 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  58 +---
 .../dts/sun8i-h2-plus-bananapi-m2-zero.dts    |   8 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |   2 +-
 arch/arm/dts/sun8i-h3-beelink-x2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-mapleboard-mp130.dts    |   6 +-
 arch/arm/dts/sun8i-h3-nanopi-duo2.dts         |   8 +-
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |   2 +-
 arch/arm/dts/sun8i-h3-nanopi-r1.dts           |   4 +-
 arch/arm/dts/sun8i-h3-nanopi.dtsi             |   5 +-
 arch/arm/dts/sun8i-h3-orangepi-2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-orangepi-lite.dts       |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-one.dts        |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-pc.dts         |   4 +-
 arch/arm/dts/sun8i-r16-bananapi-m2m.dts       |   4 +-
 arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts  |   5 +
 arch/arm/dts/sun8i-r40-cpu-opp.dtsi           |  52 ++++
 arch/arm/dts/sun8i-r40-feta40i.dtsi           |   5 +
 arch/arm/dts/sun8i-r40.dtsi                   |  44 ++-
 arch/arm/dts/sun8i-t3-cqa3t-bv3.dts           |   5 +
 arch/arm/dts/sun8i-v3s.dtsi                   |   6 +-
 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts  |   5 +
 arch/arm/dts/sun9i-a80.dtsi                   |   1 -
 arch/arm/dts/sunxi-bananapi-m2-plus.dtsi      |   8 +-
 arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi    |   4 +-
 arch/arm/dts/sunxi-h3-h5.dtsi                 |  13 +-
 arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi   |   4 +-
 include/dt-bindings/clock/sun50i-h6-r-ccu.h   |   1 +
 include/dt-bindings/clock/sun50i-h616-ccu.h   |   1 +
 include/dt-bindings/clock/sun6i-rtc.h         |  10 +
 59 files changed, 562 insertions(+), 638 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h616-x96-mate.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts
 create mode 100644 arch/arm/dts/sun8i-r40-cpu-opp.dtsi
 create mode 100644 include/dt-bindings/clock/sun6i-rtc.h
Signature · 1 line
2.35.3
#1 lore raw

PATCH 1/2 sunxi: dts: arm64: update devicetree files

Update the devicetree files from the Linux kernel, version v6.0-rc4. This is covering the 64-bit SoCs, from arch/arm64/boot/dts/allwinner.

This avoids the not backwards-compatible r_intc binding change, to allow older kernels to boot, but the other nodes are updated.

Not much change here, the vast majority is actually cosmetic: node names and using symbolic names for the the RTC clocks.
Some A64 boards gain some audio nodes.
The H616 DTs are now switched to the version finally merged into the kernel, which brings some changes, but none affecting U-Boot.

---
 arch/arm/dts/Makefile                       |   3 +-
 arch/arm/dts/sun50i-a64-amarula-relic.dts   |   2 +-
 arch/arm/dts/sun50i-a64-bananapi-m64.dts    |   4 +-
 arch/arm/dts/sun50i-a64-nanopi-a64.dts      |   2 +-
 arch/arm/dts/sun50i-a64-olinuxino.dts       |  30 ++
 arch/arm/dts/sun50i-a64-orangepi-win.dts    |   6 +-
 arch/arm/dts/sun50i-a64-pinebook.dts        |   4 +-
 arch/arm/dts/sun50i-a64-pinephone-1.0.dts   |   4 +
 arch/arm/dts/sun50i-a64-pinephone-1.1.dts   |   4 +
 arch/arm/dts/sun50i-a64-teres-i.dts         |   8 +
 arch/arm/dts/sun50i-a64.dtsi                |  10 +-
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts    |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts     |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-prime.dts   |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-3.dts       |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts   |   4 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi           |   2 +-
 arch/arm/dts/sun50i-h6.dtsi                 |  12 +-
 arch/arm/dts/sun50i-h616-orangepi-zero2.dts |  55 +---
 arch/arm/dts/sun50i-h616-x96-mate.dts       | 177 ++++++++++++
 arch/arm/dts/sun50i-h616.dtsi               | 286 +++++---------------
 include/dt-bindings/clock/sun50i-h6-r-ccu.h |   1 +
 include/dt-bindings/clock/sun50i-h616-ccu.h |   1 +
 include/dt-bindings/clock/sun6i-rtc.h       |  10 +
 24 files changed, 353 insertions(+), 288 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h616-x96-mate.dts
 create mode 100644 include/dt-bindings/clock/sun6i-rtc.h
arch/arm/dts/Makefile +2 -1
index 7330121dbab..a56bbd682a1 100644
@@ -709,7 +709,8 @@ dtb-$(CONFIG_MACH_SUN50I_H6) += \
 	sun50i-h6-tanix-tx6.dtb \
 	sun50i-h6-tanix-tx6-mini.dtb
 dtb-$(CONFIG_MACH_SUN50I_H616) += \
-	sun50i-h616-orangepi-zero2.dtb
+	sun50i-h616-orangepi-zero2.dtb \
+	sun50i-h616-x96-mate.dtb
 dtb-$(CONFIG_MACH_SUN50I) += \
 	sun50i-a64-amarula-relic.dtb \
 	sun50i-a64-bananapi-m64.dtb \
arch/arm/dts/sun50i-a64-amarula-relic.dts +1 -1
index c7bd73f35ed..ce8f6aa164e 100644
@@ -58,7 +58,7 @@
 
 	wifi_pwrseq: wifi-pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* WL-PMU-EN: PL2 */
 	};
arch/arm/dts/sun50i-a64-bananapi-m64.dts +2 -2
index f7fe9fa50cb..bf66b640816 100644
@@ -56,7 +56,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -355,7 +355,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_dldo2>;
 		vddio-supply = <&reg_dldo4>;
arch/arm/dts/sun50i-a64-nanopi-a64.dts +1 -1
index 09b3c7fb82c..ffc3b4c7068 100644
@@ -43,7 +43,7 @@
 
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 		reset-gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
 	};
arch/arm/dts/sun50i-a64-olinuxino.dts +30 -0
index f3f8e177ab6..22d350249c1 100644
@@ -58,6 +58,15 @@
 	};
 };
 
+&codec {
+	status = "okay";
+};
+
+&codec_analog {
+	cpvdd-supply = <&reg_eldo1>;
+	status = "okay";
+};
+
 &cpu0 {
 	cpu-supply = <&reg_dcdc2>;
 };
@@ -74,6 +83,10 @@
 	cpu-supply = <&reg_dcdc2>;
 };
 
+&dai {
+	status = "okay";
+};
+
 &de {
 	status = "okay";
 };
@@ -328,6 +341,23 @@
 	vcc-hdmi-supply = <&reg_dldo1>;
 };
 
+&sound {
+	simple-audio-card,aux-devs = <&codec_analog>;
+	simple-audio-card,widgets = "Microphone", "Microphone Jack Left",
+		    "Microphone", "Microphone Jack Right",
+		    "Headphone", "Headphone Jack";
+	simple-audio-card,routing = "Left DAC", "DACL",
+		    "Right DAC", "DACR",
+		    "Headphone Jack", "HP",
+		    "ADCL", "Left ADC",
+		    "ADCR", "Right ADC",
+		    "Microphone Jack Left", "MBIAS",
+		    "MIC1", "Microphone Jack Left",
+		    "Microphone Jack Right", "MBIAS",
+		    "MIC2", "Microphone Jack Right";
+	status = "okay";
+};
+
 &uart0 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&uart0_pb_pins>;
arch/arm/dts/sun50i-a64-orangepi-win.dts +3 -3
index 8eee8051ac5..714a270a558 100644
@@ -40,7 +40,7 @@
 	leds {
 		compatible = "gpio-leds";
 
-		status {
+		led-0 {
 			label = "orangepi:green:status";
 			gpios = <&pio 7 11 GPIO_ACTIVE_HIGH>; /* PH11 */
 		};
@@ -71,7 +71,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 8 GPIO_ACTIVE_LOW>; /* PL8 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -369,7 +369,7 @@
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		max-speed = <1500000>;
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_dldo2>;
 		vddio-supply = <&reg_dldo4>;
arch/arm/dts/sun50i-a64-pinebook.dts +2 -2
index 68b6ab4707c..c00c4c1e9e7 100644
@@ -35,10 +35,10 @@
 		stdout-path = "serial0:115200n8";
 	};
 
-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		lid_switch {
+		lid-switch {
 			label = "Lid Switch";
 			gpios = <&r_pio 0 12 GPIO_ACTIVE_LOW>; /* PL12 */
 			linux,input-type = <EV_SW>;
arch/arm/dts/sun50i-a64-pinephone-1.0.dts +4 -0
index fb65319a3bd..219f720b8b7 100644
@@ -10,6 +10,10 @@
 	compatible = "pine64,pinephone-1.0", "pine64,pinephone", "allwinner,sun50i-a64";
 };
 
+&codec_analog {
+	allwinner,internal-bias-resistor;
+};
+
 &sgm3140 {
 	enable-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
 	flash-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
arch/arm/dts/sun50i-a64-pinephone-1.1.dts +4 -0
index 5e59d375217..723af64a9ce 100644
@@ -29,6 +29,10 @@
 	default-brightness-level = <400>;
 };
 
+&codec_analog {
+	allwinner,internal-bias-resistor;
+};
+
 &sgm3140 {
 	enable-gpios = <&pio 3 24 GPIO_ACTIVE_HIGH>; /* PD24 */
 	flash-gpios = <&pio 2 3 GPIO_ACTIVE_HIGH>; /* PC3 */
arch/arm/dts/sun50i-a64-teres-i.dts +8 -0
index 6668431dcb4..945afdb508d 100644
@@ -197,6 +197,14 @@
 	status = "okay";
 };
 
+&pio {
+	vcc-pc-supply = <&reg_dcdc1>;
+	vcc-pd-supply = <&reg_dldo2>;
+	vcc-pe-supply = <&reg_aldo1>;
+	vcc-pf-supply = <&reg_dcdc1>;  /* No dedicated supply-pin for this */
+	vcc-pg-supply = <&reg_aldo2>;
+};
+
 &pwm {
 	status = "okay";
 };
arch/arm/dts/sun50i-a64.dtsi +6 -4
index 555bc92a6f8..b04f492c0f2 100644
@@ -4,6 +4,7 @@
 //    Copyright (C) 2015 Jens Kuske <[email protected]>
 
 #include <dt-bindings/clock/sun50i-a64-ccu.h>
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/clock/sun8i-de2.h>
 #include <dt-bindings/clock/sun8i-r-ccu.h>
 #include <dt-bindings/interrupt-controller/arm-gic.h>
@@ -660,7 +661,7 @@
 		ccu: clock@1c20000 {
 			compatible = "allwinner,sun50i-a64-ccu";
 			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "hosc", "losc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -672,7 +673,8 @@
 			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 21 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
@@ -1224,7 +1226,7 @@
 			reg-io-width = <1>;
 			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
-				 <&ccu CLK_HDMI>, <&rtc 0>;
+				 <&ccu CLK_HDMI>, <&rtc CLK_OSC32K>;
 			clock-names = "iahb", "isfr", "tmds", "cec";
 			resets = <&ccu RST_BUS_HDMI1>;
 			reset-names = "ctrl";
@@ -1284,7 +1286,7 @@
 		r_ccu: clock@1f01400 {
 			compatible = "allwinner,sun50i-a64-r-ccu";
 			reg = <0x01f01400 0x100>;
-			clocks = <&osc24M>, <&rtc 0>, <&rtc 2>,
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>,
 				 <&ccu CLK_PLL_PERIPH0>;
 			clock-names = "hosc", "losc", "iosc", "pll-periph";
 			#clock-cells = <1>;
arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts +2 -2
index 55b369534a0..a3e040da38a 100644
@@ -52,10 +52,10 @@
 		};
 	};
 
-	r-gpio-keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		reset {
+		key-reset {
 			label = "reset";
 			linux,code = <KEY_RESTART>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun50i-h5-orangepi-pc2.dts +2 -2
index 1010c1b22d2..b5c1ff19b4c 100644
@@ -54,10 +54,10 @@
 		};
 	};
 
-	r-gpio-keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		key-sw4 {
 			label = "sw4";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun50i-h5-orangepi-prime.dts +2 -2
index 74e0444af19..d7f8bad6bb9 100644
@@ -48,10 +48,10 @@
 		};
 	};
 
-	r-gpio-keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		key-sw4 {
 			label = "sw4";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun50i-h6-orangepi-3.dts +2 -2
index 9f12c05e21f..f1957bb1edb 100644
@@ -86,7 +86,7 @@
 
 	wifi_pwrseq: wifi-pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
 		post-power-on-delay-ms = <200>;
@@ -314,7 +314,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm4345c5";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */
 		host-wakeup-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */
arch/arm/dts/sun50i-h6-orangepi-lite2.dts +2 -2
index e8770858b5d..fb31dcb1cb6 100644
@@ -13,7 +13,7 @@
 
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
 		post-power-on-delay-ms = <200>;
@@ -64,7 +64,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm4345c5";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		device-wakeup-gpios = <&r_pio 1 2 GPIO_ACTIVE_HIGH>; /* PM2 */
 		host-wakeup-gpios = <&r_pio 1 1 GPIO_ACTIVE_HIGH>; /* PM1 */
arch/arm/dts/sun50i-h6-tanix.dtsi +1 -1
index edb71e4a030..4903d635811 100644
@@ -78,7 +78,7 @@
 
 	wifi_pwrseq: wifi-pwrseq {
 		compatible = "mmc-pwrseq-simple";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 		reset-gpios = <&r_pio 1 3 GPIO_ACTIVE_LOW>; /* PM3 */
 	};
arch/arm/dts/sun50i-h6.dtsi +7 -5
index 71a45a624da..afbbfc25269 100644
@@ -4,6 +4,7 @@
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 #include <dt-bindings/clock/sun50i-h6-ccu.h>
 #include <dt-bindings/clock/sun50i-h6-r-ccu.h>
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/clock/sun8i-de2.h>
 #include <dt-bindings/clock/sun8i-tcon-top.h>
 #include <dt-bindings/reset/sun50i-h6-ccu.h>
@@ -237,7 +238,7 @@
 		ccu: clock@3001000 {
 			compatible = "allwinner,sun50i-h6-ccu";
 			reg = <0x03001000 0x1000>;
-			clocks = <&osc24M>, <&rtc 0>, <&rtc 2>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>;
 			clock-names = "hosc", "losc", "iosc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -316,7 +317,7 @@
 				     <GIC_SPI 53 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 54 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 59 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu CLK_APB1>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_APB1>, <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
@@ -724,7 +725,7 @@
 			interrupts = <GIC_SPI 26 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_BUS_XHCI>,
 				 <&ccu CLK_BUS_XHCI>,
-				 <&rtc 0>;
+				 <&rtc CLK_OSC32K>;
 			clock-names = "ref", "bus_early", "suspend";
 			resets = <&ccu RST_BUS_XHCI>;
 			/*
@@ -929,7 +930,7 @@
 		r_ccu: clock@7010000 {
 			compatible = "allwinner,sun50i-h6-r-ccu";
 			reg = <0x07010000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>, <&rtc 2>,
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>,
 				 <&ccu CLK_PLL_PERIPH0>;
 			clock-names = "hosc", "losc", "iosc", "pll-periph";
 			#clock-cells = <1>;
@@ -958,7 +959,8 @@
 			reg = <0x07022000 0x400>;
 			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 111 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&r_ccu CLK_R_APB1>, <&osc24M>, <&rtc 0>;
+			clocks = <&r_ccu CLK_R_APB1>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
arch/arm/dts/sun50i-h616-orangepi-zero2.dts +13 -42

98 lines not on this page · raw message

arch/arm/dts/sun50i-h616-x96-mate.dts new file +177 -0

177 lines not on this page · raw message

arch/arm/dts/sun50i-h616.dtsi +70 -216

465 lines not on this page · raw message

include/dt-bindings/clock/sun50i-h6-r-ccu.h +1 -0
index 890368d252c..a96087abc86 100644
@@ -22,5 +22,6 @@
 #define CLK_W1			12
 
 #define CLK_R_APB2_RSB		13
+#define CLK_R_APB1_RTC		14
 
 #endif /* _DT_BINDINGS_CLK_SUN50I_H6_R_CCU_H_ */
include/dt-bindings/clock/sun50i-h616-ccu.h +1 -0
index 4fc08b0df2f..1191aca53ac 100644
@@ -111,5 +111,6 @@
 #define CLK_BUS_TVE0		125
 #define CLK_HDCP		126
 #define CLK_BUS_HDCP		127
+#define CLK_PLL_SYSTEM_32K	128
 
 #endif /* _DT_BINDINGS_CLK_SUN50I_H616_H_ */
include/dt-bindings/clock/sun6i-rtc.h new file +10 -0
new file mode 100644
index 00000000000..c845493e4d3
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: (GPL-2.0+ or MIT) */
+
+#ifndef _DT_BINDINGS_CLK_SUN6I_RTC_H_
+#define _DT_BINDINGS_CLK_SUN6I_RTC_H_
+
+#define CLK_OSC32K		0
+#define CLK_OSC32K_FANOUT	1
+#define CLK_IOSC		2
+
+#endif /* _DT_BINDINGS_CLK_SUN6I_RTC_H_ */
Signature · 1 line
2.35.3
#2 lore raw

PATCH 2/2 sunxi: dts: arm: update devicetree files

In reply to Andre Przywara

Update the devicetree files from the Linux kernel, version v6.0-rc4. This is covering the 32-bit SoCs, from arch/arm/boot/dts/.

This avoids the not backwards-compatible r_intc binding change, to allow older kernels to boot, but the other nodes are updated.

Not much change here, the vast majority is actually cosmetic: node names and using symbolic names for the the RTC clocks.
The R40 boards gain DVFS support.
Some A23/A33 tablet DTs are unified into a single file.

---
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 40 +++++-----
 arch/arm/dts/sun4i-a10-pcduino.dts            |  6 +-
 arch/arm/dts/sun5i-a13-licheepi-one.dts       |  6 +-
 arch/arm/dts/sun6i-a31.dtsi                   | 13 ++--
 arch/arm/dts/sun7i-a20-pcduino3.dts           |  6 +-
 arch/arm/dts/sun8i-a23-a33.dtsi               |  9 ++-
 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts      | 74 +------------------
 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts        | 74 +------------------
 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts         | 58 +--------------
 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts      | 58 +--------------
 .../dts/sun8i-h2-plus-bananapi-m2-zero.dts    |  8 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |  2 +-
 arch/arm/dts/sun8i-h3-beelink-x2.dts          |  6 +-
 arch/arm/dts/sun8i-h3-mapleboard-mp130.dts    |  6 +-
 arch/arm/dts/sun8i-h3-nanopi-duo2.dts         |  8 +-
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |  2 +-
 arch/arm/dts/sun8i-h3-nanopi-r1.dts           |  4 +-
 arch/arm/dts/sun8i-h3-nanopi.dtsi             |  5 +-
 arch/arm/dts/sun8i-h3-orangepi-2.dts          |  6 +-
 arch/arm/dts/sun8i-h3-orangepi-lite.dts       |  4 +-
 arch/arm/dts/sun8i-h3-orangepi-one.dts        |  4 +-
 arch/arm/dts/sun8i-h3-orangepi-pc.dts         |  4 +-
 arch/arm/dts/sun8i-r16-bananapi-m2m.dts       |  4 +-
 arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts  |  5 ++
 arch/arm/dts/sun8i-r40-cpu-opp.dtsi           | 52 +++++++++++++
 arch/arm/dts/sun8i-r40-feta40i.dtsi           |  5 ++
 arch/arm/dts/sun8i-r40.dtsi                   | 44 ++++++++++-
 arch/arm/dts/sun8i-t3-cqa3t-bv3.dts           |  5 ++
 arch/arm/dts/sun8i-v3s.dtsi                   |  6 +-
 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts  |  5 ++
 arch/arm/dts/sun9i-a80.dtsi                   |  1 -
 arch/arm/dts/sunxi-bananapi-m2-plus.dtsi      |  8 +-
 arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi    |  4 +-
 arch/arm/dts/sunxi-h3-h5.dtsi                 | 13 ++--
 arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi   |  4 +-
 35 files changed, 209 insertions(+), 350 deletions(-)
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts
 create mode 100644 arch/arm/dts/sun8i-r40-cpu-opp.dtsi
arch/arm/dts/sun4i-a10-inet9f-rev03.dts +20 -20
index 0a562b2cc5b..62e7aa587f8 100644
@@ -63,7 +63,7 @@
 		compatible = "gpio-keys-polled";
 		poll-interval = <20>;
 
-		left-joystick-left {
+		event-left-joystick-left {
 			label = "Left Joystick Left";
 			linux,code = <ABS_X>;
 			linux,input-type = <EV_ABS>;
@@ -71,7 +71,7 @@
 			gpios = <&pio 0 6 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA6 */
 		};
 
-		left-joystick-right {
+		event-left-joystick-right {
 			label = "Left Joystick Right";
 			linux,code = <ABS_X>;
 			linux,input-type = <EV_ABS>;
@@ -79,7 +79,7 @@
 			gpios = <&pio 0 5 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA5 */
 		};
 
-		left-joystick-up {
+		event-left-joystick-up {
 			label = "Left Joystick Up";
 			linux,code = <ABS_Y>;
 			linux,input-type = <EV_ABS>;
@@ -87,7 +87,7 @@
 			gpios = <&pio 0 8 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA8 */
 		};
 
-		left-joystick-down {
+		event-left-joystick-down {
 			label = "Left Joystick Down";
 			linux,code = <ABS_Y>;
 			linux,input-type = <EV_ABS>;
@@ -95,7 +95,7 @@
 			gpios = <&pio 0 9 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA9 */
 		};
 
-		right-joystick-left {
+		event-right-joystick-left {
 			label = "Right Joystick Left";
 			linux,code = <ABS_Z>;
 			linux,input-type = <EV_ABS>;
@@ -103,7 +103,7 @@
 			gpios = <&pio 0 1 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA1 */
 		};
 
-		right-joystick-right {
+		event-right-joystick-right {
 			label = "Right Joystick Right";
 			linux,code = <ABS_Z>;
 			linux,input-type = <EV_ABS>;
@@ -111,7 +111,7 @@
 			gpios = <&pio 0 0 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA0 */
 		};
 
-		right-joystick-up {
+		event-right-joystick-up {
 			label = "Right Joystick Up";
 			linux,code = <ABS_RZ>;
 			linux,input-type = <EV_ABS>;
@@ -119,7 +119,7 @@
 			gpios = <&pio 0 3 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA3 */
 		};
 
-		right-joystick-down {
+		event-right-joystick-down {
 			label = "Right Joystick Down";
 			linux,code = <ABS_RZ>;
 			linux,input-type = <EV_ABS>;
@@ -127,7 +127,7 @@
 			gpios = <&pio 0 4 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA4 */
 		};
 
-		dpad-left {
+		event-dpad-left {
 			label = "DPad Left";
 			linux,code = <ABS_HAT0X>;
 			linux,input-type = <EV_ABS>;
@@ -135,7 +135,7 @@
 			gpios = <&pio 7 23 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH23 */
 		};
 
-		dpad-right {
+		event-dpad-right {
 			label = "DPad Right";
 			linux,code = <ABS_HAT0X>;
 			linux,input-type = <EV_ABS>;
@@ -143,7 +143,7 @@
 			gpios = <&pio 7 24 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH24 */
 		};
 
-		dpad-up {
+		event-dpad-up {
 			label = "DPad Up";
 			linux,code = <ABS_HAT0Y>;
 			linux,input-type = <EV_ABS>;
@@ -151,7 +151,7 @@
 			gpios = <&pio 7 25 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH25 */
 		};
 
-		dpad-down {
+		event-dpad-down {
 			label = "DPad Down";
 			linux,code = <ABS_HAT0Y>;
 			linux,input-type = <EV_ABS>;
@@ -159,49 +159,49 @@
 			gpios = <&pio 7 26 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH26 */
 		};
 
-		x {
+		event-x {
 			label = "Button X";
 			linux,code = <BTN_X>;
 			gpios = <&pio 0 16 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA16 */
 		};
 
-		y {
+		event-y {
 			label = "Button Y";
 			linux,code = <BTN_Y>;
 			gpios = <&pio 0 14 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA14 */
 		};
 
-		a {
+		event-a {
 			label = "Button A";
 			linux,code = <BTN_A>;
 			gpios = <&pio 0 17 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA17 */
 		};
 
-		b {
+		event-b {
 			label = "Button B";
 			linux,code = <BTN_B>;
 			gpios = <&pio 0 15 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA15 */
 		};
 
-		select {
+		event-select {
 			label = "Select Button";
 			linux,code = <BTN_SELECT>;
 			gpios = <&pio 0 11 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA11 */
 		};
 
-		start {
+		event-start {
 			label = "Start Button";
 			linux,code = <BTN_START>;
 			gpios = <&pio 0 12 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA12 */
 		};
 
-		top-left {
+		event-top-left {
 			label = "Top Left Button";
 			linux,code = <BTN_TL>;
 			gpios = <&pio 7 22 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PH22 */
 		};
 
-		top-right {
+		event-top-right {
 			label = "Top Right Button";
 			linux,code = <BTN_TR>;
 			gpios = <&pio 0 13 (GPIO_ACTIVE_LOW | GPIO_PULL_UP)>; /* PA13 */
arch/arm/dts/sun4i-a10-pcduino.dts +3 -3
index 1ac82376bae..a332d61fd56 100644
@@ -77,19 +77,19 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		back {
+		key-back {
 			label = "Key Back";
 			linux,code = <KEY_BACK>;
 			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
 		};
 
-		home {
+		key-home {
 			label = "Key Home";
 			linux,code = <KEY_HOME>;
 			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
 		};
 
-		menu {
+		key-menu {
 			label = "Key Menu";
 			linux,code = <KEY_MENU>;
 			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun5i-a13-licheepi-one.dts +3 -3
index 2ce361f8fed..3a6c4bd0a44 100644
@@ -67,18 +67,18 @@
 		compatible = "gpio-leds";
 
 		led-0 {
-			label ="licheepi:red:usr";
+			label = "licheepi:red:usr";
 			gpios = <&pio 2 5 GPIO_ACTIVE_LOW>;
 		};
 
 		led-1 {
-			label ="licheepi:green:usr";
+			label = "licheepi:green:usr";
 			gpios = <&pio 2 19 GPIO_ACTIVE_LOW>;
 			default-state = "on";
 		};
 
 		led-2 {
-			label ="licheepi:blue:usr";
+			label = "licheepi:blue:usr";
 			gpios = <&pio 2 4 GPIO_ACTIVE_LOW>;
 		};
 
arch/arm/dts/sun6i-a31.dtsi +7 -6
index d7d920e9e48..f6701ece7b7 100644
@@ -46,6 +46,7 @@
 #include <dt-bindings/thermal/thermal.h>
 
 #include <dt-bindings/clock/sun6i-a31-ccu.h>
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/reset/sun6i-a31-ccu.h>
 
 / {
@@ -598,7 +599,7 @@
 		ccu: clock@1c20000 {
 			compatible = "allwinner,sun6i-a31-ccu";
 			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "hosc", "losc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -611,7 +612,8 @@
 				     <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu CLK_APB1_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_APB1_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			interrupt-controller;
@@ -1316,7 +1318,7 @@
 			ar100: ar100_clk {
 				compatible = "allwinner,sun6i-a31-ar100-clk";
 				#clock-cells = <0>;
-				clocks = <&rtc 0>, <&osc24M>,
+				clocks = <&rtc CLK_OSC32K>, <&osc24M>,
 					 <&ccu CLK_PLL_PERIPH>,
 					 <&ccu CLK_PLL_PERIPH>;
 				clock-output-names = "ar100";
@@ -1351,7 +1353,7 @@
 			ir_clk: ir_clk {
 				#clock-cells = <0>;
 				compatible = "allwinner,sun4i-a10-mod0-clk";
-				clocks = <&rtc 0>, <&osc24M>;
+				clocks = <&rtc CLK_OSC32K>, <&osc24M>;
 				clock-output-names = "ir";
 			};
 
@@ -1381,9 +1383,8 @@
 			reg = <0x01f02c00 0x400>;
 			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
+			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
-			resets = <&apb0_rst 0>;
 			gpio-controller;
 			interrupt-controller;
 			#interrupt-cells = <3>;
arch/arm/dts/sun7i-a20-pcduino3.dts +3 -3
index 4f8d55d3ba7..928b86a95f3 100644
@@ -78,19 +78,19 @@
 	gpio-keys {
 		compatible = "gpio-keys";
 
-		back {
+		key-back {
 			label = "Key Back";
 			linux,code = <KEY_BACK>;
 			gpios = <&pio 7 17 GPIO_ACTIVE_LOW>;
 		};
 
-		home {
+		key-home {
 			label = "Key Home";
 			linux,code = <KEY_HOME>;
 			gpios = <&pio 7 18 GPIO_ACTIVE_LOW>;
 		};
 
-		menu {
+		key-menu {
 			label = "Key Menu";
 			linux,code = <KEY_MENU>;
 			gpios = <&pio 7 19 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-a23-a33.dtsi +5 -4
index a42fac676b3..06809c3a1f2 100644
@@ -44,6 +44,7 @@
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
 
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/clock/sun8i-a23-a33-ccu.h>
 #include <dt-bindings/reset/sun8i-a23-a33-ccu.h>
 
@@ -329,7 +330,7 @@
 
 		ccu: clock@1c20000 {
 			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "hosc", "losc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -339,7 +340,8 @@
 			/* compatible gets set in SoC specific dtsi file */
 			reg = <0x01c20800 0x400>;
 			/* interrupts get set in SoC specific dtsi file */
-			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			interrupt-controller;
@@ -806,9 +808,8 @@
 			compatible = "allwinner,sun8i-a23-r-pinctrl";
 			reg = <0x01f02c00 0x400>;
 			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc 0>;
+			clocks = <&apb0_gates 0>, <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
-			resets = <&apb0_rst 0>;
 			gpio-controller;
 			interrupt-controller;
 			#interrupt-cells = <3>;
arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts deleted +0 -73

73 lines not on this page · raw message

arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts new file +1 -0
new file mode 120000
index 00000000000..c2f22fc3381
@@ -0,0 +1 @@
+sun8i-a23-q8-tablet.dts
\ No newline at end of file
arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts deleted +0 -73

73 lines not on this page · raw message

arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts new file +1 -0
new file mode 120000
index 00000000000..c2f22fc3381
@@ -0,0 +1 @@
+sun8i-a23-q8-tablet.dts
\ No newline at end of file
arch/arm/dts/sun8i-a33-et-q8-v1.6.dts deleted +0 -57

57 lines not on this page · raw message

arch/arm/dts/sun8i-a33-et-q8-v1.6.dts new file +1 -0
new file mode 120000
index 00000000000..4519fd791a8
@@ -0,0 +1 @@
+sun8i-a33-q8-tablet.dts
\ No newline at end of file
arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts deleted +0 -57

57 lines not on this page · raw message

arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts new file +1 -0
new file mode 120000
index 00000000000..4519fd791a8
@@ -0,0 +1 @@
+sun8i-a33-q8-tablet.dts
\ No newline at end of file
arch/arm/dts/sun8i-h2-plus-bananapi-m2-zero.dts +4 -4
index d5c7b7984d8..d729b7c705d 100644
@@ -47,10 +47,10 @@
 		};
 	};
 
-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		switch-4 {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
@@ -106,7 +106,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -181,7 +181,7 @@
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		max-speed = <1500000>;
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts +1 -1
index f19ed981da9..3706216ffb4 100644
@@ -169,7 +169,7 @@
 	flash@0 {
 		#address-cells = <1>;
 		#size-cells = <1>;
-		compatible = "mxicy,mx25l1606e", "winbond,w25q128";
+		compatible = "mxicy,mx25l1606e", "jedec,spi-nor";
 		reg = <0>;
 		spi-max-frequency = <40000000>;
 	};
arch/arm/dts/sun8i-h3-beelink-x2.dts +3 -3
index cd9f655e4f9..27a0d51289d 100644
@@ -93,10 +93,10 @@
 		};
 	};
 
-	r-gpio-keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		power {
+		key-power {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
@@ -125,7 +125,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
arch/arm/dts/sun8i-h3-mapleboard-mp130.dts +3 -3
index ff0a7a952e0..f5c8ccc5b87 100644
@@ -39,16 +39,16 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		power {
+		key-power {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */
 		};
 
-		user {
+		key-user {
 			label = "user";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-h3-nanopi-duo2.dts +4 -4
index 8e7dfcffe1f..43641cb8239 100644
@@ -37,10 +37,10 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		k1 {
+		key-0 {
 			label = "k1";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>; /* PL3 */
@@ -90,7 +90,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 
@@ -151,7 +151,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sun8i-h3-nanopi-neo-air.dts +1 -1
index cd3df12b657..9e1a33f94ca 100644
@@ -127,7 +127,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sun8i-h3-nanopi-r1.dts +2 -2
index 26e2e6172e0..42cd1131adf 100644
@@ -46,7 +46,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 
@@ -147,7 +147,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sun8i-h3-nanopi.dtsi +2 -3
index fc45d5aaa67..cf8413fba6c 100644
@@ -73,11 +73,10 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
-		input-name = "k1";
 
-		k1 {
+		key-0 {
 			label = "k1";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-h3-orangepi-2.dts +3 -3
index 9daffd90c12..f1f9dbead32 100644
@@ -88,16 +88,16 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw2 {
+		switch-2 {
 			label = "sw2";
 			linux,code = <BTN_1>;
 			gpios = <&r_pio 0 4 GPIO_ACTIVE_LOW>;
 		};
 
-		sw4 {
+		switch-4 {
 			label = "sw4";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-h3-orangepi-lite.dts +2 -2
index 6f9c97add54..305b34a321f 100644
@@ -87,10 +87,10 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		switch-4 {
 			label = "sw4";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-h3-orangepi-one.dts +2 -2
index 4759ba3f298..59f6f6d5e7c 100644
@@ -86,10 +86,10 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		switch-4 {
 			label = "sw4";
 			linux,code = <BTN_0>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-h3-orangepi-pc.dts +2 -2
index 90f75fa85e6..b96e015f54e 100644
@@ -86,10 +86,10 @@
 		};
 	};
 
-	r_gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		switch-4 {
 			label = "sw4";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
arch/arm/dts/sun8i-r16-bananapi-m2m.dts +2 -2
index 293016d081c..f97218e70c1 100644
@@ -91,7 +91,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 6 GPIO_ACTIVE_LOW>; /* PL06 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -283,7 +283,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_dldo1>;
 		vddio-supply = <&reg_aldo3>;
arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts +5 -0
index a6a1087a0c9..28197bbcb1d 100644
@@ -43,6 +43,7 @@
 
 /dts-v1/;
 #include "sun8i-r40.dtsi"
+#include "sun8i-r40-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
@@ -113,6 +114,10 @@
 	status = "okay";
 };
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &de {
 	status = "okay";
 };
arch/arm/dts/sun8i-r40-cpu-opp.dtsi new file +52 -0

52 lines not on this page · raw message

arch/arm/dts/sun8i-r40-feta40i.dtsi +5 -0
index 265e0fa57a3..9f39b5a2bb3 100644
@@ -5,6 +5,11 @@
 //  Copyright (C) 2017 Icenowy Zheng <[email protected]>
 
 #include "sun8i-r40.dtsi"
+#include "sun8i-r40-cpu-opp.dtsi"
+
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
 
 &i2c0 {
 	status = "okay";
arch/arm/dts/sun8i-r40.dtsi +41 -3

98 lines not on this page · raw message

arch/arm/dts/sun8i-t3-cqa3t-bv3.dts +5 -0
index 6931aaab238..9f472521f4a 100644
@@ -45,6 +45,7 @@
 
 /dts-v1/;
 #include "sun8i-r40.dtsi"
+#include "sun8i-r40-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
@@ -88,6 +89,10 @@
 	status = "okay";
 };
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &de {
 	status = "okay";
 };
arch/arm/dts/sun8i-v3s.dtsi +4 -2
index 084323d5c61..db194c606fd 100644
@@ -42,6 +42,7 @@
  */
 
 #include <dt-bindings/interrupt-controller/arm-gic.h>
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/clock/sun8i-v3s-ccu.h>
 #include <dt-bindings/reset/sun8i-v3s-ccu.h>
 #include <dt-bindings/clock/sun8i-de2.h>
@@ -321,7 +322,7 @@
 		ccu: clock@1c20000 {
 			compatible = "allwinner,sun8i-v3s-ccu";
 			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "hosc", "losc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -342,7 +343,8 @@
 			reg = <0x01c20800 0x400>;
 			interrupts = <GIC_SPI 15 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts +5 -0
index 47954551f57..434871040ac 100644
@@ -42,6 +42,7 @@
 
 /dts-v1/;
 #include "sun8i-r40.dtsi"
+#include "sun8i-r40-cpu-opp.dtsi"
 
 #include <dt-bindings/gpio/gpio.h>
 
@@ -107,6 +108,10 @@
 	status = "okay";
 };
 
+&cpu0 {
+	cpu-supply = <&reg_dcdc2>;
+};
+
 &de {
 	status = "okay";
 };
arch/arm/dts/sun9i-a80.dtsi +0 -1
index ce4fa6706d0..7d3f3300f43 100644
@@ -1218,7 +1218,6 @@
 				     <GIC_SPI 46 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&apbs_gates 0>, <&osc24M>, <&osc32k>;
 			clock-names = "apb", "hosc", "losc";
-			resets = <&apbs_rst 0>;
 			gpio-controller;
 			interrupt-controller;
 			#interrupt-cells = <3>;
arch/arm/dts/sunxi-bananapi-m2-plus.dtsi +4 -4
index d03f5853ef7..e899d14f38c 100644
@@ -77,10 +77,10 @@
 		};
 	};
 
-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		sw4 {
+		switch-4 {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 3 GPIO_ACTIVE_LOW>;
@@ -101,7 +101,7 @@
 	wifi_pwrseq: wifi_pwrseq {
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&r_pio 0 7 GPIO_ACTIVE_LOW>; /* PL7 */
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -221,7 +221,7 @@
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
 		max-speed = <1500000>;
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi +2 -2
index fc67e30fe21..60804b0e6c5 100644
@@ -22,7 +22,7 @@
 		compatible = "mmc-pwrseq-simple";
 		reset-gpios = <&pio 2 7 GPIO_ACTIVE_LOW>; /* PC7 */
 		post-power-on-delay-ms = <200>;
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "ext_clock";
 	};
 };
@@ -124,7 +124,7 @@
 
 	bluetooth {
 		compatible = "brcm,bcm43438-bt";
-		clocks = <&rtc 1>;
+		clocks = <&rtc CLK_OSC32K_FANOUT>;
 		clock-names = "lpo";
 		vbat-supply = <&reg_vcc3v3>;
 		vddio-supply = <&reg_vcc3v3>;
arch/arm/dts/sunxi-h3-h5.dtsi +8 -5
index 6cea57e07f8..64391418609 100644
@@ -40,6 +40,7 @@
  *     OTHER DEALINGS IN THE SOFTWARE.
  */
 
+#include <dt-bindings/clock/sun6i-rtc.h>
 #include <dt-bindings/clock/sun8i-de2.h>
 #include <dt-bindings/clock/sun8i-h3-ccu.h>
 #include <dt-bindings/clock/sun8i-r-ccu.h>
@@ -386,7 +387,7 @@
 		ccu: clock@1c20000 {
 			/* compatible is in per SoC .dtsi file */
 			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&rtc 0>;
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>;
 			clock-names = "hosc", "losc";
 			#clock-cells = <1>;
 			#reset-cells = <1>;
@@ -397,7 +398,8 @@
 			reg = <0x01c20800 0x400>;
 			interrupts = <GIC_SPI 11 IRQ_TYPE_LEVEL_HIGH>,
 				     <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
@@ -817,7 +819,7 @@
 			reg-io-width = <1>;
 			interrupts = <GIC_SPI 88 IRQ_TYPE_LEVEL_HIGH>;
 			clocks = <&ccu CLK_BUS_HDMI>, <&ccu CLK_HDMI_DDC>,
-				 <&ccu CLK_HDMI>, <&rtc 0>;
+				 <&ccu CLK_HDMI>, <&rtc CLK_OSC32K>;
 			clock-names = "iahb", "isfr", "tmds", "cec";
 			resets = <&ccu RST_BUS_HDMI1>;
 			reset-names = "ctrl";
@@ -876,7 +878,7 @@
 		r_ccu: clock@1f01400 {
 			compatible = "allwinner,sun8i-h3-r-ccu";
 			reg = <0x01f01400 0x100>;
-			clocks = <&osc24M>, <&rtc 0>, <&rtc 2>,
+			clocks = <&osc24M>, <&rtc CLK_OSC32K>, <&rtc CLK_IOSC>,
 				 <&ccu CLK_PLL_PERIPH0>;
 			clock-names = "hosc", "losc", "iosc", "pll-periph";
 			#clock-cells = <1>;
@@ -928,7 +930,8 @@
 			compatible = "allwinner,sun8i-h3-r-pinctrl";
 			reg = <0x01f02c00 0x400>;
 			interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
-			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>, <&rtc 0>;
+			clocks = <&r_ccu CLK_APB0_PIO>, <&osc24M>,
+				 <&rtc CLK_OSC32K>;
 			clock-names = "apb", "hosc", "losc";
 			gpio-controller;
 			#gpio-cells = <3>;
arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi +2 -2
index 9e14fe5fdcd..89731bb34c6 100644
@@ -42,10 +42,10 @@
 		};
 	};
 
-	gpio_keys {
+	gpio-keys {
 		compatible = "gpio-keys";
 
-		power {
+		key-power {
 			label = "power";
 			linux,code = <KEY_POWER>;
 			gpios = <&r_pio 0 2 GPIO_ACTIVE_LOW>; /* PL2 */
Signature · 1 line
2.35.3
#3 lore raw
In reply to Andre Przywara

On Wed, 14 Sep 2022 00:40:02 +0100
Andre Przywara <[email protected]> wrote:

Hi,

can someone please have a look and confirm that this is legit? Could be as easy as just diff'ing against what's in the kernel tree and checking that the differences are just due to the r_intc change.

I would like to push the DT update still into the release, so that we live up to the promise of providing a good experience with $fdtcontroladdr.

Cheers,
Andre

Quoted 81 lines

This syncs the .dts and .dtsi files from the Linux kernel repository as of v6.0-rc4 into U-Boot. As before, we skip the r_intc change, as this breaks older kernels.
The first patch handles the 64-bit parts, the second one the 32-bit SoCs.

Thanks,
Andre

Andre Przywara (2):
sunxi: dts: arm64: update devicetree files
sunxi: dts: arm: update devicetree files

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       |  40 +--
 arch/arm/dts/sun4i-a10-pcduino.dts            |   6 +-
 arch/arm/dts/sun50i-a64-amarula-relic.dts     |   2 +-
 arch/arm/dts/sun50i-a64-bananapi-m64.dts      |   4 +-
 arch/arm/dts/sun50i-a64-nanopi-a64.dts        |   2 +-
 arch/arm/dts/sun50i-a64-olinuxino.dts         |  30 ++
 arch/arm/dts/sun50i-a64-orangepi-win.dts      |   6 +-
 arch/arm/dts/sun50i-a64-pinebook.dts          |   4 +-
 arch/arm/dts/sun50i-a64-pinephone-1.0.dts     |   4 +
 arch/arm/dts/sun50i-a64-pinephone-1.1.dts     |   4 +
 arch/arm/dts/sun50i-a64-teres-i.dts           |   8 +
 arch/arm/dts/sun50i-a64.dtsi                  |  10 +-
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts      |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts       |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-prime.dts     |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-3.dts         |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts     |   4 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi             |   2 +-
 arch/arm/dts/sun50i-h6.dtsi                   |  12 +-
 arch/arm/dts/sun50i-h616-orangepi-zero2.dts   |  55 +---
 arch/arm/dts/sun50i-h616-x96-mate.dts         | 177 +++++++++++
 arch/arm/dts/sun50i-h616.dtsi                 | 286 +++++-------------
 arch/arm/dts/sun5i-a13-licheepi-one.dts       |   6 +-
 arch/arm/dts/sun6i-a31.dtsi                   |  13 +-
 arch/arm/dts/sun7i-a20-pcduino3.dts           |   6 +-
 arch/arm/dts/sun8i-a23-a33.dtsi               |   9 +-
 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts      |  74 +----
 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts        |  74 +----
 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts         |  58 +---
 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  58 +---
 .../dts/sun8i-h2-plus-bananapi-m2-zero.dts    |   8 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |   2 +-
 arch/arm/dts/sun8i-h3-beelink-x2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-mapleboard-mp130.dts    |   6 +-
 arch/arm/dts/sun8i-h3-nanopi-duo2.dts         |   8 +-
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |   2 +-
 arch/arm/dts/sun8i-h3-nanopi-r1.dts           |   4 +-
 arch/arm/dts/sun8i-h3-nanopi.dtsi             |   5 +-
 arch/arm/dts/sun8i-h3-orangepi-2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-orangepi-lite.dts       |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-one.dts        |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-pc.dts         |   4 +-
 arch/arm/dts/sun8i-r16-bananapi-m2m.dts       |   4 +-
 arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts  |   5 +
 arch/arm/dts/sun8i-r40-cpu-opp.dtsi           |  52 ++++
 arch/arm/dts/sun8i-r40-feta40i.dtsi           |   5 +
 arch/arm/dts/sun8i-r40.dtsi                   |  44 ++-
 arch/arm/dts/sun8i-t3-cqa3t-bv3.dts           |   5 +
 arch/arm/dts/sun8i-v3s.dtsi                   |   6 +-
 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts  |   5 +
 arch/arm/dts/sun9i-a80.dtsi                   |   1 -
 arch/arm/dts/sunxi-bananapi-m2-plus.dtsi      |   8 +-
 arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi    |   4 +-
 arch/arm/dts/sunxi-h3-h5.dtsi                 |  13 +-
 arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi   |   4 +-
 include/dt-bindings/clock/sun50i-h6-r-ccu.h   |   1 +
 include/dt-bindings/clock/sun50i-h616-ccu.h   |   1 +
 include/dt-bindings/clock/sun6i-rtc.h         |  10 +
 59 files changed, 562 insertions(+), 638 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h616-x96-mate.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts
 create mode 100644 arch/arm/dts/sun8i-r40-cpu-opp.dtsi
 create mode 100644 include/dt-bindings/clock/sun6i-rtc.h
maintainer Reviewed-by
#4 lore raw

Dne ponedeljek, 26. september 2022 ob 12:34:38 CEST je Andre Przywara napisal(a):

Quoted 11 lines

On Wed, 14 Sep 2022 00:40:02 +0100
Andre Przywara <[email protected]> wrote:

Hi,

can someone please have a look and confirm that this is legit? Could be as easy as just diff'ing against what's in the kernel tree and checking that the differences are just due to the r_intc change.

I would like to push the DT update still into the release, so that we live up to the promise of providing a good experience with $fdtcontroladdr.

I checked that all files are either equal or have r_int difference.

FWIW:

Best regards,
Jernej

Quoted 84 lines

Cheers,
Andre

Quoted 80 lines

This syncs the .dts and .dtsi files from the Linux kernel repository as of v6.0-rc4 into U-Boot. As before, we skip the r_intc change, as this breaks older kernels.
The first patch handles the 64-bit parts, the second one the 32-bit SoCs.

Thanks,
Andre

Andre Przywara (2):
sunxi: dts: arm64: update devicetree files
sunxi: dts: arm: update devicetree files

 arch/arm/dts/Makefile                         |   3 +-
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       |  40 +--
 arch/arm/dts/sun4i-a10-pcduino.dts            |   6 +-
 arch/arm/dts/sun50i-a64-amarula-relic.dts     |   2 +-
 arch/arm/dts/sun50i-a64-bananapi-m64.dts      |   4 +-
 arch/arm/dts/sun50i-a64-nanopi-a64.dts        |   2 +-
 arch/arm/dts/sun50i-a64-olinuxino.dts         |  30 ++
 arch/arm/dts/sun50i-a64-orangepi-win.dts      |   6 +-
 arch/arm/dts/sun50i-a64-pinebook.dts          |   4 +-
 arch/arm/dts/sun50i-a64-pinephone-1.0.dts     |   4 +
 arch/arm/dts/sun50i-a64-pinephone-1.1.dts     |   4 +
 arch/arm/dts/sun50i-a64-teres-i.dts           |   8 +
 arch/arm/dts/sun50i-a64.dtsi                  |  10 +-
 arch/arm/dts/sun50i-h5-nanopi-r1s-h5.dts      |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-pc2.dts       |   4 +-
 arch/arm/dts/sun50i-h5-orangepi-prime.dts     |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-3.dts         |   4 +-
 arch/arm/dts/sun50i-h6-orangepi-lite2.dts     |   4 +-
 arch/arm/dts/sun50i-h6-tanix.dtsi             |   2 +-
 arch/arm/dts/sun50i-h6.dtsi                   |  12 +-
 arch/arm/dts/sun50i-h616-orangepi-zero2.dts   |  55 +---
 arch/arm/dts/sun50i-h616-x96-mate.dts         | 177 +++++++++++
 arch/arm/dts/sun50i-h616.dtsi                 | 286 +++++-------------
 arch/arm/dts/sun5i-a13-licheepi-one.dts       |   6 +-
 arch/arm/dts/sun6i-a31.dtsi                   |  13 +-
 arch/arm/dts/sun7i-a20-pcduino3.dts           |   6 +-
 arch/arm/dts/sun8i-a23-a33.dtsi               |   9 +-
 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts      |  74 +----
 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts        |  74 +----
 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts         |  58 +---
 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts      |  58 +---
 .../dts/sun8i-h2-plus-bananapi-m2-zero.dts    |   8 +-
 arch/arm/dts/sun8i-h2-plus-orangepi-zero.dts  |   2 +-
 arch/arm/dts/sun8i-h3-beelink-x2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-mapleboard-mp130.dts    |   6 +-
 arch/arm/dts/sun8i-h3-nanopi-duo2.dts         |   8 +-
 arch/arm/dts/sun8i-h3-nanopi-neo-air.dts      |   2 +-
 arch/arm/dts/sun8i-h3-nanopi-r1.dts           |   4 +-
 arch/arm/dts/sun8i-h3-nanopi.dtsi             |   5 +-
 arch/arm/dts/sun8i-h3-orangepi-2.dts          |   6 +-
 arch/arm/dts/sun8i-h3-orangepi-lite.dts       |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-one.dts        |   4 +-
 arch/arm/dts/sun8i-h3-orangepi-pc.dts         |   4 +-
 arch/arm/dts/sun8i-r16-bananapi-m2m.dts       |   4 +-
 arch/arm/dts/sun8i-r40-bananapi-m2-ultra.dts  |   5 +
 arch/arm/dts/sun8i-r40-cpu-opp.dtsi           |  52 ++++
 arch/arm/dts/sun8i-r40-feta40i.dtsi           |   5 +
 arch/arm/dts/sun8i-r40.dtsi                   |  44 ++-
 arch/arm/dts/sun8i-t3-cqa3t-bv3.dts           |   5 +
 arch/arm/dts/sun8i-v3s.dtsi                   |   6 +-
 arch/arm/dts/sun8i-v40-bananapi-m2-berry.dts  |   5 +
 arch/arm/dts/sun9i-a80.dtsi                   |   1 -
 arch/arm/dts/sunxi-bananapi-m2-plus.dtsi      |   8 +-
 arch/arm/dts/sunxi-h3-h5-emlid-neutis.dtsi    |   4 +-
 arch/arm/dts/sunxi-h3-h5.dtsi                 |  13 +-
 arch/arm/dts/sunxi-libretech-all-h3-cc.dtsi   |   4 +-
 include/dt-bindings/clock/sun50i-h6-r-ccu.h   |   1 +
 include/dt-bindings/clock/sun50i-h616-ccu.h   |   1 +
 include/dt-bindings/clock/sun6i-rtc.h         |  10 +
 59 files changed, 562 insertions(+), 638 deletions(-)
 create mode 100644 arch/arm/dts/sun50i-h616-x96-mate.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v1.2.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a23-ippo-q8h-v5.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-et-q8-v1.6.dts
 mode change 100644 => 120000 arch/arm/dts/sun8i-a33-ippo-q8h-v1.2.dts
 create mode 100644 arch/arm/dts/sun8i-r40-cpu-opp.dtsi
 create mode 100644 include/dt-bindings/clock/sun6i-rtc.h