From fa54bfe3dbcd64e3d624530e9224b97f63c7e50c Mon Sep 17 00:00:00 2001 From: coolsnowwolf Date: Tue, 17 Sep 2024 23:15:05 +0800 Subject: [PATCH] rockchip: fixes r8125 nic support --- .../base-files/lib/preinit/04_reorder_eth | 1 + .../boot/dts/rockchip/rk3568-armsom-sige3.dts | 24 ++----------------- target/linux/rockchip/image/armv8.mk | 5 ++-- 3 files changed, 5 insertions(+), 25 deletions(-) diff --git a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth b/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth index aa725b8f2..f94c4d471 100644 --- a/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth +++ b/target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth @@ -3,6 +3,7 @@ preinit_reorder_eth() { case $(board_name) in lyt,t68m) + modprobe r8125 || true ip link set eth0 name lan1 ip link set eth1 name lan2 ip link set eth2 name lan4 diff --git a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts index 00138cbc4..b30fb3e00 100644 --- a/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts +++ b/target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts @@ -165,8 +165,6 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_usb_host_en>; regulator-name = "vcc5v0_usb_host"; - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_usb>; @@ -179,8 +177,6 @@ pinctrl-names = "default"; pinctrl-0 = <&vcc5v0_usb_host2_en>; regulator-name = "vcc5v0_usb_host2"; - regulator-always-on; - regulator-boot-on; regulator-min-microvolt = <5000000>; regulator-max-microvolt = <5000000>; vin-supply = <&vcc5v0_usb>; @@ -302,10 +298,6 @@ vcc9-supply = <&vcc3v3_sys>; wakeup-source; - codec { - rockchip,mic-in-differential; - }; - regulators { vdd_logic: DCDC_REG1 { regulator-name = "vdd_logic"; @@ -502,7 +494,6 @@ pinctrl-names = "default"; pinctrl-0 = <&usbc1_int>; vbus-supply = <&vcc3v3_sys>; - status = "okay"; }; vdd_cpu: regulator@40 { @@ -561,20 +552,9 @@ }; &pcie2x1 { + reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>; + vpcie3v3-supply = <&vcc3v3_pcie30>; status = "okay"; - - pcie@0,0 { - reg = <0x00000000 0 0 0 0>; - #address-cells = <3>; - #size-cells = <2>; - - rtl8125: pcie@1,0 { - compatible = "pci10ec,8125"; - reg = <0x000000 0 0 0 0>; - - realtek,led-data = <0x200 0x2b 0x0 0x0>; - }; - }; }; &pcie30phy { diff --git a/target/linux/rockchip/image/armv8.mk b/target/linux/rockchip/image/armv8.mk index 5085e83c9..4ee5db246 100644 --- a/target/linux/rockchip/image/armv8.mk +++ b/target/linux/rockchip/image/armv8.mk @@ -38,8 +38,8 @@ define Device/armsom_sige3 SOC := rk3568 DEVICE_DTS := rockchip/rk3568-armsom-sige3 UBOOT_DEVICE_NAME := sige3-rk3568 - IMAGE/sysupgrade.img.gz := boot-common | boot-script vop | pine64-img | gzip | append-metadata - DEVICE_PACKAGES := kmod-brcmfmac kmod-r8125 wpad-openssl brcmfmac-firmware-43752-sdio brcmfmac-nvram-43752-sdio -urngd + IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata + DEVICE_PACKAGES := brcmfmac-firmware-43752-sdio kmod-brcmfmac kmod-r8125-rss wpad endef TARGET_DEVICES += armsom_sige3 @@ -342,7 +342,6 @@ define Device/rumu3f_fine-3399 endef TARGET_DEVICES += rumu3f_fine-3399 - define Device/scensmart_sv901-eaio DEVICE_VENDOR := ScenSmart DEVICE_MODEL := SV901 EAIO