usb1 可用 usb2不可用

This commit is contained in:
yidiantongxin 2024-04-24 11:49:24 +08:00
parent 5f0522c90f
commit 081351fdf4
3 changed files with 68 additions and 87 deletions

View File

@ -217,16 +217,6 @@
};
};
vcc5v0_sys_s0: vcc5v0-sys-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_sys_s0";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
vin-supply = <&vcc5v0_sys>;
};
vcc_1v8_s0: vcc-1v8-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc_1v8_s0";
@ -234,17 +224,7 @@
regulator-boot-on;
regulator-min-microvolt = <1800000>;
regulator-max-microvolt = <1800000>;
vin-supply = <&vcc5v0_sys_s0>;
};
vcc_3v3_s0: vcc-3v3-s0 {
compatible = "regulator-fixed";
regulator-name = "vcc_3v3";
regulator-always-on;
regulator-boot-on;
regulator-min-microvolt = <3300000>;
regulator-max-microvolt = <3300000>;
vin-supply = <&vcc5v0_sys_s0>;
vin-supply = <&vcc5v0_sys>;
};
vdd_0v9_s0: vdd-0v9-s0 {
@ -254,31 +234,33 @@
regulator-boot-on;
regulator-min-microvolt = <900000>;
regulator-max-microvolt = <900000>;
vin-supply = <&vcc5v0_sys_s0>;
vin-supply = <&vcc5v0_sys>;
};
vcc5v0_usb_host1: vcc5v0-usb-host1 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb_host";
regulator-name = "vcc5v0_usb_host1";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys_s0>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&usb_host1_pwren>;
};
vcc5v0_usb_host2: vcc5v0-usb-host2 {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_usb_otg";
regulator-name = "vcc5v0_usb_host2";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio0 RK_PB0 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys_s0>;
gpio = <&gpio4 RK_PB0 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&usb_host2_pwren>;
};
@ -511,14 +493,6 @@
pinctrl-0 = <&uart2m1_xfer &uart2m1_ctsn>;
};
&usbdrd_dwc3 {
phys = <&u2phy_otg>;
phy-names = "usb2-phy";
maximum-speed = "high-speed";
snps,dis_u2_susphy_quirk;
snps,usb2-lpm-disable;
};
&gmac1 {
/* Use rgmii-rxid mode to disable rx delay inside Soc */
phy-mode = "rgmii-rxid";
@ -558,9 +532,6 @@
&pcie2x1 {
reset-gpios = <&gpio4 RK_PA4 GPIO_ACTIVE_HIGH>;
pinctrl-names = "default";
pinctrl-0 = <&wifi_perst>;
rockchip,skip-scan-in-resume;
status = "okay";
};
@ -589,9 +560,6 @@
};
wireless-wlan {
wifi_perst: wifi-perst {
rockchip,pins = <4 RK_PA4 RK_FUNC_GPIO &pcfg_pull_up>;
};
wifi_host_wake_irq: wifi-host-wake-irq {
rockchip,pins = <1 RK_PA7 RK_FUNC_GPIO &pcfg_pull_down>;
};
@ -623,20 +591,20 @@
status = "okay";
};
&pdm {
status = "okay";
pinctrl-0 = <&pdm_clk1
&pdm_sdi0
&pdm_sdi2>;
};
// &pdm {
// status = "okay";
// pinctrl-0 = <&pdm_clk1
// &pdm_sdi0
// &pdm_sdi2>;
// };
&pdmics {
status = "okay";
};
// &pdmics {
// status = "okay";
// };
&pdm_mic_array {
status = "okay";
};
// &pdm_mic_array {
// status = "okay";
// };
&sdmmc {
status = "okay";
@ -644,12 +612,24 @@
&u2phy_host {
status = "okay";
phy-supply = <&usb_host1_pwren>;
phy-supply = <&vcc5v0_sys>;
};
&u2phy_otg {
status = "okay";
vbus-supply = <&usb_host2_pwren>;
vbus-supply = <&vcc5v0_sys>;
};
&usbdrd_dwc3 {
phys = <&u2phy_otg>;
phy-names = "usb2-phy";
maximum-speed = "high-speed";
snps,dis_u2_susphy_quirk;
snps,usb2-lpm-disable;
};
&usb2phy {
status = "okay";
};
&usb_host0_ehci {

View File

@ -140,31 +140,31 @@
vin-supply = <&dc_12v>;
};
// vcc5v0_host: vcc5v0-host-regulator {
// compatible = "regulator-fixed";
// regulator-name = "vcc5v0_host";
// regulator-boot-on;
// regulator-always-on;
// regulator-min-microvolt = <5000000>;
// regulator-max-microvolt = <5000000>;
// enable-active-high;
// gpio = <&gpio4 RK_PB1 GPIO_ACTIVE_HIGH>;
// vin-supply = <&vcc5v0_sys>;
// pinctrl-names = "default";
// pinctrl-0 = <&vcc5v0_host_en>;
// };
vcc5v0_host: vcc5v0-host-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_host";
regulator-boot-on;
regulator-always-on;
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio4 RK_PB5 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_host_en>;
};
// vcc5v0_otg: vcc5v0-otg-regulator {
// compatible = "regulator-fixed";
// regulator-name = "vcc5v0_otg";
// regulator-min-microvolt = <5000000>;
// regulator-max-microvolt = <5000000>;
// enable-active-high;
// gpio = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>;
// vin-supply = <&vcc5v0_sys>;
// pinctrl-names = "default";
// pinctrl-0 = <&vcc5v0_otg_en>;
// };
vcc5v0_otg: vcc5v0-otg-regulator {
compatible = "regulator-fixed";
regulator-name = "vcc5v0_otg";
regulator-min-microvolt = <5000000>;
regulator-max-microvolt = <5000000>;
enable-active-high;
gpio = <&gpio4 RK_PC1 GPIO_ACTIVE_HIGH>;
vin-supply = <&vcc5v0_sys>;
pinctrl-names = "default";
pinctrl-0 = <&vcc5v0_otg_en>;
};
/omit-if-no-ref/
vccio_sd: vccio-sd {
@ -623,15 +623,15 @@
status = "okay";
};
// &u2phy_host {
// phy-supply = <&vcc5v0_host>;
// status = "okay";
// };
&u2phy_host {
phy-supply = <&vcc5v0_host>;
status = "okay";
};
// &u2phy_otg {
// vbus-supply = <&vcc5v0_otg>;
// status = "okay";
// };
&u2phy_otg {
vbus-supply = <&vcc5v0_otg>;
status = "okay";
};
&usb2phy {
status = "okay";

View File

@ -191,6 +191,7 @@ CONFIG_NETDEVICES=y
# CONFIG_NET_VENDOR_QUALCOMM is not set
# CONFIG_NET_VENDOR_RDC is not set
CONFIG_R8168=y
CONFIG_R8125=y
# CONFIG_NET_VENDOR_RENESAS is not set
# CONFIG_NET_VENDOR_ROCKER is not set
# CONFIG_NET_VENDOR_SAMSUNG is not set