Skip to contentSkip to conversation

sunxi: switch three SoC families to OF_UPSTREAM

PATCH In review Andre Przywara 3 participants 11 messages Jan 19, 2025 – Jan 22, 2025

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

cover sunxi: switch three SoC families to OF_UPSTREAM

This series converts boards with the Allwinner F1C100s/F1C200s, A10, A10s and A13s SoCs over to OF_UPSTREAM. The .dts and .dtsi files were identical between the kernel and U-Boot repository, so this is a no-brainer.
However there are four boards (tablets, I guess) that do not have a .dts file in the kernel repository. For now I kept them using the "old style", so they continue working. This requires to keep a copy of the SoC .dtsi file, I would be grateful for any advice as how to handle this situation best. Ideally we would submit the DTs to the kernel, but I don't know how feasible this is, given their age, the missing device availability and their basic DT nature.

I compiled all boards with and without this series applied: the resulting u-boot.dtb files were always identical.

Please have a look!

Cheers,
Andre

Andre Przywara (3):
suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM
sunxi: switch Allwinner A10 boards to OF_UPSTREAM
sunxi: switch Allwinner A10s/A13 boards to OF_UPSTREAM

 arch/arm/dts/Makefile                         |  48 +--
 arch/arm/dts/sun4i-a10-a1000.dts              | 255 -------------
 arch/arm/dts/sun4i-a10-ba10-tvbox.dts         | 151 --------
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts    | 159 --------
 arch/arm/dts/sun4i-a10-cubieboard.dts         | 255 -------------
 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts   | 218 -----------
 arch/arm/dts/sun4i-a10-gemei-g9.dts           | 192 ----------
 arch/arm/dts/sun4i-a10-hackberry.dts          | 140 -------
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts       | 115 ------
 arch/arm/dts/sun4i-a10-inet1.dts              | 229 -----------
 arch/arm/dts/sun4i-a10-inet97fv2.dts          | 203 ----------
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 357 ------------------
 .../dts/sun4i-a10-itead-iteaduino-plus.dts    | 126 -------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts         | 181 ---------
 arch/arm/dts/sun4i-a10-marsboard.dts          | 182 ---------
 arch/arm/dts/sun4i-a10-mini-xplus.dts         | 144 -------
 arch/arm/dts/sun4i-a10-mk802.dts              | 144 -------
 arch/arm/dts/sun4i-a10-mk802ii.dts            | 111 ------
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts     | 225 -----------
 arch/arm/dts/sun4i-a10-pcduino.dts            | 200 ----------
 arch/arm/dts/sun4i-a10-pcduino2.dts           |  67 ----
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts   | 206 ----------
 arch/arm/dts/sun4i-a10-topwise-a721.dts       | 242 ------------
 arch/arm/dts/sun5i-a10s-auxtek-t003.dts       | 137 -------
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts       | 149 --------
 arch/arm/dts/sun5i-a10s-mk802.dts             | 127 -------
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts   | 272 -------------
 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts      | 118 ------
 arch/arm/dts/sun5i-a10s-wobo-i5.dts           | 195 ----------
 arch/arm/dts/sun5i-a10s.dtsi                  | 173 ---------
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts    |  50 ---
 .../dts/sun5i-a13-empire-electronix-d709.dts  | 190 ----------
 .../dts/sun5i-a13-empire-electronix-m712.dts  |  51 ---
 arch/arm/dts/sun5i-a13-hsg-h702.dts           | 182 ---------
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts      |  50 ---
 arch/arm/dts/sun5i-a13-licheepi-one.dts       | 214 -----------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts    | 141 -------
 arch/arm/dts/sun5i-a13-olinuxino.dts          | 247 ------------
 .../dts/sun5i-a13-pocketbook-touch-lux-3.dts  | 258 -------------
 arch/arm/dts/sun5i-a13-q8-tablet.dts          |  80 ----
 arch/arm/dts/sun5i-a13-utoo-p66.dts           | 116 ------
 arch/arm/dts/sun5i-a13.dtsi                   | 118 ------
 arch/arm/dts/sun5i-gr8-chip-pro.dts           | 238 ------------
 arch/arm/dts/sun5i-gr8-evb.dts                | 333 ----------------
 arch/arm/dts/sun5i-gr8.dtsi                   | 126 -------
 arch/arm/dts/sun5i-r8-chip.dts                | 282 --------------
 arch/arm/dts/sun5i-r8.dtsi                    |  47 ---
 .../dts/sun5i-reference-design-tablet.dtsi    | 194 ----------
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts  |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi               | 330 ----------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts      |  76 ----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts  |  81 ----
 arch/arm/mach-sunxi/Kconfig                   |   3 +
 configs/A10-OLinuXino-Lime_defconfig          |   2 +-
 configs/A10s-OLinuXino-M_defconfig            |   2 +-
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   2 +-
 configs/Ampe_A76_defconfig                    |   1 +
 configs/Auxtek-T003_defconfig                 |   2 +-
 configs/Auxtek-T004_defconfig                 |   2 +-
 configs/CHIP_defconfig                        |   2 +-
 configs/CHIP_pro_defconfig                    |   2 +-
 configs/Chuwi_V7_CW0825_defconfig             |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Empire_electronix_d709_defconfig      |   2 +-
 configs/Empire_electronix_m712_defconfig      |   2 +-
 configs/Hyundai_A7HD_defconfig                |   2 +-
 configs/Linksprite_pcDuino_defconfig          |   2 +-
 configs/Marsboard_A10_defconfig               |   2 +-
 configs/Mele_A1000_defconfig                  |   2 +-
 configs/Mini-X_defconfig                      |   2 +-
 configs/UTOO_P66_defconfig                    |   2 +-
 configs/Wobo_i5_defconfig                     |   2 +-
 configs/ba10_tv_box_defconfig                 |   2 +-
 configs/difrnce_dit4350_defconfig             |   2 +-
 configs/dserve_dsrv9703c_defconfig            |   2 +-
 configs/iNet_3F_defconfig                     |   1 +
 configs/iNet_3W_defconfig                     |   1 +
 configs/iNet_86VS_defconfig                   |   1 +
 configs/inet1_defconfig                       |   2 +-
 configs/inet97fv2_defconfig                   |   2 +-
 configs/inet98v_rev2_defconfig                |   2 +-
 configs/inet9f_rev03_defconfig                |   2 +-
 configs/jesurun_q5_defconfig                  |   2 +-
 configs/lctech_pi_f1c200s_defconfig           |   2 +-
 configs/licheepi_nano_defconfig               |   2 +-
 configs/mk802_a10s_defconfig                  |   2 +-
 configs/mk802_defconfig                       |   2 +-
 configs/mk802ii_defconfig                     |   2 +-
 configs/pov_protab2_ips9_defconfig            |   2 +-
 configs/q8_a13_tablet_defconfig               |   2 +-
 configs/r7-tv-dongle_defconfig                |   2 +-
 configs/sunxi_Gemei_G9_defconfig              |   2 +-
 93 files changed, 45 insertions(+), 8832 deletions(-)
 delete mode 100644 arch/arm/dts/sun4i-a10-a1000.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-ba10-tvbox.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-cubieboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-gemei-g9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hackberry.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet1.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet97fv2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-marsboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mini-xplus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802ii.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t003.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-mk802.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s.dtsi
 delete mode 100644 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-m712.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-hsg-h702.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-licheepi-one.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-utoo-p66.dts
 delete mode 100644 arch/arm/dts/sun5i-a13.dtsi
 delete mode 100644 arch/arm/dts/sun5i-gr8-chip-pro.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8-evb.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-r8-chip.dts
 delete mode 100644 arch/arm/dts/sun5i-r8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-reference-design-tablet.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
Signature · 1 line
2.46.2
#1 lore raw

PATCH 1/3 suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM

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

Remove the old copies of the F1Cx00 related .dts and .dtsi files, and switch the whole suniv SoC over to use OF_UPSTREAM.

---
 arch/arm/dts/Makefile                        |   2 -
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi              | 330 -------------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts     |  76 -----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts |  81 -----
 arch/arm/mach-sunxi/Kconfig                  |   1 +
 configs/lctech_pi_f1c200s_defconfig          |   2 +-
 configs/licheepi_nano_defconfig              |   2 +-
 8 files changed, 3 insertions(+), 564 deletions(-)
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
arch/arm/dts/Makefile +0 -2
index aef0425c967..5627daa94db 100644
@@ -530,8 +530,6 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
 	stm32h743i-eval.dtb \
 	stm32h750i-art-pi.dtb
 
-dtb-$(CONFIG_MACH_SUNIV) += \
-	suniv-f1c100s-licheepi-nano.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-a1000.dtb \
 	sun4i-a10-ba10-tvbox.dtb \
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts deleted +0 -73

73 lines not on this page · raw message

arch/arm/dts/suniv-f1c100s.dtsi deleted +0 -330

330 lines not on this page · raw message

arch/arm/dts/suniv-f1c200s-lctech-pi.dts deleted +0 -76

76 lines not on this page · raw message

arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts deleted +0 -81

81 lines not on this page · raw message

arch/arm/mach-sunxi/Kconfig +1 -0
index 8065161e61e..866b55833c0 100644
@@ -279,6 +279,7 @@ config MACH_SUNIV
 	select SUPPORT_SPL
 	select SKIP_LOWLEVEL_INIT_ONLY
 	select SPL_SKIP_LOWLEVEL_INIT_ONLY
+	imply OF_UPSTREAM
 
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"
configs/lctech_pi_f1c200s_defconfig +1 -1
index e1e8d3aaaa3..1588b3b4955 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-lctech-pi"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-lctech-pi"
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
configs/licheepi_nano_defconfig +1 -1
index d59affb0d9c..051b1901f20 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c100s-licheepi-nano"
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
Signature · 1 line
2.46.2
maintainer
#2 lore raw

Re: [PATCH 1/3] suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM

Dne nedelja, 19. januar 2025 ob 17:41:54 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 637 lines

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

Remove the old copies of the F1Cx00 related .dts and .dtsi files, and switch the whole suniv SoC over to use OF_UPSTREAM.

---
 arch/arm/dts/Makefile                        |   2 -
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi              | 330 -------------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts     |  76 -----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts |  81 -----
 arch/arm/mach-sunxi/Kconfig                  |   1 +
 configs/lctech_pi_f1c200s_defconfig          |   2 +-
 configs/licheepi_nano_defconfig              |   2 +-
 8 files changed, 3 insertions(+), 564 deletions(-)
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
arch/arm/dts/Makefile +0 -2
index aef0425c967..5627daa94db 100644
@@ -530,8 +530,6 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
 	stm32h743i-eval.dtb \
 	stm32h750i-art-pi.dtb
 
