Skip to content

Commit fa54bfe

Browse files
committed
rockchip: fixes r8125 nic support
1 parent 53661b6 commit fa54bfe

3 files changed

Lines changed: 5 additions & 25 deletions

File tree

target/linux/rockchip/armv8/base-files/lib/preinit/04_reorder_eth

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
preinit_reorder_eth() {
44
case $(board_name) in
55
lyt,t68m)
6+
modprobe r8125 || true
67
ip link set eth0 name lan1
78
ip link set eth1 name lan2
89
ip link set eth2 name lan4

target/linux/rockchip/files/arch/arm64/boot/dts/rockchip/rk3568-armsom-sige3.dts

Lines changed: 2 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,6 @@
165165
pinctrl-names = "default";
166166
pinctrl-0 = <&vcc5v0_usb_host_en>;
167167
regulator-name = "vcc5v0_usb_host";
168-
regulator-always-on;
169-
regulator-boot-on;
170168
regulator-min-microvolt = <5000000>;
171169
regulator-max-microvolt = <5000000>;
172170
vin-supply = <&vcc5v0_usb>;
@@ -179,8 +177,6 @@
179177
pinctrl-names = "default";
180178
pinctrl-0 = <&vcc5v0_usb_host2_en>;
181179
regulator-name = "vcc5v0_usb_host2";
182-
regulator-always-on;
183-
regulator-boot-on;
184180
regulator-min-microvolt = <5000000>;
185181
regulator-max-microvolt = <5000000>;
186182
vin-supply = <&vcc5v0_usb>;
@@ -302,10 +298,6 @@
302298
vcc9-supply = <&vcc3v3_sys>;
303299
wakeup-source;
304300

305-
codec {
306-
rockchip,mic-in-differential;
307-
};
308-
309301
regulators {
310302
vdd_logic: DCDC_REG1 {
311303
regulator-name = "vdd_logic";
@@ -502,7 +494,6 @@
502494
pinctrl-names = "default";
503495
pinctrl-0 = <&usbc1_int>;
504496
vbus-supply = <&vcc3v3_sys>;
505-
status = "okay";
506497
};
507498

508499
vdd_cpu: regulator@40 {
@@ -561,20 +552,9 @@
561552
};
562553

563554
&pcie2x1 {
555+
reset-gpios = <&gpio3 RK_PC1 GPIO_ACTIVE_HIGH>;
556+
vpcie3v3-supply = <&vcc3v3_pcie30>;
564557
status = "okay";
565-
566-
pcie@0,0 {
567-
reg = <0x00000000 0 0 0 0>;
568-
#address-cells = <3>;
569-
#size-cells = <2>;
570-
571-
rtl8125: pcie@1,0 {
572-
compatible = "pci10ec,8125";
573-
reg = <0x000000 0 0 0 0>;
574-
575-
realtek,led-data = <0x200 0x2b 0x0 0x0>;
576-
};
577-
};
578558
};
579559

580560
&pcie30phy {

target/linux/rockchip/image/armv8.mk

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ define Device/armsom_sige3
3838
SOC := rk3568
3939
DEVICE_DTS := rockchip/rk3568-armsom-sige3
4040
UBOOT_DEVICE_NAME := sige3-rk3568
41-
IMAGE/sysupgrade.img.gz := boot-common | boot-script vop | pine64-img | gzip | append-metadata
42-
DEVICE_PACKAGES := kmod-brcmfmac kmod-r8125 wpad-openssl brcmfmac-firmware-43752-sdio brcmfmac-nvram-43752-sdio -urngd
41+
IMAGE/sysupgrade.img.gz := boot-common | boot-script | pine64-img | gzip | append-metadata
42+
DEVICE_PACKAGES := brcmfmac-firmware-43752-sdio kmod-brcmfmac kmod-r8125-rss wpad
4343
endef
4444
TARGET_DEVICES += armsom_sige3
4545

@@ -342,7 +342,6 @@ define Device/rumu3f_fine-3399
342342
endef
343343
TARGET_DEVICES += rumu3f_fine-3399
344344

345-
346345
define Device/scensmart_sv901-eaio
347346
DEVICE_VENDOR := ScenSmart
348347
DEVICE_MODEL := SV901 EAIO

0 commit comments

Comments
 (0)