diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1040-board-khadas-edge2-add-nodes.patch index 1cd96d168..17e8fbd06 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1040-board-khadas-edge2-add-nodes.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1040-board-khadas-edge2-add-nodes.patch @@ -184,32 +184,42 @@ Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Mon, 12 Feb 2024 17:35:13 +0300 -Subject: arm64: dts: rockchip: Add bluetooth rfkill to Khadas Edge 2 +Subject: arm64: dts: rockchip: Add bluetooth support to Khadas Edge 2 --- - arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) + arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 18 +++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -116,6 +116,15 @@ vcc5v0_host: vcc5v0-host-regulator { - vin-supply = <&vcc5v0_sys>; - }; +@@ -750,8 +750,24 @@ &uart2 { -+ bluetooth-rfkill { -+ compatible = "rfkill-gpio"; -+ label = "rfkill-bluetooth"; -+ radio-type = "bluetooth"; -+ shutdown-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&bt_reset_pin>; -+ }; + &uart9 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart9m2_xfer &uart9m2_ctsn>; ++ pinctrl-0 = <&uart9m2_xfer &uart9m2_ctsn &uart9m2_rtsn>; + status = "okay"; + - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ clocks = <&hym8563>; ++ clock-names = "lpo"; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ interrupt-names = "host-wakeup"; ++ device-wakeup-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_wake_host_irq &bt_wake_pin &bt_reset_pin>; ++ vbat-supply = <&vcc_3v3_s3>; ++ vddio-supply = <&vcc_1v8_s3>; ++ }; + }; + + &u2phy0 { -- Armbian @@ -219,8 +229,8 @@ Date: Mon, 19 Feb 2024 23:32:11 +0300 Subject: arm64: dts: rockchip: Add HDMI & VOP2 to Khadas Edge 2 --- - arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 36 ++++++++++ - 1 file changed, 36 insertions(+) + arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 53 ++++++++++ + 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 111111111111..222222222222 100644 @@ -234,7 +244,25 @@ index 111111111111..222222222222 100644 #include "rk3588s.dtsi" / { -@@ -823,6 +824,7 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 { +@@ -43,6 +44,17 @@ ir-receiver { + pinctrl-0 = <&ir_receiver_pin>; + }; + ++ hdmi0-con { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi0_con_in: endpoint { ++ remote-endpoint = <&hdmi0_out_con>; ++ }; ++ }; ++ }; ++ + leds { + compatible = "pwm-leds"; + +@@ -830,6 +842,7 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 { }; &usb_host0_xhci { @@ -242,7 +270,7 @@ index 111111111111..222222222222 100644 usb-role-switch; status = "okay"; -@@ -847,3 +849,37 @@ &usb_host1_ohci { +@@ -854,3 +867,43 @@ &usb_host1_ohci { &usb_host2_xhci { status = "okay"; }; @@ -251,6 +279,18 @@ index 111111111111..222222222222 100644 + status = "okay"; +}; + ++&hdmi0_in { ++ hdmi0_in_vp0: endpoint { ++ remote-endpoint = <&vp0_out_hdmi0>; ++ }; ++}; ++ ++&hdmi0_out { ++ hdmi0_out_con: endpoint { ++ remote-endpoint = <&hdmi0_con_in>; ++ }; ++}; ++ +&hdptxphy_hdmi0 { + status = "okay"; +}; @@ -264,12 +304,6 @@ index 111111111111..222222222222 100644 + status = "okay"; +}; + -+&hdmi0_in { -+ hdmi0_in_vp0: endpoint { -+ remote-endpoint = <&vp0_out_hdmi0>; -+ }; -+}; -+ +&vop { + status = "okay"; +}; @@ -296,7 +330,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -366,6 +366,23 @@ &pcie2x1l2 { +@@ -368,6 +368,23 @@ &pcie2x1l2 { reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie_wl>; status = "okay"; diff --git a/patch/kernel/archive/rockchip-rk3588-6.10/1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip-rk3588-6.10/1041-board-khadas-edge2-mcu.patch index 985f0b34c..856b524ef 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.10/1041-board-khadas-edge2-mcu.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.10/1041-board-khadas-edge2-mcu.patch @@ -343,7 +343,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -304,6 +304,13 @@ hym8563: rtc@51 { +@@ -306,6 +306,13 @@ hym8563: rtc@51 { clock-output-names = "hym8563"; wakeup-source; }; @@ -373,7 +373,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -313,6 +313,62 @@ khadas_mcu: system-controller@18 { +@@ -315,6 +315,62 @@ khadas_mcu: system-controller@18 { }; }; diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch b/patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch index 1cd96d168..17e8fbd06 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.11/1040-board-khadas-edge2-add-nodes.patch @@ -184,32 +184,42 @@ Armbian From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Muhammed Efe Cetin Date: Mon, 12 Feb 2024 17:35:13 +0300 -Subject: arm64: dts: rockchip: Add bluetooth rfkill to Khadas Edge 2 +Subject: arm64: dts: rockchip: Add bluetooth support to Khadas Edge 2 --- - arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 9 +++++++++ - 1 file changed, 9 insertions(+) + arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 18 +++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -116,6 +116,15 @@ vcc5v0_host: vcc5v0-host-regulator { - vin-supply = <&vcc5v0_sys>; - }; +@@ -750,8 +750,24 @@ &uart2 { -+ bluetooth-rfkill { -+ compatible = "rfkill-gpio"; -+ label = "rfkill-bluetooth"; -+ radio-type = "bluetooth"; -+ shutdown-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_LOW>; -+ pinctrl-names = "default"; -+ pinctrl-0 = <&bt_reset_pin>; -+ }; + &uart9 { + pinctrl-names = "default"; +- pinctrl-0 = <&uart9m2_xfer &uart9m2_ctsn>; ++ pinctrl-0 = <&uart9m2_xfer &uart9m2_ctsn &uart9m2_rtsn>; + status = "okay"; + - vcc5v0_sys: vcc5v0-sys-regulator { - compatible = "regulator-fixed"; - regulator-name = "vcc5v0_sys"; ++ bluetooth { ++ compatible = "brcm,bcm43438-bt"; ++ clocks = <&hym8563>; ++ clock-names = "lpo"; ++ interrupt-parent = <&gpio0>; ++ interrupts = ; ++ interrupt-names = "host-wakeup"; ++ device-wakeup-gpios = <&gpio0 RK_PD3 GPIO_ACTIVE_HIGH>; ++ shutdown-gpios = <&gpio0 RK_PD4 GPIO_ACTIVE_HIGH>; ++ max-speed = <1500000>; ++ pinctrl-names = "default"; ++ pinctrl-0 = <&bt_wake_host_irq &bt_wake_pin &bt_reset_pin>; ++ vbat-supply = <&vcc_3v3_s3>; ++ vddio-supply = <&vcc_1v8_s3>; ++ }; + }; + + &u2phy0 { -- Armbian @@ -219,8 +229,8 @@ Date: Mon, 19 Feb 2024 23:32:11 +0300 Subject: arm64: dts: rockchip: Add HDMI & VOP2 to Khadas Edge 2 --- - arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 36 ++++++++++ - 1 file changed, 36 insertions(+) + arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 53 ++++++++++ + 1 file changed, 53 insertions(+) diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts index 111111111111..222222222222 100644 @@ -234,7 +244,25 @@ index 111111111111..222222222222 100644 #include "rk3588s.dtsi" / { -@@ -823,6 +824,7 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 { +@@ -43,6 +44,17 @@ ir-receiver { + pinctrl-0 = <&ir_receiver_pin>; + }; + ++ hdmi0-con { ++ compatible = "hdmi-connector"; ++ type = "a"; ++ ++ port { ++ hdmi0_con_in: endpoint { ++ remote-endpoint = <&hdmi0_out_con>; ++ }; ++ }; ++ }; ++ + leds { + compatible = "pwm-leds"; + +@@ -830,6 +842,7 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 { }; &usb_host0_xhci { @@ -242,7 +270,7 @@ index 111111111111..222222222222 100644 usb-role-switch; status = "okay"; -@@ -847,3 +849,37 @@ &usb_host1_ohci { +@@ -854,3 +867,43 @@ &usb_host1_ohci { &usb_host2_xhci { status = "okay"; }; @@ -251,6 +279,18 @@ index 111111111111..222222222222 100644 + status = "okay"; +}; + ++&hdmi0_in { ++ hdmi0_in_vp0: endpoint { ++ remote-endpoint = <&vp0_out_hdmi0>; ++ }; ++}; ++ ++&hdmi0_out { ++ hdmi0_out_con: endpoint { ++ remote-endpoint = <&hdmi0_con_in>; ++ }; ++}; ++ +&hdptxphy_hdmi0 { + status = "okay"; +}; @@ -264,12 +304,6 @@ index 111111111111..222222222222 100644 + status = "okay"; +}; + -+&hdmi0_in { -+ hdmi0_in_vp0: endpoint { -+ remote-endpoint = <&vp0_out_hdmi0>; -+ }; -+}; -+ +&vop { + status = "okay"; +}; @@ -296,7 +330,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -366,6 +366,23 @@ &pcie2x1l2 { +@@ -368,6 +368,23 @@ &pcie2x1l2 { reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>; vpcie3v3-supply = <&vcc3v3_pcie_wl>; status = "okay"; diff --git a/patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch b/patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch index 985f0b34c..856b524ef 100644 --- a/patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch +++ b/patch/kernel/archive/rockchip-rk3588-6.11/1041-board-khadas-edge2-mcu.patch @@ -343,7 +343,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -304,6 +304,13 @@ hym8563: rtc@51 { +@@ -306,6 +306,13 @@ hym8563: rtc@51 { clock-output-names = "hym8563"; wakeup-source; }; @@ -373,7 +373,7 @@ diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts b/arch/arm64/ index 111111111111..222222222222 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts +++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts -@@ -313,6 +313,62 @@ khadas_mcu: system-controller@18 { +@@ -315,6 +315,62 @@ khadas_mcu: system-controller@18 { }; };