-dtb-$(CONFIG_MACH_SUNIV) += \
-	suniv-f1c100s-licheepi-nano.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-a1000.dtb \
 	sun4i-a10-ba10-tvbox.dtb \
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts deleted +0 -73
deleted file mode 100644
index 43896723a99..00000000000
@@ -1,73 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR X11)
-/*
- * Copyright 2018 Icenowy Zheng <[email protected]>
- */
-
-/dts-v1/;
-#include "suniv-f1c100s.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Lichee Pi Nano";
-	compatible = "licheepi,licheepi-nano", "allwinner,suniv-f1c100s";
-
-	aliases {
-		mmc0 = &mmc0;
-		serial0 = &uart0;
-		spi0 = &spi0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	reg_vcc3v3: vcc3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-};
-
-&mmc0 {
-	broken-cd;
-	bus-width = <4>;
-	disable-wp;
-	status = "okay";
-	vmmc-supply = <&reg_vcc3v3>;
-};
-
-&spi0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&spi0_pc_pins>;
-	status = "okay";
-
-	flash@0 {
-		#address-cells = <1>;
-		#size-cells = <1>;
-		compatible = "winbond,w25q128", "jedec,spi-nor";
-		reg = <0>;
-		spi-max-frequency = <40000000>;
-	};
-};
-
-&otg_sram {
-	status = "okay";
-};
-
-&uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pe_pins>;
-	status = "okay";
-};
-
-&usb_otg {
-	dr_mode = "otg";
-	status = "okay";
-};
-
-&usbphy {
-	usb0_id_det-gpios = <&pio 4 2 GPIO_ACTIVE_HIGH>; /* PE2 */
-	status = "okay";
-};
arch/arm/dts/suniv-f1c100s.dtsi deleted +0 -330
deleted file mode 100644
index 3c61d59ab5f..00000000000
@@ -1,330 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR X11)
-/*
- * Copyright 2018 Icenowy Zheng <[email protected]>
- * Copyright 2018 Mesih Kilinc <[email protected]>
- */
-
-#include <dt-bindings/clock/suniv-ccu-f1c100s.h>
-#include <dt-bindings/reset/suniv-ccu-f1c100s.h>
-
-/ {
-	#address-cells = <1>;
-	#size-cells = <1>;
-	interrupt-parent = <&intc>;
-
-	clocks {
-		osc24M: clk-24M {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <24000000>;
-			clock-output-names = "osc24M";
-		};
-
-		osc32k: clk-32k {
-			#clock-cells = <0>;
-			compatible = "fixed-clock";
-			clock-frequency = <32768>;
-			clock-output-names = "osc32k";
-		};
-	};
-
-	cpus {
-		#address-cells = <1>;
-		#size-cells = <0>;
-
-		cpu@0 {
-			compatible = "arm,arm926ej-s";
-			device_type = "cpu";
-			reg = <0x0>;
-		};
-	};
-
-	soc {
-		compatible = "simple-bus";
-		#address-cells = <1>;
-		#size-cells = <1>;
-		ranges;
-
-		sram-controller@1c00000 {
-			compatible = "allwinner,suniv-f1c100s-system-control",
-				     "allwinner,sun4i-a10-system-control";
-			reg = <0x01c00000 0x30>;
-			#address-cells = <1>;
-			#size-cells = <1>;
-			ranges;
-
-			sram_d: sram@10000 {
-				compatible = "mmio-sram";
-				reg = <0x00010000 0x1000>;
-				#address-cells = <1>;
-				#size-cells = <1>;
-				ranges = <0 0x00010000 0x1000>;
-
-				otg_sram: sram-section@0 {
-					compatible = "allwinner,suniv-f1c100s-sram-d",
-						     "allwinner,sun4i-a10-sram-d";
-					reg = <0x0000 0x1000>;
-					status = "disabled";
-				};
-			};
-		};
-
-		spi0: spi@1c05000 {
-			compatible = "allwinner,suniv-f1c100s-spi",
-				     "allwinner,sun8i-h3-spi";
-			reg = <0x01c05000 0x1000>;
-			interrupts = <10>;
-			clocks = <&ccu CLK_BUS_SPI0>, <&ccu CLK_BUS_SPI0>;
-			clock-names = "ahb", "mod";
-			resets = <&ccu RST_BUS_SPI0>;
-			status = "disabled";
-			num-cs = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		spi1: spi@1c06000 {
-			compatible = "allwinner,suniv-f1c100s-spi",
-				     "allwinner,sun8i-h3-spi";
-			reg = <0x01c06000 0x1000>;
-			interrupts = <11>;
-			clocks = <&ccu CLK_BUS_SPI1>, <&ccu CLK_BUS_SPI1>;
-			clock-names = "ahb", "mod";
-			resets = <&ccu RST_BUS_SPI1>;
-			status = "disabled";
-			num-cs = <1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		mmc0: mmc@1c0f000 {
-			compatible = "allwinner,suniv-f1c100s-mmc",
-				     "allwinner,sun7i-a20-mmc";
-			reg = <0x01c0f000 0x1000>;
-			clocks = <&ccu CLK_BUS_MMC0>,
-				 <&ccu CLK_MMC0>,
-				 <&ccu CLK_MMC0_OUTPUT>,
-				 <&ccu CLK_MMC0_SAMPLE>;
-			clock-names = "ahb", "mmc", "output", "sample";
-			resets = <&ccu RST_BUS_MMC0>;
-			reset-names = "ahb";
-			interrupts = <23>;
-			pinctrl-names = "default";
-			pinctrl-0 = <&mmc0_pins>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		mmc1: mmc@1c10000 {
-			compatible = "allwinner,suniv-f1c100s-mmc",
-				     "allwinner,sun7i-a20-mmc";
-			reg = <0x01c10000 0x1000>;
-			clocks = <&ccu CLK_BUS_MMC1>,
-				 <&ccu CLK_MMC1>,
-				 <&ccu CLK_MMC1_OUTPUT>,
-				 <&ccu CLK_MMC1_SAMPLE>;
-			clock-names = "ahb", "mmc", "output", "sample";
-			resets = <&ccu RST_BUS_MMC1>;
-			reset-names = "ahb";
-			interrupts = <24>;
-			status = "disabled";
-			#address-cells = <1>;
-			#size-cells = <0>;
-		};
-
-		usb_otg: usb@1c13000 {
-			compatible = "allwinner,suniv-f1c100s-musb";
-			reg = <0x01c13000 0x0400>;
-			clocks = <&ccu CLK_BUS_OTG>;
-			resets = <&ccu RST_BUS_OTG>;
-			interrupts = <26>;
-			interrupt-names = "mc";
-			phys = <&usbphy 0>;
-			phy-names = "usb";
-			extcon = <&usbphy 0>;
-			allwinner,sram = <&otg_sram 1>;
-			status = "disabled";
-		};
-
-		usbphy: phy@1c13400 {
-			compatible = "allwinner,suniv-f1c100s-usb-phy";
-			reg = <0x01c13400 0x10>;
-			reg-names = "phy_ctrl";
-			clocks = <&ccu CLK_USB_PHY0>;
-			clock-names = "usb0_phy";
-			resets = <&ccu RST_USB_PHY0>;
-			reset-names = "usb0_reset";
-			#phy-cells = <1>;
-			status = "disabled";
-		};
-
-		ccu: clock@1c20000 {
-			compatible = "allwinner,suniv-f1c100s-ccu";
-			reg = <0x01c20000 0x400>;
-			clocks = <&osc24M>, <&osc32k>;
-			clock-names = "hosc", "losc";
-			#clock-cells = <1>;
-			#reset-cells = <1>;
-		};
-
-		intc: interrupt-controller@1c20400 {
-			compatible = "allwinner,suniv-f1c100s-ic";
-			reg = <0x01c20400 0x400>;
-			interrupt-controller;
-			#interrupt-cells = <1>;
-		};
-
-		pio: pinctrl@1c20800 {
-			compatible = "allwinner,suniv-f1c100s-pinctrl";
-			reg = <0x01c20800 0x400>;
-			interrupts = <38>, <39>, <40>;
-			clocks = <&ccu CLK_BUS_PIO>, <&osc24M>, <&osc32k>;
-			clock-names = "apb", "hosc", "losc";
-			gpio-controller;
-			interrupt-controller;
-			#interrupt-cells = <3>;
-			#gpio-cells = <3>;
-
-			mmc0_pins: mmc0-pins {
-				pins = "PF0", "PF1", "PF2", "PF3", "PF4", "PF5";
-				function = "mmc0";
-				drive-strength = <30>;
-			};
-
-			/omit-if-no-ref/
-			i2c0_pd_pins: i2c0-pd-pins {
-				pins = "PD0", "PD12";
-				function = "i2c0";
-			};
-
-			spi0_pc_pins: spi0-pc-pins {
-				pins = "PC0", "PC1", "PC2", "PC3";
-				function = "spi0";
-			};
-
-			uart0_pe_pins: uart0-pe-pins {
-				pins = "PE0", "PE1";
-				function = "uart0";
-			};
-
-			/omit-if-no-ref/
-			uart1_pa_pins: uart1-pa-pins {
-				pins = "PA2", "PA3";
-				function = "uart1";
-			};
-		};
-
-		i2c0: i2c@1c27000 {
-			compatible = "allwinner,suniv-f1c100s-i2c",
-				     "allwinner,sun6i-a31-i2c";
-			reg = <0x01c27000 0x400>;
-			interrupts = <7>;
-			clocks = <&ccu CLK_BUS_I2C0>;
-			resets = <&ccu RST_BUS_I2C0>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		i2c1: i2c@1c27400 {
-			compatible = "allwinner,suniv-f1c100s-i2c",
-				     "allwinner,sun6i-a31-i2c";
-			reg = <0x01c27400 0x400>;
-			interrupts = <8>;
-			clocks = <&ccu CLK_BUS_I2C1>;
-			resets = <&ccu RST_BUS_I2C1>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		i2c2: i2c@1c27800 {
-			compatible = "allwinner,suniv-f1c100s-i2c",
-				     "allwinner,sun6i-a31-i2c";
-			reg = <0x01c27800 0x400>;
-			interrupts = <9>;
-			clocks = <&ccu CLK_BUS_I2C2>;
-			resets = <&ccu RST_BUS_I2C2>;
-			#address-cells = <1>;
-			#size-cells = <0>;
-			status = "disabled";
-		};
-
-		timer@1c20c00 {
-			compatible = "allwinner,suniv-f1c100s-timer";
-			reg = <0x01c20c00 0x90>;
-			interrupts = <13>, <14>, <15>;
-			clocks = <&osc24M>;
-		};
-
-		wdt: watchdog@1c20ca0 {
-			compatible = "allwinner,suniv-f1c100s-wdt",
-				     "allwinner,sun6i-a31-wdt";
-			reg = <0x01c20ca0 0x20>;
-			interrupts = <16>;
-			clocks = <&osc32k>;
-		};
-
-		pwm: pwm@1c21000 {
-			compatible = "allwinner,suniv-f1c100s-pwm",
-				     "allwinner,sun7i-a20-pwm";
-			reg = <0x01c21000 0x400>;
-			clocks = <&osc24M>;
-			#pwm-cells = <3>;
-			status = "disabled";
-		};
-
-		ir: ir@1c22c00 {
-			compatible = "allwinner,suniv-f1c100s-ir",
-				     "allwinner,sun6i-a31-ir";
-			reg = <0x01c22c00 0x400>;
-			clocks = <&ccu CLK_BUS_IR>, <&ccu CLK_IR>;
-			clock-names = "apb", "ir";
-			resets = <&ccu RST_BUS_IR>;
-			interrupts = <6>;
-			status = "disabled";
-		};
-
-		lradc: lradc@1c23400 {
-			compatible = "allwinner,suniv-f1c100s-lradc",
-				     "allwinner,sun8i-a83t-r-lradc";
-			reg = <0x01c23400 0x400>;
-			interrupts = <22>;
-			status = "disabled";
-		};
-
-		uart0: serial@1c25000 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x01c25000 0x400>;
-			interrupts = <1>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clocks = <&ccu CLK_BUS_UART0>;
-			resets = <&ccu RST_BUS_UART0>;
-			status = "disabled";
-		};
-
-		uart1: serial@1c25400 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x01c25400 0x400>;
-			interrupts = <2>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clocks = <&ccu CLK_BUS_UART1>;
-			resets = <&ccu RST_BUS_UART1>;
-			status = "disabled";
-		};
-
-		uart2: serial@1c25800 {
-			compatible = "snps,dw-apb-uart";
-			reg = <0x01c25800 0x400>;
-			interrupts = <3>;
-			reg-shift = <2>;
-			reg-io-width = <4>;
-			clocks = <&ccu CLK_BUS_UART2>;
-			resets = <&ccu RST_BUS_UART2>;
-			status = "disabled";
-		};
-	};
-};
arch/arm/dts/suniv-f1c200s-lctech-pi.dts deleted +0 -76
deleted file mode 100644
index 2d2a3f026df..00000000000
@@ -1,76 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2022 Arm Ltd,
- * based on work:
- *   Copyright 2022 Icenowy Zheng <[email protected]>
- */
-
-/dts-v1/;
-#include "suniv-f1c100s.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-
-/ {
-	model = "Lctech Pi F1C200s";
-	compatible = "lctech,pi-f1c200s", "allwinner,suniv-f1c200s",
-		     "allwinner,suniv-f1c100s";
-
-	aliases {
-		serial0 = &uart1;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	reg_vcc3v3: regulator-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-};
-
-&mmc0 {
-	broken-cd;
-	bus-width = <4>;
-	disable-wp;
-	vmmc-supply = <&reg_vcc3v3>;
-	status = "okay";
-};
-
-&otg_sram {
-	status = "okay";
-};
-
-&spi0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&spi0_pc_pins>;
-	status = "okay";
-
-	flash@0 {
-		compatible = "spi-nand";
-		reg = <0>;
-		spi-max-frequency = <40000000>;
-	};
-};
-
-&uart1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart1_pa_pins>;
-	status = "okay";
-};
-
-/*
- * This is a Type-C socket, but CC1/2 are not connected, and VBUS is connected
- * to Vin, which supplies the board. Host mode works (if the board is powered
- * otherwise), but peripheral is probably the intention.
- */
-&usb_otg {
-	dr_mode = "peripheral";
-	status = "okay";
-};
-
-&usbphy {
-	status = "okay";
-};
arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts deleted +0 -81
deleted file mode 100644
index 184c245041a..00000000000
@@ -1,81 +0,0 @@
-// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
-/*
- * Copyright 2022 Icenowy Zheng <[email protected]>
- */
-
-/dts-v1/;
-#include "suniv-f1c100s.dtsi"
-
-#include <dt-bindings/gpio/gpio.h>
-#include <dt-bindings/leds/common.h>
-
-/ {
-	model = "Popcorn Computer PopStick v1.1";
-	compatible = "sourceparts,popstick-v1.1", "sourceparts,popstick",
-		     "allwinner,suniv-f1c200s", "allwinner,suniv-f1c100s";
-
-	aliases {
-		serial0 = &uart0;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	leds {
-		compatible = "gpio-leds";
-
-		led {
-			function = LED_FUNCTION_STATUS;
-			color = <LED_COLOR_ID_GREEN>;
-			gpios = <&pio 4 6 GPIO_ACTIVE_HIGH>; /* PE6 */
-			linux,default-trigger = "heartbeat";
-		};
-	};
-
-	reg_vcc3v3: regulator-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "vcc3v3";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-};
-
-&mmc0 {
-	cd-gpios = <&pio 4 3 GPIO_ACTIVE_LOW>; /* PE3 */
-	bus-width = <4>;
-	disable-wp;
-	vmmc-supply = <&reg_vcc3v3>;
-	status = "okay";
-};
-
-&otg_sram {
-	status = "okay";
-};
-
-&spi0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&spi0_pc_pins>;
-	status = "okay";
-
-	flash@0 {
-		compatible = "spi-nand";
-		reg = <0>;
-		spi-max-frequency = <40000000>;
-	};
-};
-
-&uart0 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&uart0_pe_pins>;
-	status = "okay";
-};
-
-&usb_otg {
-	dr_mode = "peripheral";
-	status = "okay";
-};
-
-&usbphy {
-	status = "okay";
-};
arch/arm/mach-sunxi/Kconfig +1 -0
index 8065161e61e..866b55833c0 100644
@@ -279,6 +279,7 @@ config MACH_SUNIV
 	select SUPPORT_SPL
 	select SKIP_LOWLEVEL_INIT_ONLY
 	select SPL_SKIP_LOWLEVEL_INIT_ONLY
+	imply OF_UPSTREAM
 
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"
configs/lctech_pi_f1c200s_defconfig +0 -0
index e1e8d3aaaa3..1588b3b4955 100644

configs/lctech_pi_f1c200s_defconfig line 3

Quoted 4 lines
configs/lctech_pi_f1c200s_defconfig +1 -1
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-lctech-pi"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-lctech-pi"

What's with this board? I don't see it being removed from Makefile. If it is not there, then this board has been broken all along?

Best regards,
Jernej

Quoted 16 lines
configs/lctech_pi_f1c200s_defconfig +0 -0
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
configs/licheepi_nano_defconfig +1 -1
index d59affb0d9c..051b1901f20 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c100s-licheepi-nano"
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
#3 lore raw

Re: [PATCH 1/3] suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM

On Sun, 19 Jan 2025 20:45:43 +0100
Jernej Škrabec <[email protected]> wrote:

Hi Jernej,

Quoted 44 lines

Dne nedelja, 19. januar 2025 ob 17:41:54 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 43 lines

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

Remove the old copies of the F1Cx00 related .dts and .dtsi files, and switch the whole suniv SoC over to use OF_UPSTREAM.

---
 arch/arm/dts/Makefile                        |   2 -
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi              | 330 -------------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts     |  76 -----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts |  81 -----
 arch/arm/mach-sunxi/Kconfig                  |   1 +
 configs/lctech_pi_f1c200s_defconfig          |   2 +-
 configs/licheepi_nano_defconfig              |   2 +-
 8 files changed, 3 insertions(+), 564 deletions(-)
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
arch/arm/dts/Makefile +0 -2
index aef0425c967..5627daa94db 100644
@@ -530,8 +530,6 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
 	stm32h743i-eval.dtb \
 	stm32h750i-art-pi.dtb
 
-dtb-$(CONFIG_MACH_SUNIV) += \
-	suniv-f1c100s-licheepi-nano.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-a1000.dtb \
 	sun4i-a10-ba10-tvbox.dtb \
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts deleted +0 -0
deleted file mode 100644
index 43896723a99..00000000000

....

Quoted 5 lines
Quoted 5 lines
arch/arm/dts/suniv-f1c100s.dtsi deleted +0 -0
deleted file mode 100644
index 3c61d59ab5f..00000000000

...

Quoted 5 lines
Quoted 5 lines
arch/arm/dts/suniv-f1c200s-lctech-pi.dts deleted +0 -0
deleted file mode 100644
index 2d2a3f026df..00000000000

...

Quoted 10 lines
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +1 -0
index 8065161e61e..866b55833c0 100644
@@ -279,6 +279,7 @@ config MACH_SUNIV
 	select SUPPORT_SPL
 	select SKIP_LOWLEVEL_INIT_ONLY
 	select SPL_SKIP_LOWLEVEL_INIT_ONLY
+	imply OF_UPSTREAM
 
Quoted 14 lines

configs/lctech_pi_f1c200s_defconfig line 3

Quoted 11 lines
arch/arm/mach-sunxi/Kconfig +0 -0
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"
configs/lctech_pi_f1c200s_defconfig +1 -1
index e1e8d3aaaa3..1588b3b4955 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-lctech-pi"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-lctech-pi"  

What's with this board? I don't see it being removed from Makefile. If it is not there, then this board has been broken all along?

No, all defconfigs build fine, that's tested with CI on every PR merged.

As it turns out, the build system builds the DTs as listed in the CONFIG_DEFAULT_DEVICE_TREE variable, but also in CONFIG_OF_LIST automatically, so those lists in the Makefile are actually somewhat redundant. I am not entirely sure if there are corner case when they are needed, though, but even removing the whole Makefile stanza for A64, for instance, builds those boards fine.

So the LCTech Pi build is fine, both with and without this patch.

Thanks,
Andre

Quoted 25 lines

Best regards,
Jernej

Quoted 16 lines
configs/lctech_pi_f1c200s_defconfig +0 -0
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
configs/licheepi_nano_defconfig +1 -1
index d59affb0d9c..051b1901f20 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c100s-licheepi-nano"
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
maintainer Reviewed-by
#4 lore raw

Re: [PATCH 1/3] suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM

Dne ponedeljek, 20. januar 2025 ob 00:42:19 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 95 lines

On Sun, 19 Jan 2025 20:45:43 +0100
Jernej Škrabec <[email protected]> wrote:

Hi Jernej,

Quoted 44 lines

Dne nedelja, 19. januar 2025 ob 17:41:54 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 43 lines

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

Remove the old copies of the F1Cx00 related .dts and .dtsi files, and switch the whole suniv SoC over to use OF_UPSTREAM.

---
 arch/arm/dts/Makefile                        |   2 -
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi              | 330 -------------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts     |  76 -----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts |  81 -----
 arch/arm/mach-sunxi/Kconfig                  |   1 +
 configs/lctech_pi_f1c200s_defconfig          |   2 +-
 configs/licheepi_nano_defconfig              |   2 +-
 8 files changed, 3 insertions(+), 564 deletions(-)
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
arch/arm/dts/Makefile +0 -2
index aef0425c967..5627daa94db 100644
@@ -530,8 +530,6 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
 	stm32h743i-eval.dtb \
 	stm32h750i-art-pi.dtb
 
-dtb-$(CONFIG_MACH_SUNIV) += \
-	suniv-f1c100s-licheepi-nano.dtb
 dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-a1000.dtb \
 	sun4i-a10-ba10-tvbox.dtb \
arch/arm/dts/suniv-f1c100s-licheepi-nano.dts deleted +0 -0
deleted file mode 100644
index 43896723a99..00000000000

....

Quoted 5 lines
Quoted 5 lines
arch/arm/dts/suniv-f1c100s.dtsi deleted +0 -0
deleted file mode 100644
index 3c61d59ab5f..00000000000

...

Quoted 5 lines
Quoted 5 lines
arch/arm/dts/suniv-f1c200s-lctech-pi.dts deleted +0 -0
deleted file mode 100644
index 2d2a3f026df..00000000000

...

Quoted 10 lines
Quoted 10 lines
arch/arm/mach-sunxi/Kconfig +1 -0
index 8065161e61e..866b55833c0 100644
@@ -279,6 +279,7 @@ config MACH_SUNIV
 	select SUPPORT_SPL
 	select SKIP_LOWLEVEL_INIT_ONLY
 	select SPL_SKIP_LOWLEVEL_INIT_ONLY
+	imply OF_UPSTREAM
 
Quoted 14 lines

configs/lctech_pi_f1c200s_defconfig line 3

Quoted 11 lines
arch/arm/mach-sunxi/Kconfig +0 -0
 config MACH_SUN4I
 	bool "sun4i (Allwinner A10)"
configs/lctech_pi_f1c200s_defconfig +1 -1
index e1e8d3aaaa3..1588b3b4955 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c200s-lctech-pi"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c200s-lctech-pi"  

What's with this board? I don't see it being removed from Makefile. If it is not there, then this board has been broken all along?

No, all defconfigs build fine, that's tested with CI on every PR merged.

Quoted 8 lines

As it turns out, the build system builds the DTs as listed in the CONFIG_DEFAULT_DEVICE_TREE variable, but also in CONFIG_OF_LIST automatically, so those lists in the Makefile are actually somewhat redundant. I am not entirely sure if there are corner case when they are needed, though, but even removing the whole Makefile stanza for A64, for instance, builds those boards fine.

So the LCTech Pi build is fine, both with and without this patch.

Thanks for explanation. This is then:

Best regards,
Jernej

Quoted 31 lines

Thanks,
Andre

Quoted 25 lines

Best regards,
Jernej

Quoted 16 lines
configs/lctech_pi_f1c200s_defconfig +0 -0
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
configs/licheepi_nano_defconfig +1 -1
index d59affb0d9c..051b1901f20 100644
@@ -1,6 +1,6 @@
 CONFIG_ARM=y
 CONFIG_ARCH_SUNXI=y
-CONFIG_DEFAULT_DEVICE_TREE="suniv-f1c100s-licheepi-nano"
+CONFIG_DEFAULT_DEVICE_TREE="allwinner/suniv-f1c100s-licheepi-nano"
 CONFIG_SPL=y
 CONFIG_MACH_SUNIV=y
 CONFIG_DRAM_CLK=156
#5 lore raw

PATCH 2/3 sunxi: switch Allwinner A10 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 A10 SoCs (sun4i) between the U-Boot and the Linux kernel repository.

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

There are two boards for which we don't have DTs in the kernel tree. Keep those two .dts files, plus the base .dtsi in the legacy U-Boot DT directory, and let their defconfig opt out of OF_UPSTREAM.

---
 arch/arm/dts/Makefile                         |  24 +-
 arch/arm/dts/sun4i-a10-a1000.dts              | 255 -------------
 arch/arm/dts/sun4i-a10-ba10-tvbox.dts         | 151 --------
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts    | 159 --------
 arch/arm/dts/sun4i-a10-cubieboard.dts         | 255 -------------
 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts   | 218 -----------
 arch/arm/dts/sun4i-a10-gemei-g9.dts           | 192 ----------
 arch/arm/dts/sun4i-a10-hackberry.dts          | 140 -------
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts       | 115 ------
 arch/arm/dts/sun4i-a10-inet1.dts              | 229 -----------
 arch/arm/dts/sun4i-a10-inet97fv2.dts          | 203 ----------
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 357 ------------------
 .../dts/sun4i-a10-itead-iteaduino-plus.dts    | 126 -------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts         | 181 ---------
 arch/arm/dts/sun4i-a10-marsboard.dts          | 182 ---------
 arch/arm/dts/sun4i-a10-mini-xplus.dts         | 144 -------
 arch/arm/dts/sun4i-a10-mk802.dts              | 144 -------
 arch/arm/dts/sun4i-a10-mk802ii.dts            | 111 ------
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts     | 225 -----------
 arch/arm/dts/sun4i-a10-pcduino.dts            | 200 ----------
 arch/arm/dts/sun4i-a10-pcduino2.dts           |  67 ----
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts   | 206 ----------
 arch/arm/dts/sun4i-a10-topwise-a721.dts       | 242 ------------
 arch/arm/mach-sunxi/Kconfig                   |   1 +
 configs/A10-OLinuXino-Lime_defconfig          |   2 +-
 configs/Chuwi_V7_CW0825_defconfig             |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Hyundai_A7HD_defconfig                |   2 +-
 configs/Linksprite_pcDuino_defconfig          |   2 +-
 configs/Marsboard_A10_defconfig               |   2 +-
 configs/Mele_A1000_defconfig                  |   2 +-
 configs/Mini-X_defconfig                      |   2 +-
 configs/ba10_tv_box_defconfig                 |   2 +-
 configs/dserve_dsrv9703c_defconfig            |   2 +-
 configs/iNet_3F_defconfig                     |   1 +
 configs/iNet_3W_defconfig                     |   1 +
 configs/inet1_defconfig                       |   2 +-
 configs/inet97fv2_defconfig                   |   2 +-
 configs/inet9f_rev03_defconfig                |   2 +-
 configs/jesurun_q5_defconfig                  |   2 +-
 configs/mk802_defconfig                       |   2 +-
 configs/mk802ii_defconfig                     |   2 +-
 configs/pov_protab2_ips9_defconfig            |   2 +-
 configs/sunxi_Gemei_G9_defconfig              |   2 +-
 44 files changed, 22 insertions(+), 4143 deletions(-)
 delete mode 100644 arch/arm/dts/sun4i-a10-a1000.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-ba10-tvbox.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-cubieboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-gemei-g9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hackberry.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet1.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet97fv2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-marsboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mini-xplus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802ii.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts
arch/arm/dts/Makefile +1 -23
index 5627daa94db..6a483f6743c 100644
@@ -531,30 +531,8 @@ dtb-$(CONFIG_STM32H7) += stm32h743i-disco.dtb \
 	stm32h750i-art-pi.dtb
 
 dtb-$(CONFIG_MACH_SUN4I) += \
-	sun4i-a10-a1000.dtb \
-	sun4i-a10-ba10-tvbox.dtb \
-	sun4i-a10-chuwi-v7-cw0825.dtb \
-	sun4i-a10-cubieboard.dtb \
-	sun4i-a10-dserve-dsrv9703c.dtb \
-	sun4i-a10-gemei-g9.dtb \
-	sun4i-a10-hackberry.dtb \
-	sun4i-a10-hyundai-a7hd.dtb \
-	sun4i-a10-inet1.dtb \
 	sun4i-a10-inet-3f.dtb \
-	sun4i-a10-inet-3w.dtb \
-	sun4i-a10-inet97fv2.dtb \
-	sun4i-a10-inet9f-rev03.dtb \
-	sun4i-a10-itead-iteaduino-plus.dtb \
-	sun4i-a10-jesurun-q5.dtb \
-	sun4i-a10-marsboard.dtb \
-	sun4i-a10-mini-xplus.dtb \
-	sun4i-a10-mk802.dtb \
-	sun4i-a10-mk802ii.dtb \
-	sun4i-a10-olinuxino-lime.dtb \
-	sun4i-a10-pcduino.dtb \
-	sun4i-a10-pcduino2.dtb \
-	sun4i-a10-pov-protab2-ips9.dtb \
-	sun4i-a10-topwise-a721.dtb
+	sun4i-a10-inet-3w.dtb
 dtb-$(CONFIG_MACH_SUN5I) += \
 	sun5i-a10s-auxtek-t003.dtb \
 	sun5i-a10s-auxtek-t004.dtb \
arch/arm/dts/sun4i-a10-a1000.dts deleted +0 -255

255 lines not on this page · raw message

arch/arm/dts/sun4i-a10-ba10-tvbox.dts deleted +0 -151

151 lines not on this page · raw message

arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts deleted +0 -159

159 lines not on this page · raw message

arch/arm/dts/sun4i-a10-cubieboard.dts deleted +0 -255

255 lines not on this page · raw message

arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts deleted +0 -218

218 lines not on this page · raw message

arch/arm/dts/sun4i-a10-gemei-g9.dts deleted +0 -192

192 lines not on this page · raw message

arch/arm/dts/sun4i-a10-hackberry.dts deleted +0 -140

140 lines not on this page · raw message

arch/arm/dts/sun4i-a10-hyundai-a7hd.dts deleted +0 -115

115 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet1.dts deleted +0 -229

229 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet97fv2.dts deleted +0 -203

203 lines not on this page · raw message

arch/arm/dts/sun4i-a10-inet9f-rev03.dts deleted +0 -357

357 lines not on this page · raw message

arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts deleted +0 -126

126 lines not on this page · raw message

arch/arm/dts/sun4i-a10-jesurun-q5.dts deleted +0 -181

181 lines not on this page · raw message

arch/arm/dts/sun4i-a10-marsboard.dts deleted +0 -182

182 lines not on this page · raw message

arch/arm/dts/sun4i-a10-mini-xplus.dts deleted +0 -144

144 lines not on this page · raw message

arch/arm/dts/sun4i-a10-mk802.dts deleted +0 -144

62 lines not on this page · raw message

arch/arm/dts/sun4i-a10-mk802ii.dts deleted +0 -111

111 lines not on this page · raw message

arch/arm/dts/sun4i-a10-olinuxino-lime.dts deleted +0 -225

225 lines not on this page · raw message

arch/arm/dts/sun4i-a10-pcduino.dts deleted +0 -200

200 lines not on this page · raw message

arch/arm/dts/sun4i-a10-pcduino2.dts deleted +0 -67

67 lines not on this page · raw message

arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts deleted +0 -206

206 lines not on this page · raw message

arch/arm/dts/sun4i-a10-topwise-a721.dts deleted +0 -242

242 lines not on this page · raw message

arch/arm/mach-sunxi/Kconfig +1 -0
index 866b55833c0..09d9f995d24 100644

Lines of this file are not shown. View the raw message.

configs/A10-OLinuXino-Lime_defconfig +1 -1
index 57e91d0f017..96e3d19038b 100644

Lines of this file are not shown. View the raw message.

configs/Chuwi_V7_CW0825_defconfig +1 -1
index 02b3e69584f..40f52d1a8d3 100644

Lines of this file are not shown. View the raw message.

configs/Cubieboard_defconfig +1 -1
index ab3f65ad667..9fc57c23f43 100644

Lines of this file are not shown. View the raw message.

configs/Hyundai_A7HD_defconfig +1 -1
index 482e0fb7a83..541f98db9e1 100644

Lines of this file are not shown. View the raw message.

configs/Linksprite_pcDuino_defconfig +1 -1
index 49dcfa098ee..0e1a7780c3d 100644

Lines of this file are not shown. View the raw message.

configs/Marsboard_A10_defconfig +1 -1
index 3c5312d8824..c7608ed0fdc 100644

Lines of this file are not shown. View the raw message.

configs/Mele_A1000_defconfig +1 -1
index 9ac2e4839d9..93e73ebe3f1 100644

Lines of this file are not shown. View the raw message.

configs/Mini-X_defconfig +1 -1
index e8bc1485766..e64352b4b6a 100644

Lines of this file are not shown. View the raw message.

configs/ba10_tv_box_defconfig +1 -1
index b89dd8ea62b..c76f36ec37e 100644

Lines of this file are not shown. View the raw message.

configs/dserve_dsrv9703c_defconfig +1 -1
index f5ff69d7d63..06a79c935d7 100644

Lines of this file are not shown. View the raw message.

configs/iNet_3F_defconfig +1 -0
index 5cc1a1d57f4..5ab210b345b 100644

Lines of this file are not shown. View the raw message.

configs/iNet_3W_defconfig +1 -0
index 38b20109a57..415575cc228 100644

Lines of this file are not shown. View the raw message.

configs/inet1_defconfig +1 -1
index f81120b1197..68a6df50e42 100644

Lines of this file are not shown. View the raw message.

configs/inet97fv2_defconfig +1 -1
index d5d2dc32c93..a5414e2c502 100644

Lines of this file are not shown. View the raw message.

configs/inet9f_rev03_defconfig +1 -1
index 4485f930236..5b0cda10f3b 100644

Lines of this file are not shown. View the raw message.

configs/jesurun_q5_defconfig +1 -1
index c99be7cea4e..b41c2cf3c05 100644

Lines of this file are not shown. View the raw message.

configs/mk802_defconfig +1 -1
index 416565e5af2..8ebd5e9cbc3 100644

Lines of this file are not shown. View the raw message.

configs/mk802ii_defconfig +1 -1
index 965a9cd5c4b..c56a4c7c6a0 100644

Lines of this file are not shown. View the raw message.

configs/pov_protab2_ips9_defconfig +1 -1
index a62c9f8fa37..330c97fd6dc 100644

Lines of this file are not shown. View the raw message.

configs/sunxi_Gemei_G9_defconfig +1 -1
index 3fee7c2e50c..4f3d0ec7443 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.46.2

Part of the diff is not shown here. View the raw message.

#6 lore raw

PATCH 3/3 sunxi: switch Allwinner A10s/A13 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 A10s/A13 SoCs (sun5i) between the U-Boot and the Linux kernel repository.

Remove the old copies of the A10s/A13 related .dts and .dtsi files, and switch most of sun5i boards over to use OF_UPSTREAM.

There are two boards for which we don't have DTs in the kernel tree. Keep those two .dts files, plus the base .dtsi in the legacy U-Boot DT directory, and let their defconfig opt out of OF_UPSTREAM.

---
 arch/arm/dts/Makefile                         |  22 +-
 arch/arm/dts/sun5i-a10s-auxtek-t003.dts       | 137 -------
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts       | 149 --------
 arch/arm/dts/sun5i-a10s-mk802.dts             | 127 -------
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts   | 272 --------------
 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts      | 118 -------
 arch/arm/dts/sun5i-a10s-wobo-i5.dts           | 195 ----------
 arch/arm/dts/sun5i-a10s.dtsi                  | 173 ---------
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts    |  50 ---
 .../dts/sun5i-a13-empire-electronix-d709.dts  | 190 ----------
 .../dts/sun5i-a13-empire-electronix-m712.dts  |  51 ---
 arch/arm/dts/sun5i-a13-hsg-h702.dts           | 182 ----------
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts      |  50 ---
 arch/arm/dts/sun5i-a13-licheepi-one.dts       | 214 -----------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts    | 141 --------
 arch/arm/dts/sun5i-a13-olinuxino.dts          | 247 -------------
 .../dts/sun5i-a13-pocketbook-touch-lux-3.dts  | 258 --------------
 arch/arm/dts/sun5i-a13-q8-tablet.dts          |  80 -----
 arch/arm/dts/sun5i-a13-utoo-p66.dts           | 116 ------
 arch/arm/dts/sun5i-a13.dtsi                   | 118 -------
 arch/arm/dts/sun5i-gr8-chip-pro.dts           | 238 -------------
 arch/arm/dts/sun5i-gr8-evb.dts                | 333 ------------------
 arch/arm/dts/sun5i-gr8.dtsi                   | 126 -------
 arch/arm/dts/sun5i-r8-chip.dts                | 282 ---------------
 arch/arm/dts/sun5i-r8.dtsi                    |  47 ---
 .../dts/sun5i-reference-design-tablet.dtsi    | 194 ----------
 arch/arm/mach-sunxi/Kconfig                   |   1 +
 configs/A10s-OLinuXino-M_defconfig            |   2 +-
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   2 +-
 configs/Ampe_A76_defconfig                    |   1 +
 configs/Auxtek-T003_defconfig                 |   2 +-
 configs/Auxtek-T004_defconfig                 |   2 +-
 configs/CHIP_defconfig                        |   2 +-
 configs/CHIP_pro_defconfig                    |   2 +-
 configs/Empire_electronix_d709_defconfig      |   2 +-
 configs/Empire_electronix_m712_defconfig      |   2 +-
 configs/UTOO_P66_defconfig                    |   2 +-
 configs/Wobo_i5_defconfig                     |   2 +-
 configs/difrnce_dit4350_defconfig             |   2 +-
 configs/iNet_86VS_defconfig                   |   1 +
 configs/inet98v_rev2_defconfig                |   2 +-
 configs/mk802_a10s_defconfig                  |   2 +-
 configs/q8_a13_tablet_defconfig               |   2 +-
 configs/r7-tv-dongle_defconfig                |   2 +-
 45 files changed, 20 insertions(+), 4125 deletions(-)
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t003.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-mk802.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s.dtsi
 delete mode 100644 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-m712.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-hsg-h702.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-licheepi-one.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-utoo-p66.dts
 delete mode 100644 arch/arm/dts/sun5i-a13.dtsi
 delete mode 100644 arch/arm/dts/sun5i-gr8-chip-pro.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8-evb.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-r8-chip.dts
 delete mode 100644 arch/arm/dts/sun5i-r8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-reference-design-tablet.dtsi
arch/arm/dts/Makefile +1 -21
index 6a483f6743c..6f20c3aeffd 100644
@@ -534,28 +534,8 @@ dtb-$(CONFIG_MACH_SUN4I) += \
 	sun4i-a10-inet-3f.dtb \
 	sun4i-a10-inet-3w.dtb
 dtb-$(CONFIG_MACH_SUN5I) += \
-	sun5i-a10s-auxtek-t003.dtb \
-	sun5i-a10s-auxtek-t004.dtb \
-	sun5i-a10s-mk802.dtb \
-	sun5i-a10s-olinuxino-micro.dtb \
-	sun5i-a10s-r7-tv-dongle.dtb \
-	sun5i-a10s-wobo-i5.dtb \
 	sun5i-a13-ampe-a76.dtb \
-	sun5i-a13-difrnce-dit4350.dtb \
-	sun5i-a13-empire-electronix-d709.dtb \
-	sun5i-a13-empire-electronix-m712.dtb \
-	sun5i-a13-hsg-h702.dtb \
-	sun5i-a13-inet-86vs.dtb \
-	sun5i-a13-inet-98v-rev2.dtb \
-	sun5i-a13-licheepi-one.dtb \
-	sun5i-a13-olinuxino.dtb \
-	sun5i-a13-olinuxino-micro.dtb \
-	sun5i-a13-pocketbook-touch-lux-3.dtb \
-	sun5i-a13-q8-tablet.dtb \
-	sun5i-a13-utoo-p66.dtb \
-	sun5i-gr8-chip-pro.dtb \
-	sun5i-gr8-evb.dtb \
-	sun5i-r8-chip.dtb
+	sun5i-a13-inet-86vs.dtb
 dtb-$(CONFIG_MACH_SUN6I) += \
 	sun6i-a31-app4-evb1.dtb \
 	sun6i-a31-colombus.dtb \
arch/arm/dts/sun5i-a10s-auxtek-t003.dts deleted +0 -137

137 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-auxtek-t004.dts deleted +0 -149

149 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-mk802.dts deleted +0 -127

127 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-olinuxino-micro.dts deleted +0 -272

272 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts deleted +0 -118

118 lines not on this page · raw message

arch/arm/dts/sun5i-a10s-wobo-i5.dts deleted +0 -195

195 lines not on this page · raw message

arch/arm/dts/sun5i-a10s.dtsi deleted +0 -173

173 lines not on this page · raw message

arch/arm/dts/sun5i-a13-difrnce-dit4350.dts deleted +0 -50

50 lines not on this page · raw message

arch/arm/dts/sun5i-a13-empire-electronix-d709.dts deleted +0 -190

190 lines not on this page · raw message

arch/arm/dts/sun5i-a13-empire-electronix-m712.dts deleted +0 -51

51 lines not on this page · raw message

arch/arm/dts/sun5i-a13-hsg-h702.dts deleted +0 -182

182 lines not on this page · raw message

arch/arm/dts/sun5i-a13-inet-98v-rev2.dts deleted +0 -50

50 lines not on this page · raw message

arch/arm/dts/sun5i-a13-licheepi-one.dts deleted +0 -214

214 lines not on this page · raw message

arch/arm/dts/sun5i-a13-olinuxino-micro.dts deleted +0 -141

141 lines not on this page · raw message

arch/arm/dts/sun5i-a13-olinuxino.dts deleted +0 -247

247 lines not on this page · raw message

arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts deleted +0 -258

258 lines not on this page · raw message

arch/arm/dts/sun5i-a13-q8-tablet.dts deleted +0 -80

80 lines not on this page · raw message

arch/arm/dts/sun5i-a13-utoo-p66.dts deleted +0 -116

116 lines not on this page · raw message

arch/arm/dts/sun5i-a13.dtsi deleted +0 -118

118 lines not on this page · raw message

arch/arm/dts/sun5i-gr8-chip-pro.dts deleted +0 -238

103 lines not on this page · raw message

arch/arm/dts/sun5i-gr8-evb.dts deleted +0 -333

333 lines not on this page · raw message

arch/arm/dts/sun5i-gr8.dtsi deleted +0 -126

126 lines not on this page · raw message

arch/arm/dts/sun5i-r8-chip.dts deleted +0 -282

282 lines not on this page · raw message

arch/arm/dts/sun5i-r8.dtsi deleted +0 -47

47 lines not on this page · raw message

arch/arm/dts/sun5i-reference-design-tablet.dtsi deleted +0 -194

194 lines not on this page · raw message

arch/arm/mach-sunxi/Kconfig +1 -0
index 09d9f995d24..f941bf4a493 100644

Lines of this file are not shown. View the raw message.

configs/A10s-OLinuXino-M_defconfig +1 -1
index 841fe0d3f09..5a10fce7273 100644

Lines of this file are not shown. View the raw message.

configs/A13-OLinuXinoM_defconfig +1 -1
index befe6d86b25..5001ce9ce52 100644

Lines of this file are not shown. View the raw message.

configs/A13-OLinuXino_defconfig +1 -1
index 689ea533ee9..bc0fc0efe0a 100644

Lines of this file are not shown. View the raw message.

configs/Ampe_A76_defconfig +1 -0
index 1087512235a..e38ecf56929 100644

Lines of this file are not shown. View the raw message.

configs/Auxtek-T003_defconfig +1 -1
index 7d81f12f766..520939538f8 100644

Lines of this file are not shown. View the raw message.

configs/Auxtek-T004_defconfig +1 -1
index 4c7154b04c4..8b3a9eac788 100644

Lines of this file are not shown. View the raw message.

configs/CHIP_defconfig +1 -1
index cd9bdbfd36f..c220d269ab6 100644

Lines of this file are not shown. View the raw message.

configs/CHIP_pro_defconfig +1 -1
index 59df41a1502..05874125f4b 100644

Lines of this file are not shown. View the raw message.

configs/Empire_electronix_d709_defconfig +1 -1
index 4bd3b569392..18b1cfaa811 100644

Lines of this file are not shown. View the raw message.

configs/Empire_electronix_m712_defconfig +1 -1
index 18873dba340..abaf386563e 100644

Lines of this file are not shown. View the raw message.

configs/UTOO_P66_defconfig +1 -1
index 88a082c0567..d74ef2127d9 100644

Lines of this file are not shown. View the raw message.

configs/Wobo_i5_defconfig +1 -1
index 9e9bddb7649..9f6d2a78f48 100644

Lines of this file are not shown. View the raw message.

configs/difrnce_dit4350_defconfig +1 -1
index f54a83d929d..b0604302c97 100644

Lines of this file are not shown. View the raw message.

configs/iNet_86VS_defconfig +1 -0
index 2c8ecb51de0..42c9da9f947 100644

Lines of this file are not shown. View the raw message.

configs/inet98v_rev2_defconfig +1 -1
index e4da6c14d04..48b20c0eefa 100644

Lines of this file are not shown. View the raw message.

configs/mk802_a10s_defconfig +1 -1
index 21f7a6e535d..d3d7402f828 100644

Lines of this file are not shown. View the raw message.

configs/q8_a13_tablet_defconfig +1 -1
index 36252e5f89a..93a257853b3 100644

Lines of this file are not shown. View the raw message.

configs/r7-tv-dongle_defconfig +1 -1
index 8875a09b2c9..0c9f6197c2c 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.46.2

Part of the diff is not shown here. View the raw message.

maintainer
#7 lore raw
In reply to Andre Przywara

Dne nedelja, 19. januar 2025 ob 17:41:53 Srednjeevropski standardni čas je Andre Przywara napisal(a):

Quoted 11 lines

This series converts boards with the Allwinner F1C100s/F1C200s, A10, A10s and A13s SoCs over to OF_UPSTREAM. The .dts and .dtsi files were identical between the kernel and U-Boot repository, so this is a no-brainer.
However there are four boards (tablets, I guess) that do not have a .dts file in the kernel repository. For now I kept them using the "old style", so they continue working. This requires to keep a copy of the SoC .dtsi file, I would be grateful for any advice as how to handle this situation best. Ideally we would submit the DTs to the kernel, but I don't know how feasible this is, given their age, the missing device availability and their basic DT nature.

Drop them? I don't think there is much value to have them in such poor state. If there is interest, people can first use older version of U-Boot and then follow proper procedure for including them.

Best regards,
Jernej

Quoted 161 lines

I compiled all boards with and without this series applied: the resulting u-boot.dtb files were always identical.

Please have a look!

Cheers,
Andre

Andre Przywara (3):
suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM
sunxi: switch Allwinner A10 boards to OF_UPSTREAM
sunxi: switch Allwinner A10s/A13 boards to OF_UPSTREAM

 arch/arm/dts/Makefile                         |  48 +--
 arch/arm/dts/sun4i-a10-a1000.dts              | 255 -------------
 arch/arm/dts/sun4i-a10-ba10-tvbox.dts         | 151 --------
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts    | 159 --------
 arch/arm/dts/sun4i-a10-cubieboard.dts         | 255 -------------
 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts   | 218 -----------
 arch/arm/dts/sun4i-a10-gemei-g9.dts           | 192 ----------
 arch/arm/dts/sun4i-a10-hackberry.dts          | 140 -------
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts       | 115 ------
 arch/arm/dts/sun4i-a10-inet1.dts              | 229 -----------
 arch/arm/dts/sun4i-a10-inet97fv2.dts          | 203 ----------
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 357 ------------------
 .../dts/sun4i-a10-itead-iteaduino-plus.dts    | 126 -------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts         | 181 ---------
 arch/arm/dts/sun4i-a10-marsboard.dts          | 182 ---------
 arch/arm/dts/sun4i-a10-mini-xplus.dts         | 144 -------
 arch/arm/dts/sun4i-a10-mk802.dts              | 144 -------
 arch/arm/dts/sun4i-a10-mk802ii.dts            | 111 ------
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts     | 225 -----------
 arch/arm/dts/sun4i-a10-pcduino.dts            | 200 ----------
 arch/arm/dts/sun4i-a10-pcduino2.dts           |  67 ----
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts   | 206 ----------
 arch/arm/dts/sun4i-a10-topwise-a721.dts       | 242 ------------
 arch/arm/dts/sun5i-a10s-auxtek-t003.dts       | 137 -------
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts       | 149 --------
 arch/arm/dts/sun5i-a10s-mk802.dts             | 127 -------
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts   | 272 -------------
 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts      | 118 ------
 arch/arm/dts/sun5i-a10s-wobo-i5.dts           | 195 ----------
 arch/arm/dts/sun5i-a10s.dtsi                  | 173 ---------
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts    |  50 ---
 .../dts/sun5i-a13-empire-electronix-d709.dts  | 190 ----------
 .../dts/sun5i-a13-empire-electronix-m712.dts  |  51 ---
 arch/arm/dts/sun5i-a13-hsg-h702.dts           | 182 ---------
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts      |  50 ---
 arch/arm/dts/sun5i-a13-licheepi-one.dts       | 214 -----------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts    | 141 -------
 arch/arm/dts/sun5i-a13-olinuxino.dts          | 247 ------------
 .../dts/sun5i-a13-pocketbook-touch-lux-3.dts  | 258 -------------
 arch/arm/dts/sun5i-a13-q8-tablet.dts          |  80 ----
 arch/arm/dts/sun5i-a13-utoo-p66.dts           | 116 ------
 arch/arm/dts/sun5i-a13.dtsi                   | 118 ------
 arch/arm/dts/sun5i-gr8-chip-pro.dts           | 238 ------------
 arch/arm/dts/sun5i-gr8-evb.dts                | 333 ----------------
 arch/arm/dts/sun5i-gr8.dtsi                   | 126 -------
 arch/arm/dts/sun5i-r8-chip.dts                | 282 --------------
 arch/arm/dts/sun5i-r8.dtsi                    |  47 ---
 .../dts/sun5i-reference-design-tablet.dtsi    | 194 ----------
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts  |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi               | 330 ----------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts      |  76 ----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts  |  81 ----
 arch/arm/mach-sunxi/Kconfig                   |   3 +
 configs/A10-OLinuXino-Lime_defconfig          |   2 +-
 configs/A10s-OLinuXino-M_defconfig            |   2 +-
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   2 +-
 configs/Ampe_A76_defconfig                    |   1 +
 configs/Auxtek-T003_defconfig                 |   2 +-
 configs/Auxtek-T004_defconfig                 |   2 +-
 configs/CHIP_defconfig                        |   2 +-
 configs/CHIP_pro_defconfig                    |   2 +-
 configs/Chuwi_V7_CW0825_defconfig             |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Empire_electronix_d709_defconfig      |   2 +-
 configs/Empire_electronix_m712_defconfig      |   2 +-
 configs/Hyundai_A7HD_defconfig                |   2 +-
 configs/Linksprite_pcDuino_defconfig          |   2 +-
 configs/Marsboard_A10_defconfig               |   2 +-
 configs/Mele_A1000_defconfig                  |   2 +-
 configs/Mini-X_defconfig                      |   2 +-
 configs/UTOO_P66_defconfig                    |   2 +-
 configs/Wobo_i5_defconfig                     |   2 +-
 configs/ba10_tv_box_defconfig                 |   2 +-
 configs/difrnce_dit4350_defconfig             |   2 +-
 configs/dserve_dsrv9703c_defconfig            |   2 +-
 configs/iNet_3F_defconfig                     |   1 +
 configs/iNet_3W_defconfig                     |   1 +
 configs/iNet_86VS_defconfig                   |   1 +
 configs/inet1_defconfig                       |   2 +-
 configs/inet97fv2_defconfig                   |   2 +-
 configs/inet98v_rev2_defconfig                |   2 +-
 configs/inet9f_rev03_defconfig                |   2 +-
 configs/jesurun_q5_defconfig                  |   2 +-
 configs/lctech_pi_f1c200s_defconfig           |   2 +-
 configs/licheepi_nano_defconfig               |   2 +-
 configs/mk802_a10s_defconfig                  |   2 +-
 configs/mk802_defconfig                       |   2 +-
 configs/mk802ii_defconfig                     |   2 +-
 configs/pov_protab2_ips9_defconfig            |   2 +-
 configs/q8_a13_tablet_defconfig               |   2 +-
 configs/r7-tv-dongle_defconfig                |   2 +-
 configs/sunxi_Gemei_G9_defconfig              |   2 +-
 93 files changed, 45 insertions(+), 8832 deletions(-)
 delete mode 100644 arch/arm/dts/sun4i-a10-a1000.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-ba10-tvbox.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-cubieboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-gemei-g9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hackberry.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet1.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet97fv2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-marsboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mini-xplus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802ii.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t003.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-mk802.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s.dtsi
 delete mode 100644 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-m712.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-hsg-h702.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-licheepi-one.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-utoo-p66.dts
 delete mode 100644 arch/arm/dts/sun5i-a13.dtsi
 delete mode 100644 arch/arm/dts/sun5i-gr8-chip-pro.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8-evb.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-r8-chip.dts
 delete mode 100644 arch/arm/dts/sun5i-r8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-reference-design-tablet.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts
#8 lore raw
In reply to Andre Przywara

Hi Andre,

Quoted 5 lines · Andre Przywara

This series converts boards with the Allwinner F1C100s/F1C200s, A10, A10s and A13s SoCs over to OF_UPSTREAM. The .dts and .dtsi files were identical between the kernel and U-Boot repository, so this is a no-brainer.

Glad to see this series especially the diffstat.

Quoted 1 line

However there are four boards (tablets, I guess) that do not have a .dts

Can you share the board names you refer to here?

Quoted 3 lines

file in the kernel repository. For now I kept them using the "old style", so they continue working. This requires to keep a copy of the SoC .dtsi file,

Is the SoC .dtsi file present in dts/upstream? If yes then it is better to not maintain a local copy for them as the local .dts board files are able to include SoC .dtsi file from dts/upstream directory too.

Quoted 4 lines

I would be grateful for any advice as how to handle this situation best. Ideally we would submit the DTs to the kernel, but I don't know how feasible this is, given their age, the missing device availability and their basic DT nature.

Lets have only local board .dts files for them including other dependencies from dts/upstream tree. This will at least give folks who care about these boards a chance to uprev the corresponding DTs.

-Sumit

Quoted 163 lines

I compiled all boards with and without this series applied: the resulting u-boot.dtb files were always identical.

Please have a look!

Cheers,
Andre

Andre Przywara (3):
suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM
sunxi: switch Allwinner A10 boards to OF_UPSTREAM
sunxi: switch Allwinner A10s/A13 boards to OF_UPSTREAM

 arch/arm/dts/Makefile                         |  48 +--
 arch/arm/dts/sun4i-a10-a1000.dts              | 255 -------------
 arch/arm/dts/sun4i-a10-ba10-tvbox.dts         | 151 --------
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts    | 159 --------
 arch/arm/dts/sun4i-a10-cubieboard.dts         | 255 -------------
 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts   | 218 -----------
 arch/arm/dts/sun4i-a10-gemei-g9.dts           | 192 ----------
 arch/arm/dts/sun4i-a10-hackberry.dts          | 140 -------
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts       | 115 ------
 arch/arm/dts/sun4i-a10-inet1.dts              | 229 -----------
 arch/arm/dts/sun4i-a10-inet97fv2.dts          | 203 ----------
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 357 ------------------
 .../dts/sun4i-a10-itead-iteaduino-plus.dts    | 126 -------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts         | 181 ---------
 arch/arm/dts/sun4i-a10-marsboard.dts          | 182 ---------
 arch/arm/dts/sun4i-a10-mini-xplus.dts         | 144 -------
 arch/arm/dts/sun4i-a10-mk802.dts              | 144 -------
 arch/arm/dts/sun4i-a10-mk802ii.dts            | 111 ------
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts     | 225 -----------
 arch/arm/dts/sun4i-a10-pcduino.dts            | 200 ----------
 arch/arm/dts/sun4i-a10-pcduino2.dts           |  67 ----
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts   | 206 ----------
 arch/arm/dts/sun4i-a10-topwise-a721.dts       | 242 ------------
 arch/arm/dts/sun5i-a10s-auxtek-t003.dts       | 137 -------
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts       | 149 --------
 arch/arm/dts/sun5i-a10s-mk802.dts             | 127 -------
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts   | 272 -------------
 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts      | 118 ------
 arch/arm/dts/sun5i-a10s-wobo-i5.dts           | 195 ----------
 arch/arm/dts/sun5i-a10s.dtsi                  | 173 ---------
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts    |  50 ---
 .../dts/sun5i-a13-empire-electronix-d709.dts  | 190 ----------
 .../dts/sun5i-a13-empire-electronix-m712.dts  |  51 ---
 arch/arm/dts/sun5i-a13-hsg-h702.dts           | 182 ---------
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts      |  50 ---
 arch/arm/dts/sun5i-a13-licheepi-one.dts       | 214 -----------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts    | 141 -------
 arch/arm/dts/sun5i-a13-olinuxino.dts          | 247 ------------
 .../dts/sun5i-a13-pocketbook-touch-lux-3.dts  | 258 -------------
 arch/arm/dts/sun5i-a13-q8-tablet.dts          |  80 ----
 arch/arm/dts/sun5i-a13-utoo-p66.dts           | 116 ------
 arch/arm/dts/sun5i-a13.dtsi                   | 118 ------
 arch/arm/dts/sun5i-gr8-chip-pro.dts           | 238 ------------
 arch/arm/dts/sun5i-gr8-evb.dts                | 333 ----------------
 arch/arm/dts/sun5i-gr8.dtsi                   | 126 -------
 arch/arm/dts/sun5i-r8-chip.dts                | 282 --------------
 arch/arm/dts/sun5i-r8.dtsi                    |  47 ---
 .../dts/sun5i-reference-design-tablet.dtsi    | 194 ----------
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts  |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi               | 330 ----------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts      |  76 ----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts  |  81 ----
 arch/arm/mach-sunxi/Kconfig                   |   3 +
 configs/A10-OLinuXino-Lime_defconfig          |   2 +-
 configs/A10s-OLinuXino-M_defconfig            |   2 +-
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   2 +-
 configs/Ampe_A76_defconfig                    |   1 +
 configs/Auxtek-T003_defconfig                 |   2 +-
 configs/Auxtek-T004_defconfig                 |   2 +-
 configs/CHIP_defconfig                        |   2 +-
 configs/CHIP_pro_defconfig                    |   2 +-
 configs/Chuwi_V7_CW0825_defconfig             |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Empire_electronix_d709_defconfig      |   2 +-
 configs/Empire_electronix_m712_defconfig      |   2 +-
 configs/Hyundai_A7HD_defconfig                |   2 +-
 configs/Linksprite_pcDuino_defconfig          |   2 +-
 configs/Marsboard_A10_defconfig               |   2 +-
 configs/Mele_A1000_defconfig                  |   2 +-
 configs/Mini-X_defconfig                      |   2 +-
 configs/UTOO_P66_defconfig                    |   2 +-
 configs/Wobo_i5_defconfig                     |   2 +-
 configs/ba10_tv_box_defconfig                 |   2 +-
 configs/difrnce_dit4350_defconfig             |   2 +-
 configs/dserve_dsrv9703c_defconfig            |   2 +-
 configs/iNet_3F_defconfig                     |   1 +
 configs/iNet_3W_defconfig                     |   1 +
 configs/iNet_86VS_defconfig                   |   1 +
 configs/inet1_defconfig                       |   2 +-
 configs/inet97fv2_defconfig                   |   2 +-
 configs/inet98v_rev2_defconfig                |   2 +-
 configs/inet9f_rev03_defconfig                |   2 +-
 configs/jesurun_q5_defconfig                  |   2 +-
 configs/lctech_pi_f1c200s_defconfig           |   2 +-
 configs/licheepi_nano_defconfig               |   2 +-
 configs/mk802_a10s_defconfig                  |   2 +-
 configs/mk802_defconfig                       |   2 +-
 configs/mk802ii_defconfig                     |   2 +-
 configs/pov_protab2_ips9_defconfig            |   2 +-
 configs/q8_a13_tablet_defconfig               |   2 +-
 configs/r7-tv-dongle_defconfig                |   2 +-
 configs/sunxi_Gemei_G9_defconfig              |   2 +-
 93 files changed, 45 insertions(+), 8832 deletions(-)
 delete mode 100644 arch/arm/dts/sun4i-a10-a1000.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-ba10-tvbox.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-cubieboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-gemei-g9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hackberry.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet1.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet97fv2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-marsboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mini-xplus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802ii.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t003.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-mk802.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s.dtsi
 delete mode 100644 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-m712.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-hsg-h702.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-licheepi-one.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-utoo-p66.dts
 delete mode 100644 arch/arm/dts/sun5i-a13.dtsi
 delete mode 100644 arch/arm/dts/sun5i-gr8-chip-pro.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8-evb.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-r8-chip.dts
 delete mode 100644 arch/arm/dts/sun5i-r8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-reference-design-tablet.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts

--
2.46.2

#9 lore raw

On Wed, 22 Jan 2025 12:03:24 +0530
Sumit Garg <[email protected]> wrote:

Hi Sumit,

Quoted 8 lines · Andre Przywara
Quoted 5 lines

This series converts boards with the Allwinner F1C100s/F1C200s, A10, A10s and A13s SoCs over to OF_UPSTREAM. The .dts and .dtsi files were identical between the kernel and U-Boot repository, so this is a no-brainer.

Glad to see this series especially the diffstat.

Yeah, love that too, though the mailing list server blocked 2/3 and 3/3 initially because of their size ;-)

