2024-07-17 23:36:40 -07:00
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Muhammed Efe Cetin <efectn@protonmail.com>
|
|
|
|
Date: Mon, 12 Feb 2024 17:35:13 +0300
|
|
|
|
Subject: arm64: dts: rockchip: Add USB-C to Khadas Edge 2
|
|
|
|
|
|
|
|
Khadas Edge 2 has 2x Type-C port. One just supports PD and
|
|
|
|
controlled by MCU. The other one supports PD, DP Alt mode and DRD. This
|
|
|
|
commit adds support for DRD.
|
|
|
|
|
|
|
|
Signed-off-by: Muhammed Efe Cetin <efectn@protonmail.com>
|
|
|
|
---
|
|
|
|
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 120 ++++++++++
|
|
|
|
1 file changed, 120 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
|
|
|
|
--- a/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
|
|
|
|
+++ b/arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts
|
|
|
|
@@ -6,6 +6,7 @@
|
|
|
|
#include <dt-bindings/input/input.h>
|
|
|
|
#include <dt-bindings/pinctrl/rockchip.h>
|
|
|
|
#include <dt-bindings/leds/common.h>
|
|
|
|
+#include <dt-bindings/usb/pd.h>
|
|
|
|
#include "rk3588s.dtsi"
|
|
|
|
|
|
|
|
/ {
|
|
|
|
@@ -76,6 +77,18 @@ blue_led: led-2 {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
+ vbus5v0_typec: vbus5v0-typec-regulator {
|
|
|
|
+ compatible = "regulator-fixed";
|
|
|
|
+ regulator-name = "vbus5v0_typec";
|
|
|
|
+ regulator-min-microvolt = <5000000>;
|
|
|
|
+ regulator-max-microvolt = <5000000>;
|
|
|
|
+ enable-active-high;
|
|
|
|
+ gpio = <&gpio3 RK_PA4 GPIO_ACTIVE_HIGH>;
|
|
|
|
+ vin-supply = <&vcc5v0_sys>;
|
|
|
|
+ pinctrl-names = "default";
|
|
|
|
+ pinctrl-0 = <&typec5v_pwren>;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
vcc3v3_pcie_wl: vcc3v3-pcie-wl-regulator {
|
|
|
|
compatible = "regulator-fixed";
|
|
|
|
enable-active-high;
|
|
|
|
@@ -224,6 +237,56 @@ regulator-state-mem {
|
|
|
|
&i2c2 {
|
|
|
|
status = "okay";
|
|
|
|
|
|
|
|
+ usbc0: usb-typec@22 {
|
|
|
|
+ compatible = "fcs,fusb302";
|
|
|
|
+ reg = <0x22>;
|
|
|
|
+ interrupt-parent = <&gpio1>;
|
|
|
|
+ interrupts = <RK_PB5 IRQ_TYPE_LEVEL_LOW>;
|
|
|
|
+ pinctrl-names = "default";
|
|
|
|
+ pinctrl-0 = <&usbc0_int>;
|
|
|
|
+ vbus-supply = <&vbus5v0_typec>;
|
|
|
|
+ status = "okay";
|
|
|
|
+
|
|
|
|
+ usb_con: connector {
|
|
|
|
+ compatible = "usb-c-connector";
|
|
|
|
+ label = "USB-C";
|
|
|
|
+ data-role = "dual";
|
|
|
|
+ power-role = "dual";
|
|
|
|
+ try-power-role = "source";
|
|
|
|
+ op-sink-microwatt = <1000000>;
|
|
|
|
+ sink-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)
|
2024-08-17 11:01:58 -07:00
|
|
|
+ PDO_FIXED(9000, 3000, PDO_FIXED_USB_COMM)
|
|
|
|
+ PDO_FIXED(12000, 3000, PDO_FIXED_USB_COMM)>;
|
|
|
|
+ source-pdos = <PDO_FIXED(5000, 3000, PDO_FIXED_USB_COMM)>;
|
2024-07-17 23:36:40 -07:00
|
|
|
+
|
|
|
|
+ ports {
|
|
|
|
+ #address-cells = <1>;
|
|
|
|
+ #size-cells = <0>;
|
|
|
|
+
|
|
|
|
+ port@0 {
|
|
|
|
+ reg = <0>;
|
|
|
|
+ usbc0_orien_sw: endpoint {
|
|
|
|
+ remote-endpoint = <&usbdp_phy0_orientation_switch>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ port@1 {
|
|
|
|
+ reg = <1>;
|
|
|
|
+ usbc0_role_sw: endpoint {
|
|
|
|
+ remote-endpoint = <&dwc3_0_role_switch>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ port@2 {
|
|
|
|
+ reg = <2>;
|
|
|
|
+ dp_altmode_mux: endpoint {
|
|
|
|
+ remote-endpoint = <&usbdp_phy0_dp_altmode_mux>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
hym8563: rtc@51 {
|
|
|
|
compatible = "haoyu,hym8563";
|
|
|
|
reg = <0x51>;
|
|
|
|
@@ -256,6 +319,16 @@ vcc5v0_host_en: vcc5v0-host-en {
|
|
|
|
};
|
|
|
|
};
|
|
|
|
|
|
|
|
+ usb-typec {
|
|
|
|
+ usbc0_int: usbc0-int {
|
|
|
|
+ rockchip,pins = <1 RK_PB5 RK_FUNC_GPIO &pcfg_pull_up>;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ typec5v_pwren: typec5v-pwren {
|
|
|
|
+ rockchip,pins = <3 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
ir-receiver {
|
|
|
|
ir_receiver_pin: ir-receiver-pin {
|
|
|
|
rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_none>;
|
|
|
|
@@ -681,6 +754,15 @@ &uart9 {
|
|
|
|
status = "okay";
|
|
|
|
};
|
|
|
|
|
|
|
|
+&u2phy0 {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&u2phy0_otg {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+
|
|
|
|
&u2phy2 {
|
|
|
|
status = "okay";
|
|
|
|
};
|
|
|
|
@@ -707,6 +789,44 @@ &usb_host0_ohci {
|
|
|
|
status = "okay";
|
|
|
|
};
|
|
|
|
|
|
|
|
+&usbdp_phy0 {
|
|
|
|
+ orientation-switch;
|
|
|
|
+ mode-switch;
|
|
|
|
+ svid = <0xff01>;
|
|
|
|
+ sbu1-dc-gpios = <&gpio4 RK_PA0 GPIO_ACTIVE_HIGH>;
|
|
|
|
+ sbu2-dc-gpios = <&gpio4 RK_PA1 GPIO_ACTIVE_HIGH>;
|
|
|
|
+ status = "okay";
|
|
|
|
+
|
|
|
|
+ port {
|
|
|
|
+ #address-cells = <1>;
|
|
|
|
+ #size-cells = <0>;
|
|
|
|
+
|
|
|
|
+ usbdp_phy0_orientation_switch: endpoint@0 {
|
|
|
|
+ reg = <0>;
|
|
|
|
+ remote-endpoint = <&usbc0_orien_sw>;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
+ usbdp_phy0_dp_altmode_mux: endpoint@1 {
|
|
|
|
+ reg = <1>;
|
|
|
|
+ remote-endpoint = <&dp_altmode_mux>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&usb_host0_xhci {
|
|
|
|
+ usb-role-switch;
|
|
|
|
+ status = "okay";
|
|
|
|
+
|
|
|
|
+ port {
|
|
|
|
+ #address-cells = <1>;
|
|
|
|
+ #size-cells = <0>;
|
|
|
|
+ dwc3_0_role_switch: endpoint@0 {
|
|
|
|
+ reg = <0>;
|
|
|
|
+ remote-endpoint = <&usbc0_role_sw>;
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
&usb_host1_ehci {
|
|
|
|
status = "okay";
|
|
|
|
};
|
|
|
|
--
|
|
|
|
Armbian
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Muhammed Efe Cetin <efectn@protonmail.com>
|
|
|
|
Date: Mon, 12 Feb 2024 17:35:13 +0300
|
|
|
|
Subject: arm64: dts: rockchip: Add bluetooth rfkill to Khadas Edge 2
|
|
|
|
|
|
|
|
---
|
|
|
|
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 9 +++++++++
|
|
|
|
1 file changed, 9 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
|
|
|
|
--- 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>;
|
|
|
|
};
|
|
|
|
|
|
|
|
+ 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>;
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
vcc5v0_sys: vcc5v0-sys-regulator {
|
|
|
|
compatible = "regulator-fixed";
|
|
|
|
regulator-name = "vcc5v0_sys";
|
|
|
|
--
|
|
|
|
Armbian
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Muhammed Efe Cetin <efectn@protonmail.com>
|
|
|
|
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(+)
|
|
|
|
|
|
|
|
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
|
|
|
|
@@ -7,6 +7,7 @@
|
|
|
|
#include <dt-bindings/pinctrl/rockchip.h>
|
|
|
|
#include <dt-bindings/leds/common.h>
|
|
|
|
#include <dt-bindings/usb/pd.h>
|
|
|
|
+#include <dt-bindings/soc/rockchip,vop2.h>
|
|
|
|
#include "rk3588s.dtsi"
|
|
|
|
|
|
|
|
/ {
|
|
|
|
@@ -823,6 +824,7 @@ usbdp_phy0_dp_altmode_mux: endpoint@1 {
|
|
|
|
};
|
|
|
|
|
|
|
|
&usb_host0_xhci {
|
|
|
|
+ dr-mode = "otg";
|
|
|
|
usb-role-switch;
|
|
|
|
status = "okay";
|
|
|
|
|
|
|
|
@@ -847,3 +849,37 @@ &usb_host1_ohci {
|
|
|
|
&usb_host2_xhci {
|
|
|
|
status = "okay";
|
|
|
|
};
|
|
|
|
+
|
|
|
|
+&hdmi0 {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&hdptxphy_hdmi0 {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&display_subsystem {
|
|
|
|
+ clocks = <&hdptxphy_hdmi0>;
|
|
|
|
+ clock-names = "hdmi0_phy_pll";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&vop_mmu {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&hdmi0_in {
|
|
|
|
+ hdmi0_in_vp0: endpoint {
|
|
|
|
+ remote-endpoint = <&vp0_out_hdmi0>;
|
|
|
|
+ };
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&vop {
|
|
|
|
+ status = "okay";
|
|
|
|
+};
|
|
|
|
+
|
|
|
|
+&vp0 {
|
|
|
|
+ vp0_out_hdmi0: endpoint@ROCKCHIP_VOP2_EP_HDMI0 {
|
|
|
|
+ reg = <ROCKCHIP_VOP2_EP_HDMI0>;
|
|
|
|
+ remote-endpoint = <&hdmi0_in_vp0>;
|
|
|
|
+ };
|
|
|
|
+};
|
|
|
|
--
|
|
|
|
Armbian
|
|
|
|
|
|
|
|
From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
|
|
|
|
From: Muhammed Efe Cetin <efectn@protonmail.com>
|
|
|
|
Date: Sat, 2 Mar 2024 19:13:59 +0300
|
|
|
|
Subject: arm64: dts: rockchip: Add AP6275P wireless support to Khadas Edge 2
|
|
|
|
|
|
|
|
---
|
|
|
|
arch/arm64/boot/dts/rockchip/rk3588s-khadas-edge2.dts | 17 ++++++++++
|
|
|
|
1 file changed, 17 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
|
|
|
|
--- 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 {
|
|
|
|
reset-gpios = <&gpio3 RK_PD1 GPIO_ACTIVE_HIGH>;
|
|
|
|
vpcie3v3-supply = <&vcc3v3_pcie_wl>;
|
|
|
|
status = "okay";
|
|
|
|
+
|
|
|
|
+ pcie@0,0 {
|
|
|
|
+ reg = <0x400000 0 0 0 0>;
|
|
|
|
+ #address-cells = <3>;
|
|
|
|
+ #size-cells = <2>;
|
|
|
|
+ ranges;
|
|
|
|
+ device_type = "pci";
|
|
|
|
+ bus-range = <0x40 0x4f>;
|
|
|
|
+
|
|
|
|
+ wifi: wifi@0,0 {
|
|
|
|
+ compatible = "pci14e4,449d";
|
|
|
|
+ reg = <0x410000 0 0 0 0>;
|
|
|
|
+ clocks = <&hym8563>;
|
|
|
|
+ clock-names = "32k";
|
|
|
|
+ };
|
|
|
|
+ };
|
|
|
|
+
|
|
|
|
};
|
|
|
|
|
|
|
|
&pwm11 {
|
|
|
|
--
|
|
|
|
Armbian
|
|
|
|
|