From bed3e9f6373904d53d7b1bc026baad52fb44e8d9 Mon Sep 17 00:00:00 2001 From: hyx Date: Tue, 8 Jul 2025 21:41:54 +0800 Subject: [PATCH] add usb0 net upto v1.1.8 --- .../arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi | 12 ++++++------ kernel/arch/arm64/configs/rk3326_linux.config | 1 + kernel/drivers/usb/gadget/function/Makefile | 6 ++++-- kernel/drivers/usb/gadget/function/f_fs.c | 4 ++-- 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi index 29a8c031c..fc81569e9 100644 --- a/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi +++ b/kernel/arch/arm64/boot/dts/rockchip/rk3326-evb-lp3-v10.dtsi @@ -100,7 +100,7 @@ sdio_pwrseq: sdio-pwrseq { * - SDIO_RESET_L_WL_REG_ON * - PDN (power down when low) */ - reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO3_A4 */ + reset-gpios = <&gpio0 RK_PA2 GPIO_ACTIVE_LOW>; /* GPIO0_A2 */ }; test-power { @@ -119,8 +119,8 @@ vcc5v0_sys: vccsys { wireless-wlan { compatible = "wlan-platdata"; wifi_chip_type = "AP6210"; - WIFI,host_wake_irq = <&gpio0 RK_PB2 GPIO_ACTIVE_HIGH>; - WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>; + //WIFI,host_wake_irq = <&gpio0 RK_PA5 GPIO_ACTIVE_HIGH>;//GPIO0_A5 + //WIFI,poweren_gpio = <&gpio0 RK_PA2 GPIO_ACTIVE_HIGH>;//GPIO0_A2 status = "okay"; }; @@ -132,9 +132,9 @@ wireless-bluetooth { pinctrl-names = "default","rts_gpio"; pinctrl-0 = <&uart1_rts>; pinctrl-1 = <&uart1_rts_gpio>; - BT,reset_gpio = <&gpio0 RK_PC1 GPIO_ACTIVE_HIGH>; - BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>; - BT,wake_host_irq = <&gpio0 RK_PB3 GPIO_ACTIVE_HIGH>; + //BT,reset_gpio = <&gpio0 RK_PA0 GPIO_ACTIVE_HIGH>;//GPIO0_A0 + //BT,wake_gpio = <&gpio0 RK_PA1 GPIO_ACTIVE_HIGH>;//GPIO0_A1 + //BT,wake_host_irq = <&gpio0 RK_PA7 GPIO_ACTIVE_HIGH>;//GPIO0_A7 status = "okay"; }; diff --git a/kernel/arch/arm64/configs/rk3326_linux.config b/kernel/arch/arm64/configs/rk3326_linux.config index 19968f6a6..43f12f7f2 100644 --- a/kernel/arch/arm64/configs/rk3326_linux.config +++ b/kernel/arch/arm64/configs/rk3326_linux.config @@ -11,3 +11,4 @@ CONFIG_ROCKCHIP_CIF_USE_DUMMY_BUF=y # CONFIG_ROCKCHIP_CIF_WORKMODE_ONEFRAME is not set CONFIG_ROCKCHIP_CIF_WORKMODE_PINGPONG=y CONFIG_VIDEOBUF2_CMA_SG=y +CONFIG_USB_CONFIGFS_RNDIS=y diff --git a/kernel/drivers/usb/gadget/function/Makefile b/kernel/drivers/usb/gadget/function/Makefile index dd33a1243..910de25d4 100644 --- a/kernel/drivers/usb/gadget/function/Makefile +++ b/kernel/drivers/usb/gadget/function/Makefile @@ -20,13 +20,15 @@ obj-$(CONFIG_USB_U_ETHER) += u_ether.o usb_f_ncm-y := f_ncm.o obj-$(CONFIG_USB_F_NCM) += usb_f_ncm.o usb_f_ecm-y := f_ecm.o -obj-$(CONFIG_USB_F_ECM) += usb_f_ecm.o +#obj-$(CONFIG_USB_F_ECM) += usb_f_ecm.o +obj-y += usb_f_ecm.o usb_f_phonet-y := f_phonet.o obj-$(CONFIG_USB_F_PHONET) += usb_f_phonet.o usb_f_eem-y := f_eem.o obj-$(CONFIG_USB_F_EEM) += usb_f_eem.o usb_f_ecm_subset-y := f_subset.o -obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o +#obj-$(CONFIG_USB_F_SUBSET) += usb_f_ecm_subset.o +obj-y += usb_f_ecm_subset.o usb_f_rndis-y := f_rndis.o rndis.o obj-$(CONFIG_USB_F_RNDIS) += usb_f_rndis.o usb_f_mass_storage-y := f_mass_storage.o storage_common.o diff --git a/kernel/drivers/usb/gadget/function/f_fs.c b/kernel/drivers/usb/gadget/function/f_fs.c index c321c019c..035578ce9 100644 --- a/kernel/drivers/usb/gadget/function/f_fs.c +++ b/kernel/drivers/usb/gadget/function/f_fs.c @@ -364,7 +364,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, /* Handle data */ if (ffs->state == FFS_READ_DESCRIPTORS) { - pr_info("read descriptors\n"); + //pr_info("read descriptors\n"); ret = __ffs_data_got_descs(ffs, data, len); if (unlikely(ret < 0)) break; @@ -372,7 +372,7 @@ static ssize_t ffs_ep0_write(struct file *file, const char __user *buf, ffs->state = FFS_READ_STRINGS; ret = len; } else { - pr_info("read strings\n"); + //pr_info("read strings\n"); ret = __ffs_data_got_strings(ffs, data, len); if (unlikely(ret < 0)) break;