Quoted 3 lines
Quoted 1 line

However there are four boards (tablets, I guess) that do not have a .dts

Can you share the board names you refer to here?

Ah, sorry, sure, it's:
iNet_3F_defconfig sun4i-a10-inet-3f.dts
iNet_3W_defconfig sun4i-a10-inet-3w.dts
Ampe_A76_defconfig sun5i-a13-ampe-a76.dts
iNet_86VS_defconfig sun5i-a13-inet-86vs.dts

As you can see, they are extremely minimal, and also identical between each other, except for the model names. So there is cleanup potential regardless, but we have bigger fish to fry.

Quoted 8 lines
Quoted 3 lines

file in the kernel repository. For now I kept them using the "old style", so they continue working. This requires to keep a copy of the SoC .dtsi file,

Is the SoC .dtsi file present in dts/upstream? If yes then it is better to not maintain a local copy for them as the local .dts board files are able to include SoC .dtsi file from dts/upstream directory too.

Oh, now I feel stupid for having not even tried that!
That indeed works, so I will remove the .dtsi, but keep the .dts files in, at least for now. Jernej has a point that those boards could also be removed, but I didn't want to pull the plug too early and unnecessarily.

Quoted 8 lines
Quoted 4 lines

I would be grateful for any advice as how to handle this situation best. Ideally we would submit the DTs to the kernel, but I don't know how feasible this is, given their age, the missing device availability and their basic DT nature.

