rockchip: improve support for H68K/H69K V2

This commit is contained in:
aiamadeus 2025-08-04 22:16:38 +08:00
parent 15546b31ea
commit 04df3b1d7c
4 changed files with 23 additions and 42 deletions

View File

@ -96,31 +96,22 @@
vin-supply = <&vcc12v_dcin>; vin-supply = <&vcc12v_dcin>;
}; };
vcc5v0_usb: vcc5v0-usb { vcc5v0_usb_otg: vcc5v0-usb-otg {
compatible = "regulator-fixed";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
regulator-name = "vcc5v0_usb";
vin-supply = <&vcc12v_dcin>;
};
vcc5v0_usb_host: vcc5v0-usb-host {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>; gpio = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_usb_host_en>; pinctrl-0 = <&vcc5v0_usb_otg_en>;
regulator-min-microvolt = <5000000>; regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>; regulator-max-microvolt = <5000000>;
regulator-name = "vcc5v0_usb_host"; regulator-name = "vcc5v0_usb_otg";
vin-supply = <&vcc5v0_usb>; vin-supply = <&vcc5v0_sys>;
}; };
vcc3v3_pcie: vcc3v3-pcie { vcc3v3_pcie: vcc3v3-pcie {
compatible = "regulator-fixed"; compatible = "regulator-fixed";
enable-active-high; enable-active-high;
gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
regulator-min-microvolt = <3300000>; regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>; regulator-max-microvolt = <3300000>;
regulator-name = "vcc3v3_pcie"; regulator-name = "vcc3v3_pcie";
@ -498,7 +489,7 @@
}; };
usb { usb {
vcc5v0_usb_host_en: vcc5v0_usb_host_en { vcc5v0_usb_otg_en: vcc5v0_usb_otg_en {
rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>; rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_none>;
}; };
}; };
@ -583,7 +574,7 @@
}; };
&usb2phy0_host { &usb2phy0_host {
phy-supply = <&vcc5v0_usb_host>; phy-supply = <&vcc5v0_usb_otg>;
status = "okay"; status = "okay";
}; };
@ -592,12 +583,12 @@
}; };
&usb2phy1_host { &usb2phy1_host {
phy-supply = <&vcc5v0_usb_host>; phy-supply = <&vcc5v0_usb_otg>;
status = "okay"; status = "okay";
}; };
&usb2phy1_otg { &usb2phy1_otg {
phy-supply = <&vcc5v0_usb_host>; phy-supply = <&vcc5v0_usb_otg>;
status = "okay"; status = "okay";
}; };

View File

@ -9,7 +9,3 @@
model = "HINLINK OPC-H66K Board"; model = "HINLINK OPC-H66K Board";
compatible = "hinlink,opc-h66k", "rockchip,rk3568"; compatible = "hinlink,opc-h66k", "rockchip,rk3568";
}; };
&vcc3v3_pcie {
gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
};

View File

@ -20,19 +20,20 @@
assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>; assigned-clock-parents = <&cru SCLK_GMAC0_RGMII_SPEED>;
assigned-clock-rates = <0>, <125000000>; assigned-clock-rates = <0>, <125000000>;
clock_in_out = "output"; clock_in_out = "output";
phy-handle = <&rgmii_phy0>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
phy-supply = <&vcc3v3_sys>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac0_miim pinctrl-0 = <&gmac0_miim
&gmac0_tx_bus2 &gmac0_tx_bus2
&gmac0_rx_bus2 &gmac0_rx_bus2
&gmac0_rgmii_clk &gmac0_rgmii_clk
&gmac0_rgmii_bus>; &gmac0_rgmii_bus>;
snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 20000 100000>; snps,reset-delays-us = <0 20000 100000>;
snps,reset-gpio = <&gpio2 RK_PD3 GPIO_ACTIVE_LOW>;
tx_delay = <0x3c>; tx_delay = <0x3c>;
rx_delay = <0x2f>; rx_delay = <0x2f>;
phy-handle = <&rgmii_phy0>;
status = "okay"; status = "okay";
}; };
@ -41,36 +42,33 @@
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>; assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
assigned-clock-rates = <0>, <125000000>; assigned-clock-rates = <0>, <125000000>;
clock_in_out = "output"; clock_in_out = "output";
phy-handle = <&rgmii_phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
phy-supply = <&vcc3v3_sys>;
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac1m1_miim pinctrl-0 = <&gmac1m1_miim
&gmac1m1_tx_bus2 &gmac1m1_tx_bus2
&gmac1m1_rx_bus2 &gmac1m1_rx_bus2
&gmac1m1_rgmii_clk &gmac1m1_rgmii_clk
&gmac1m1_rgmii_bus>; &gmac1m1_rgmii_bus>;
snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 20000 100000>; snps,reset-delays-us = <0 20000 100000>;
snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
tx_delay = <0x4f>; tx_delay = <0x4f>;
rx_delay = <0x26>; rx_delay = <0x26>;
phy-handle = <&rgmii_phy1>;
status = "okay"; status = "okay";
}; };
&mdio0 { &mdio0 {
rgmii_phy0: ethernet-phy@0 { rgmii_phy0: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>; reg = <0x1>;
}; };
}; };
&mdio1 { &mdio1 {
rgmii_phy1: ethernet-phy@0 { rgmii_phy1: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>; reg = <0x1>;
}; };
}; };
&vcc3v3_pcie {
gpio = <&gpio2 RK_PD2 GPIO_ACTIVE_HIGH>;
};

View File

@ -88,6 +88,7 @@
assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>; assigned-clock-parents = <&cru SCLK_GMAC1_RGMII_SPEED>;
assigned-clock-rates = <0>, <125000000>; assigned-clock-rates = <0>, <125000000>;
clock_in_out = "output"; clock_in_out = "output";
phy-handle = <&rgmii_phy1>;
phy-mode = "rgmii-id"; phy-mode = "rgmii-id";
pinctrl-names = "default"; pinctrl-names = "default";
pinctrl-0 = <&gmac1m1_miim pinctrl-0 = <&gmac1m1_miim
@ -95,19 +96,18 @@
&gmac1m1_rx_bus2 &gmac1m1_rx_bus2
&gmac1m1_rgmii_clk &gmac1m1_rgmii_clk
&gmac1m1_rgmii_bus>; &gmac1m1_rgmii_bus>;
snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
snps,reset-active-low; snps,reset-active-low;
snps,reset-delays-us = <0 20000 100000>; snps,reset-delays-us = <0 20000 100000>;
snps,reset-gpio = <&gpio1 RK_PB0 GPIO_ACTIVE_LOW>;
tx_delay = <0x4f>; tx_delay = <0x4f>;
rx_delay = <0x26>; rx_delay = <0x26>;
phy-handle = <&rgmii_phy1>;
status = "okay"; status = "okay";
}; };
&mdio1 { &mdio1 {
rgmii_phy1: ethernet-phy@0 { rgmii_phy1: ethernet-phy@1 {
compatible = "ethernet-phy-ieee802.3-c22"; compatible = "ethernet-phy-ieee802.3-c22";
reg = <0x0>; reg = <0x1>;
}; };
}; };
@ -126,7 +126,3 @@
&sata0 { &sata0 {
target-supply = <&vcc5v0_ahci>; target-supply = <&vcc5v0_ahci>;
}; };
&vcc3v3_pcie {
gpio = <&gpio0 RK_PC4 GPIO_ACTIVE_HIGH>;
};