From 29da31a00dd26cf4cd4241ea573d71f1333a5a99 Mon Sep 17 00:00:00 2001 From: EvilOlaf Date: Mon, 12 Jan 2026 14:50:47 +0000 Subject: [PATCH] cb1: combine patches --- ...bigtreetech-cb1-fix-ws2812-rgb-value.patch | 26 ---- ...0i-h616-bigtreetech-cb1-enable-emac1.patch | 42 ------ ...50i-h616-bigtreetech-cb1-enable-hdmi.patch | 57 -------- ...m64-dts-sun50i-h616-bigtreetech-cb1.patch} | 124 +++++++++++------- patch/kernel/archive/sunxi-6.18/series.conf | 5 +- 5 files changed, 76 insertions(+), 178 deletions(-) delete mode 100644 patch/kernel/archive/sunxi-6.18/patches.armbian/0602-arm64-dts-sun50i-h616-bigtreetech-cb1-fix-ws2812-rgb-value.patch delete mode 100644 patch/kernel/archive/sunxi-6.18/patches.armbian/0603-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch delete mode 100644 patch/kernel/archive/sunxi-6.18/patches.armbian/0604-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch rename patch/kernel/archive/sunxi-6.18/patches.armbian/{0601-arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch => arm64-dts-sun50i-h616-bigtreetech-cb1.patch} (72%) diff --git a/patch/kernel/archive/sunxi-6.18/patches.armbian/0602-arm64-dts-sun50i-h616-bigtreetech-cb1-fix-ws2812-rgb-value.patch b/patch/kernel/archive/sunxi-6.18/patches.armbian/0602-arm64-dts-sun50i-h616-bigtreetech-cb1-fix-ws2812-rgb-value.patch deleted file mode 100644 index 5d8475e8da..0000000000 --- a/patch/kernel/archive/sunxi-6.18/patches.armbian/0602-arm64-dts-sun50i-h616-bigtreetech-cb1-fix-ws2812-rgb-value.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JohnTheCoolingFan -Date: Sat, 25 Jan 2025 11:30:04 +0000 -Subject: BigTreeTech CB1: dts: i2c gpio mode adjustment and ws2812 rgb_value - -Signed-off-by: JohnTheCoolingFan ---- - arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -@@ -97,7 +97,7 @@ ws2812: ws2812 { - compatible = "rgb-ws2812"; - pinctrl-names = "default"; - rgb_cnt = <2>; -- rgb_value = <0x010000 0x010000>; -+ rgb_value = <0x000001 0x010000>; - status = "disabled"; - }; - --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.18/patches.armbian/0603-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch b/patch/kernel/archive/sunxi-6.18/patches.armbian/0603-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch deleted file mode 100644 index 406fb0c96b..0000000000 --- a/patch/kernel/archive/sunxi-6.18/patches.armbian/0603-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JohnTheCoolingFan -Date: Thu, 13 Jun 2024 11:50:55 +0000 -Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable EMAC1 - -Signed-off-by: JohnTheCoolingFan ---- - arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 18 ++++++++++ - 1 file changed, 18 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -@@ -143,6 +143,24 @@ &gpu { - status = "okay"; - }; - -+&emac1 { -+ pinctrl-names = "default"; -+ pinctrl-0 = <&rmii_pins>; -+ phy-mode = "rmii"; -+ phy-handle = <&rmii_phy>; -+ phy-supply = <®_dldo1>; -+ allwinner,rx-delay-ps = <3100>; -+ allwinner,tx-delay-ps = <700>; -+ status = "okay"; -+}; -+ -+&mdio1 { -+ rmii_phy: ethernet-phy@1 { -+ compatible = "ethernet-phy-ieee802.3-c22"; -+ reg = <1>; -+ }; -+}; -+ - &mmc0 { - vmmc-supply = <®_dldo1>; - broken-cd; --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.18/patches.armbian/0604-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch b/patch/kernel/archive/sunxi-6.18/patches.armbian/0604-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch deleted file mode 100644 index b64bfa430d..0000000000 --- a/patch/kernel/archive/sunxi-6.18/patches.armbian/0604-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 -From: JohnTheCoolingFan -Date: Thu, 13 Jun 2024 11:07:35 +0000 -Subject: ARM64: dts: sun50i-h616: BigTreeTech CB1: Enable HDMI - -Signed-off-by: JohnTheCoolingFan ---- - arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 26 ++++++++++ - 1 file changed, 26 insertions(+) - -diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -index 111111111111..222222222222 100644 ---- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -+++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -@@ -26,6 +26,17 @@ chosen { - stdout-path = "serial0:115200n8"; - }; - -+ connector { -+ compatible = "hdmi-connector"; -+ type = "d"; -+ -+ port { -+ hdmi_con_in: endpoint { -+ remote-endpoint = <&hdmi_out_con>; -+ }; -+ }; -+ }; -+ - leds { - compatible = "gpio-leds"; - -@@ -285,6 +296,21 @@ reg_dldo1: dldo1 { - }; - }; - -+&de { -+ status = "okay"; -+}; -+ -+&hdmi { -+ hvcc-supply = <®_aldo1>; -+ status = "okay"; -+}; -+ -+&hdmi_out { -+ hdmi_out_con: endpoint { -+ remote-endpoint = <&hdmi_con_in>; -+ }; -+}; -+ - &cpu0 { - cpu-supply = <®_dcdc2>; - status = "okay"; --- -Armbian - diff --git a/patch/kernel/archive/sunxi-6.18/patches.armbian/0601-arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch b/patch/kernel/archive/sunxi-6.18/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch similarity index 72% rename from patch/kernel/archive/sunxi-6.18/patches.armbian/0601-arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch rename to patch/kernel/archive/sunxi-6.18/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch index aa8ef96b82..921902cc9e 100644 --- a/patch/kernel/archive/sunxi-6.18/patches.armbian/0601-arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch +++ b/patch/kernel/archive/sunxi-6.18/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch @@ -1,45 +1,26 @@ From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Alan Date: Tue, 30 May 2023 17:36:29 +0800 -Subject: arm64: dts: sun50i-h616-bigtreetech-cb1(sd, emmc) +Subject: arm64: dts: sun50i-h616: Add BigTreeTech CB1 board support -> X-Git-Archeology: > recovered message: > Signed-off-by: Alan.Ma from BigTreeTech tech@biqu3d.com -> X-Git-Archeology: - Revision 9d69bb1da699f5729dc5c1dcc2d8d5f4590152fd: https://github.com/armbian/build/commit/9d69bb1da699f5729dc5c1dcc2d8d5f4590152fd -> X-Git-Archeology: Date: Tue, 30 May 2023 17:36:29 +0800 -> X-Git-Archeology: From: Alan -> X-Git-Archeology: Subject: Patches: add current(6.1) & edge(6.2) patch for BigTreeTech CB1 -> X-Git-Archeology: -> X-Git-Archeology: - Revision 8562428877003ddd46045cb3429d7fdc9df4acee: https://github.com/armbian/build/commit/8562428877003ddd46045cb3429d7fdc9df4acee -> X-Git-Archeology: Date: Sat, 02 Sep 2023 03:34:28 +0518 -> X-Git-Archeology: From: Gunjan Gupta -> X-Git-Archeology: Subject: Allwinner: Kernel patches for 6.5-rc7 kernel -> X-Git-Archeology: -> X-Git-Archeology: - Revision bb78fac2fadb40a43a9ccb36266dbd21746c2eb6: https://github.com/armbian/build/commit/bb78fac2fadb40a43a9ccb36266dbd21746c2eb6 -> X-Git-Archeology: Date: Fri, 29 Sep 2023 08:46:52 +0200 -> X-Git-Archeology: From: Ricardo Pardini -> X-Git-Archeology: Subject: `sunxi`/`sunxi64` `edge` 6.5.y: rebase/rewrite all patches for v6.5.5; fix UTF-8 "From:" encoding -> X-Git-Archeology: -> X-Git-Archeology: - Revision d1186b8a0e3d44d5b285e94772ebe2c17a014193: https://github.com/armbian/build/commit/d1186b8a0e3d44d5b285e94772ebe2c17a014193 -> X-Git-Archeology: Date: Mon, 30 Oct 2023 22:46:11 +0518 -> X-Git-Archeology: From: Gunjan Gupta -> X-Git-Archeology: Subject: kernel: sunxi: Add patches for 6.6 kernel -> X-Git-Archeology: -> X-Git-Archeology: - Revision a269c9a1c5784bd89630df1652923f0d76278b61: https://github.com/armbian/build/commit/a269c9a1c5784bd89630df1652923f0d76278b61 -> X-Git-Archeology: Date: Sun, 24 Dec 2023 09:13:08 +0100 -> X-Git-Archeology: From: Gunjan Gupta -> X-Git-Archeology: Subject: Refreshed patches using rewrite-kernel-patches command -> X-Git-Archeology: -> X-Git-Archeology: - Revision 30ef1a3e149f96200bffaf1c3138a4467b6f0aa7: https://github.com/armbian/build/commit/30ef1a3e149f96200bffaf1c3138a4467b6f0aa7 -> X-Git-Archeology: Date: Sun, 24 Dec 2023 09:13:08 +0100 -> X-Git-Archeology: From: Gunjan Gupta -> X-Git-Archeology: Subject: Allwinner: Add kernel patches for 6.7 kernel -> X-Git-Archeology: +Add complete device tree support for the BigTreeTech CB1 board based on +Allwinner H616 SoC, including: + +- SD card and eMMC storage +- EMAC1 Ethernet (RMII) +- HDMI output with audio +- WS2812 RGB LED +- USB peripherals +- GPU and thermal settings + +Signed-off-by: Alan +Signed-off-by: JohnTheCoolingFan --- - arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 223 +++++++++- - 1 file changed, 206 insertions(+), 17 deletions(-) + arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 267 +++++++++++++++++++ + 1 file changed, 250 insertions(+), 17 deletions(-) diff --git a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi -index 111111111111..222222222222 100644 +index bebfeb2a337a..6bc49f6c4617 100644 --- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi @@ -1,6 +1,7 @@ @@ -50,7 +31,7 @@ index 111111111111..222222222222 100644 */ /dts-v1/; -@@ -13,22 +14,41 @@ +@@ -13,22 +14,52 @@ #include / { @@ -65,6 +46,17 @@ index 111111111111..222222222222 100644 + + chosen { + stdout-path = "serial0:115200n8"; ++ }; ++ ++ connector { ++ compatible = "hdmi-connector"; ++ type = "d"; ++ ++ port { ++ hdmi_con_in: endpoint { ++ remote-endpoint = <&hdmi_out_con>; ++ }; ++ }; }; leds { @@ -98,7 +90,7 @@ index 111111111111..222222222222 100644 compatible = "regulator-fixed"; regulator-name = "vcc-5v"; regulator-min-microvolt = <5000000>; -@@ -36,7 +56,17 @@ reg_vcc5v: regulator-vcc5v { +@@ -36,7 +67,17 @@ reg_vcc5v: regulator-vcc5v { regulator-always-on; }; @@ -116,7 +108,7 @@ index 111111111111..222222222222 100644 compatible = "regulator-fixed"; regulator-name = "vcc33-wifi"; regulator-min-microvolt = <3300000>; -@@ -46,6 +76,7 @@ reg_vcc33_wifi: vcc33-wifi { +@@ -46,6 +87,7 @@ reg_vcc33_wifi: vcc33-wifi { }; reg_vcc_wifi_io: vcc-wifi-io { @@ -124,7 +116,7 @@ index 111111111111..222222222222 100644 compatible = "regulator-fixed"; regulator-name = "vcc-wifi-io"; regulator-min-microvolt = <1800000>; -@@ -57,10 +88,50 @@ reg_vcc_wifi_io: vcc-wifi-io { +@@ -57,10 +99,50 @@ reg_vcc_wifi_io: vcc-wifi-io { wifi_pwrseq: wifi-pwrseq { compatible = "mmc-pwrseq-simple"; clocks = <&rtc 1>; @@ -138,7 +130,7 @@ index 111111111111..222222222222 100644 + compatible = "rgb-ws2812"; + pinctrl-names = "default"; + rgb_cnt = <2>; -+ rgb_value = <0x010000 0x010000>; ++ rgb_value = <0x000001 0x010000>; + status = "disabled"; + }; + @@ -176,8 +168,28 @@ index 111111111111..222222222222 100644 }; &cpu0 { -@@ -74,9 +145,9 @@ &gpu { +@@ -72,11 +154,29 @@ &gpu { + status = "okay"; + }; ++&emac1 { ++ pinctrl-names = "default"; ++ pinctrl-0 = <&rmii_pins>; ++ phy-mode = "rmii"; ++ phy-handle = <&rmii_phy>; ++ phy-supply = <®_dldo1>; ++ allwinner,rx-delay-ps = <3100>; ++ allwinner,tx-delay-ps = <700>; ++ status = "okay"; ++}; ++ ++&mdio1 { ++ rmii_phy: ethernet-phy@1 { ++ compatible = "ethernet-phy-ieee802.3-c22"; ++ reg = <1>; ++ }; ++}; ++ &mmc0 { vmmc-supply = <®_dldo1>; - /* Card detection pin is not connected */ @@ -187,7 +199,7 @@ index 111111111111..222222222222 100644 status = "okay"; }; -@@ -85,12 +156,56 @@ &mmc1 { +@@ -85,12 +185,56 @@ &mmc1 { vqmmc-supply = <®_vcc_wifi_io>; mmc-pwrseq = <&wifi_pwrseq>; bus-width = <4>; @@ -196,8 +208,7 @@ index 111111111111..222222222222 100644 mmc-ddr-1_8v; status = "okay"; +}; - -- rtl8189ftv: wifi@1 { ++ +&pio { + can0_pin_irq: can0_pin_irq { + function = "irq"; @@ -211,7 +222,8 @@ index 111111111111..222222222222 100644 + status = "disabled"; + pinctrl-names = "default"; + pinctrl-0 = <&spi1_pins>; -+ + +- rtl8189ftv: wifi@1 { + can: mcp2515@0 { + status = "disabled"; + compatible = "microchip,mcp2515"; @@ -245,7 +257,7 @@ index 111111111111..222222222222 100644 }; }; -@@ -100,29 +215,34 @@ &r_i2c { +@@ -100,29 +244,34 @@ &r_i2c { axp313a: pmic@36 { compatible = "x-powers,axp313a"; reg = <0x36>; @@ -288,7 +300,7 @@ index 111111111111..222222222222 100644 regulator-always-on; }; -@@ -130,6 +250,8 @@ reg_aldo1: aldo1 { +@@ -130,6 +279,8 @@ reg_aldo1: aldo1 { regulator-name = "vcc-1v8-pll"; regulator-min-microvolt = <1800000>; regulator-max-microvolt = <1800000>; @@ -297,7 +309,7 @@ index 111111111111..222222222222 100644 regulator-always-on; }; -@@ -137,12 +259,79 @@ reg_dldo1: dldo1 { +@@ -137,12 +288,94 @@ reg_dldo1: dldo1 { regulator-name = "vcc-3v3-io"; regulator-min-microvolt = <3300000>; regulator-max-microvolt = <3300000>; @@ -309,6 +321,21 @@ index 111111111111..222222222222 100644 }; }; ++&de { ++ status = "okay"; ++}; ++ ++&hdmi { ++ hvcc-supply = <®_aldo1>; ++ status = "okay"; ++}; ++ ++&hdmi_out { ++ hdmi_out_con: endpoint { ++ remote-endpoint = <&hdmi_con_in>; ++ }; ++}; ++ +&cpu0 { + cpu-supply = <®_dcdc2>; + status = "okay"; @@ -379,4 +406,3 @@ index 111111111111..222222222222 100644 }; -- Armbian - diff --git a/patch/kernel/archive/sunxi-6.18/series.conf b/patch/kernel/archive/sunxi-6.18/series.conf index 8e5f363b8c..c821a58587 100644 --- a/patch/kernel/archive/sunxi-6.18/series.conf +++ b/patch/kernel/archive/sunxi-6.18/series.conf @@ -423,10 +423,6 @@ patches.armbian/0501-drv-mmc-sunxi-add-h5-emmc-compatible.patch patches.armbian/0502-drv-mmc-sunxi-disable-ddr52-a20-emmc.patch patches.armbian/0503-drv-mmc-sunxi-fix-h6-emmc.patch - patches.armbian/0601-arm64-dts-sun50i-h616-bigtreetech-cb1-sd-emmc.patch - patches.armbian/0602-arm64-dts-sun50i-h616-bigtreetech-cb1-fix-ws2812-rgb-value.patch - patches.armbian/0603-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch - patches.armbian/0604-arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch patches.armbian/0701-arm64-dts-sun50i-h616-orangepi-zero-enable-sound.patch patches.armbian/0702-arm64-dts-sun50i-h616-add-digital-audio-node.patch patches.armbian/arch-arm-patch-flush-icache-earlier.patch @@ -458,6 +454,7 @@ patches.armbian/arm64-dts-sun50i-h616-add-vpu-node.patch patches.armbian/arm64-dts-sun50i-h616-bananapi-m4-berry-fix-rgmii-pins.patch patches.armbian/arm64-dts-sun50i-h616-bananapi-m4-zero-add-pinctrl.patch + patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1.patch patches.armbian/arm64-dts-sun50i-h616-increase-bl31-reserved-memory.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-enable-expansion-board-usb.patch patches.armbian/arm64-dts-sun50i-h616-orangepi-zero2-enable-gpu-mali.patch