Lets have only local board .dts files for them including other dependencies from dts/upstream tree. This will at least give folks who care about these boards a chance to uprev the corresponding DTs.

Yes, I agree, I didn't know that this was even possible. But works for me, certainly.

If people don't mind, I will apply those patches now. In my test builds the .dtb files came out identical, so there is really no risk in this anyway.

Cheers,
Andre

Quoted 166 lines

-Sumit

Quoted 163 lines

I compiled all boards with and without this series applied: the resulting u-boot.dtb files were always identical.

Please have a look!

Cheers,
Andre

Andre Przywara (3):
suniv: switch Allwinner F1Cx00 boards to OF_UPSTREAM
sunxi: switch Allwinner A10 boards to OF_UPSTREAM
sunxi: switch Allwinner A10s/A13 boards to OF_UPSTREAM

 arch/arm/dts/Makefile                         |  48 +--
 arch/arm/dts/sun4i-a10-a1000.dts              | 255 -------------
 arch/arm/dts/sun4i-a10-ba10-tvbox.dts         | 151 --------
 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts    | 159 --------
 arch/arm/dts/sun4i-a10-cubieboard.dts         | 255 -------------
 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts   | 218 -----------
 arch/arm/dts/sun4i-a10-gemei-g9.dts           | 192 ----------
 arch/arm/dts/sun4i-a10-hackberry.dts          | 140 -------
 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts       | 115 ------
 arch/arm/dts/sun4i-a10-inet1.dts              | 229 -----------
 arch/arm/dts/sun4i-a10-inet97fv2.dts          | 203 ----------
 arch/arm/dts/sun4i-a10-inet9f-rev03.dts       | 357 ------------------
 .../dts/sun4i-a10-itead-iteaduino-plus.dts    | 126 -------
 arch/arm/dts/sun4i-a10-jesurun-q5.dts         | 181 ---------
 arch/arm/dts/sun4i-a10-marsboard.dts          | 182 ---------
 arch/arm/dts/sun4i-a10-mini-xplus.dts         | 144 -------
 arch/arm/dts/sun4i-a10-mk802.dts              | 144 -------
 arch/arm/dts/sun4i-a10-mk802ii.dts            | 111 ------
 arch/arm/dts/sun4i-a10-olinuxino-lime.dts     | 225 -----------
 arch/arm/dts/sun4i-a10-pcduino.dts            | 200 ----------
 arch/arm/dts/sun4i-a10-pcduino2.dts           |  67 ----
 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts   | 206 ----------
 arch/arm/dts/sun4i-a10-topwise-a721.dts       | 242 ------------
 arch/arm/dts/sun5i-a10s-auxtek-t003.dts       | 137 -------
 arch/arm/dts/sun5i-a10s-auxtek-t004.dts       | 149 --------
 arch/arm/dts/sun5i-a10s-mk802.dts             | 127 -------
 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts   | 272 -------------
 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts      | 118 ------
 arch/arm/dts/sun5i-a10s-wobo-i5.dts           | 195 ----------
 arch/arm/dts/sun5i-a10s.dtsi                  | 173 ---------
 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts    |  50 ---
 .../dts/sun5i-a13-empire-electronix-d709.dts  | 190 ----------
 .../dts/sun5i-a13-empire-electronix-m712.dts  |  51 ---
 arch/arm/dts/sun5i-a13-hsg-h702.dts           | 182 ---------
 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts      |  50 ---
 arch/arm/dts/sun5i-a13-licheepi-one.dts       | 214 -----------
 arch/arm/dts/sun5i-a13-olinuxino-micro.dts    | 141 -------
 arch/arm/dts/sun5i-a13-olinuxino.dts          | 247 ------------
 .../dts/sun5i-a13-pocketbook-touch-lux-3.dts  | 258 -------------
 arch/arm/dts/sun5i-a13-q8-tablet.dts          |  80 ----
 arch/arm/dts/sun5i-a13-utoo-p66.dts           | 116 ------
 arch/arm/dts/sun5i-a13.dtsi                   | 118 ------
 arch/arm/dts/sun5i-gr8-chip-pro.dts           | 238 ------------
 arch/arm/dts/sun5i-gr8-evb.dts                | 333 ----------------
 arch/arm/dts/sun5i-gr8.dtsi                   | 126 -------
 arch/arm/dts/sun5i-r8-chip.dts                | 282 --------------
 arch/arm/dts/sun5i-r8.dtsi                    |  47 ---
 .../dts/sun5i-reference-design-tablet.dtsi    | 194 ----------
 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts  |  73 ----
 arch/arm/dts/suniv-f1c100s.dtsi               | 330 ----------------
 arch/arm/dts/suniv-f1c200s-lctech-pi.dts      |  76 ----
 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts  |  81 ----
 arch/arm/mach-sunxi/Kconfig                   |   3 +
 configs/A10-OLinuXino-Lime_defconfig          |   2 +-
 configs/A10s-OLinuXino-M_defconfig            |   2 +-
 configs/A13-OLinuXinoM_defconfig              |   2 +-
 configs/A13-OLinuXino_defconfig               |   2 +-
 configs/Ampe_A76_defconfig                    |   1 +
 configs/Auxtek-T003_defconfig                 |   2 +-
 configs/Auxtek-T004_defconfig                 |   2 +-
 configs/CHIP_defconfig                        |   2 +-
 configs/CHIP_pro_defconfig                    |   2 +-
 configs/Chuwi_V7_CW0825_defconfig             |   2 +-
 configs/Cubieboard_defconfig                  |   2 +-
 configs/Empire_electronix_d709_defconfig      |   2 +-
 configs/Empire_electronix_m712_defconfig      |   2 +-
 configs/Hyundai_A7HD_defconfig                |   2 +-
 configs/Linksprite_pcDuino_defconfig          |   2 +-
 configs/Marsboard_A10_defconfig               |   2 +-
 configs/Mele_A1000_defconfig                  |   2 +-
 configs/Mini-X_defconfig                      |   2 +-
 configs/UTOO_P66_defconfig                    |   2 +-
 configs/Wobo_i5_defconfig                     |   2 +-
 configs/ba10_tv_box_defconfig                 |   2 +-
 configs/difrnce_dit4350_defconfig             |   2 +-
 configs/dserve_dsrv9703c_defconfig            |   2 +-
 configs/iNet_3F_defconfig                     |   1 +
 configs/iNet_3W_defconfig                     |   1 +
 configs/iNet_86VS_defconfig                   |   1 +
 configs/inet1_defconfig                       |   2 +-
 configs/inet97fv2_defconfig                   |   2 +-
 configs/inet98v_rev2_defconfig                |   2 +-
 configs/inet9f_rev03_defconfig                |   2 +-
 configs/jesurun_q5_defconfig                  |   2 +-
 configs/lctech_pi_f1c200s_defconfig           |   2 +-
 configs/licheepi_nano_defconfig               |   2 +-
 configs/mk802_a10s_defconfig                  |   2 +-
 configs/mk802_defconfig                       |   2 +-
 configs/mk802ii_defconfig                     |   2 +-
 configs/pov_protab2_ips9_defconfig            |   2 +-
 configs/q8_a13_tablet_defconfig               |   2 +-
 configs/r7-tv-dongle_defconfig                |   2 +-
 configs/sunxi_Gemei_G9_defconfig              |   2 +-
 93 files changed, 45 insertions(+), 8832 deletions(-)
 delete mode 100644 arch/arm/dts/sun4i-a10-a1000.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-ba10-tvbox.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-chuwi-v7-cw0825.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-cubieboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-dserve-dsrv9703c.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-gemei-g9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hackberry.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-hyundai-a7hd.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet1.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet97fv2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-inet9f-rev03.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-itead-iteaduino-plus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-jesurun-q5.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-marsboard.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mini-xplus.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-mk802ii.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-olinuxino-lime.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pcduino2.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-pov-protab2-ips9.dts
 delete mode 100644 arch/arm/dts/sun4i-a10-topwise-a721.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t003.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-auxtek-t004.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-mk802.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-r7-tv-dongle.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s-wobo-i5.dts
 delete mode 100644 arch/arm/dts/sun5i-a10s.dtsi
 delete mode 100644 arch/arm/dts/sun5i-a13-difrnce-dit4350.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-d709.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-empire-electronix-m712.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-hsg-h702.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-inet-98v-rev2.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-licheepi-one.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino-micro.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-olinuxino.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-pocketbook-touch-lux-3.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-q8-tablet.dts
 delete mode 100644 arch/arm/dts/sun5i-a13-utoo-p66.dts
 delete mode 100644 arch/arm/dts/sun5i-a13.dtsi
 delete mode 100644 arch/arm/dts/sun5i-gr8-chip-pro.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8-evb.dts
 delete mode 100644 arch/arm/dts/sun5i-gr8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-r8-chip.dts
 delete mode 100644 arch/arm/dts/sun5i-r8.dtsi
 delete mode 100644 arch/arm/dts/sun5i-reference-design-tablet.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c100s-licheepi-nano.dts
 delete mode 100644 arch/arm/dts/suniv-f1c100s.dtsi
 delete mode 100644 arch/arm/dts/suniv-f1c200s-lctech-pi.dts
 delete mode 100644 arch/arm/dts/suniv-f1c200s-popstick-v1.1.dts

