From 74e6aa45db8eac5852d6ee3ce3579b8e7b8b33e8 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Sun, 1 Sep 2024 18:15:06 +0300 Subject: [PATCH 1/2] bigtreetech-cb1: edge: remove hook that changed device tree used --- config/boards/bigtreetech-cb1.conf | 6 ------ 1 file changed, 6 deletions(-) diff --git a/config/boards/bigtreetech-cb1.conf b/config/boards/bigtreetech-cb1.conf index fccba206e634..a986944d2b77 100644 --- a/config/boards/bigtreetech-cb1.conf +++ b/config/boards/bigtreetech-cb1.conf @@ -11,9 +11,3 @@ BOOTFS_TYPE="fat" BOOT_FS_LABEL="BOOT" OVERLAY_PREFIX="sun50i-h616" BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-cb1-sd.dtb" - -post_family_config__fdt_bigtreetech_cb1() { - if [[ "${BRANCH}" = "edge" ]]; then - BOOT_FDT_FILE="allwinner/sun50i-h616-bigtreetech-pi.dtb" - fi -} From 5788516a487c99748d128207ba65627797cf7c36 Mon Sep 17 00:00:00 2001 From: JohnTheCoolingFan Date: Sun, 1 Sep 2024 20:25:04 +0300 Subject: [PATCH 2/2] Replace symlinked patches by pointed files --- ...0i-h616-bigtreetech-cb1-enable-emac1.patch | 47 ++++++++++++- ...50i-h616-bigtreetech-cb1-enable-hdmi.patch | 66 ++++++++++++++++++- 2 files changed, 111 insertions(+), 2 deletions(-) mode change 120000 => 100644 patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch mode change 120000 => 100644 patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch deleted file mode 120000 index 93a6f46415e3..000000000000 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch +++ /dev/null @@ -1 +0,0 @@ -../../sunxi-6.6/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch \ No newline at end of file diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch new file mode 100644 index 000000000000..6509e0f87fbb --- /dev/null +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-emac1.patch @@ -0,0 +1,46 @@ +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 bbff30ccf..b98e85a51 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +@@ -142,10 +142,28 @@ mcp2515_clock: mcp2515_clock { + #clock-cells = <0>; + clock-frequency = <12000000>; + }; + }; + ++&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; + bus-width = <4>; + max-frequency = <50000000>; +-- +Created with Armbian build tools https://github.com/armbian/build + diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch deleted file mode 120000 index 0de064853345..000000000000 --- a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch +++ /dev/null @@ -1 +0,0 @@ -../../sunxi-6.6/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch \ No newline at end of file diff --git a/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch new file mode 100644 index 000000000000..2d9e9768e897 --- /dev/null +++ b/patch/kernel/archive/sunxi-6.7/patches.armbian/arm64-dts-sun50i-h616-bigtreetech-cb1-enable-hdmi.patch @@ -0,0 +1,65 @@ +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 e82da4b6e..bbff30ccf 100644 +--- a/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi ++++ b/arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi +@@ -23,10 +23,21 @@ aliases { + + 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"; + + act_led: led-0 { + gpios = <&pio 7 5 GPIO_ACTIVE_LOW>; /* PH5 */ +@@ -255,10 +266,25 @@ 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"; + }; + +-- +Created with Armbian build tools https://github.com/armbian/build +