--
2.46.2

Acked-by
#10 lore raw
Quoted 51 lines · Andre Przywara

On Wed, 22 Jan 2025 12:03:24 +0530
Sumit Garg <[email protected]> wrote:

Hi Sumit,

Quoted 8 lines · Andre Przywara
Quoted 5 lines

This series converts boards with the Allwinner F1C100s/F1C200s, A10, A10s and A13s SoCs over to OF_UPSTREAM. The .dts and .dtsi files were identical between the kernel and U-Boot repository, so this is a no-brainer.

Glad to see this series especially the diffstat.

Yeah, love that too, though the mailing list server blocked 2/3 and 3/3 initially because of their size ;-)

Quoted 3 lines
Quoted 1 line

However there are four boards (tablets, I guess) that do not have a .dts

Can you share the board names you refer to here?

Ah, sorry, sure, it's:

iNet_3F_defconfig       sun4i-a10-inet-3f.dts
iNet_3W_defconfig       sun4i-a10-inet-3w.dts
Ampe_A76_defconfig      sun5i-a13-ampe-a76.dts
iNet_86VS_defconfig     sun5i-a13-inet-86vs.dts

As you can see, they are extremely minimal, and also identical between each other, except for the model names. So there is cleanup potential regardless, but we have bigger fish to fry.

Quoted 8 lines
Quoted 3 lines

file in the kernel repository. For now I kept them using the "old style", so they continue working. This requires to keep a copy of the SoC .dtsi file,

Is the SoC .dtsi file present in dts/upstream? If yes then it is better to not maintain a local copy for them as the local .dts board files are able to include SoC .dtsi file from dts/upstream directory too.

Oh, now I feel stupid for having not even tried that!
That indeed works, so I will remove the .dtsi, but keep the .dts files in, at least for now. Jernej has a point that those boards could also be removed, but I didn't want to pull the plug too early and unnecessarily.

Quoted 5 lines
Quoted 4 lines

I would be grateful for any advice as how to handle this situation best. Ideally we would submit the DTs to the kernel, but I don't know how feasible this is, given their age, the missing device availability and their basic DT nature.

Quoted 8 lines
Quoted 3 lines

Lets have only local board .dts files for them including other dependencies from dts/upstream tree. This will at least give folks who care about these boards a chance to uprev the corresponding DTs.

Yes, I agree, I didn't know that this was even possible. But works for me, certainly.

If people don't mind, I will apply those patches now.

That's fine by me. Feel free to add:

-Sumit

Quoted 6 lines

In my test builds
the .dtb files came out identical, so there is really no risk in this anyway.

Cheers,
Andre