From cfd3be675f6568c0bb6e755026099537092cb819 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Josef=20S=C3=B6ntgen?= Date: Fri, 19 May 2023 11:18:33 +0000 Subject: [PATCH] pc_wifi: enable RTL8192CE support in rtlwifi Issue #4861. --- repos/dde_linux/ports/linux-firmware.hash | 2 +- repos/dde_linux/ports/linux-firmware.port | 4 ++-- repos/pc/src/include/lx_emul/initcall_order.h | 3 ++- repos/pc/src/lib/pc_wifi/dep.list | 12 ++++++++++++ repos/pc/src/lib/pc_wifi/spec/x86_32/source.list | 12 ++++++++++++ repos/pc/src/lib/pc_wifi/spec/x86_64/source.list | 12 ++++++++++++ repos/pc/src/pc_linux/target.inc | 2 +- 7 files changed, 42 insertions(+), 5 deletions(-) diff --git a/repos/dde_linux/ports/linux-firmware.hash b/repos/dde_linux/ports/linux-firmware.hash index 6f5ff41c36..0a664a9b8c 100644 --- a/repos/dde_linux/ports/linux-firmware.hash +++ b/repos/dde_linux/ports/linux-firmware.hash @@ -1 +1 @@ -dc55c3afb4c9498364834030d33e3922addb1387 +f646f91ce377ea7cbd8312d6dc68681ee7d1ed0c diff --git a/repos/dde_linux/ports/linux-firmware.port b/repos/dde_linux/ports/linux-firmware.port index cc139a3650..b6ea7a914c 100644 --- a/repos/dde_linux/ports/linux-firmware.port +++ b/repos/dde_linux/ports/linux-firmware.port @@ -2,7 +2,7 @@ LICENSE := mixed VERSION := 1 DOWNLOADS := fw.archive -FW_REV := b7b5865b749f5a321259d95e0959929789a94959 +FW_REV := 260428bf5efb1750c2b8fd56e737abb2dfe8a010 URL(fw) := https://github.com/cnuke/dde_linux_firmware/archive/$(FW_REV).tar.gz -SHA(fw) := 0fd10961cae2582a9a3e9efca7a8d761427f215562626a221062abd001e36772 +SHA(fw) := 04b5de4db8df69bc99fda53b65f59b26573276b2bbbfdfbb5c648b9721668aa6 DIR(fw) := firmware diff --git a/repos/pc/src/include/lx_emul/initcall_order.h b/repos/pc/src/include/lx_emul/initcall_order.h index 4582419b69..5d00256c14 100644 --- a/repos/pc/src/include/lx_emul/initcall_order.h +++ b/repos/pc/src/include/lx_emul/initcall_order.h @@ -1,7 +1,7 @@ /* * \brief Array defining order of Linux Kernel initcalls * \author Automatically generated file - do no edit - * \date 2023-03-17 + * \date 2023-05-19 */ #pragma once @@ -233,6 +233,7 @@ static const char * lx_emul_initcall_order[] = { "__initcall_iwl_init6", "__initcall_iwl_mvm_init6", "__initcall_rtl_core_module_init6", + "__initcall_rtl92ce_driver_init6", "__initcall_rtl88ee_driver_init6", "__initcall_asix_driver_init6", "__initcall_ax88179_178a_driver_init6", diff --git a/repos/pc/src/lib/pc_wifi/dep.list b/repos/pc/src/lib/pc_wifi/dep.list index be4aaa3fd3..a3c55de769 100644 --- a/repos/pc/src/lib/pc_wifi/dep.list +++ b/repos/pc/src/lib/pc_wifi/dep.list @@ -176,6 +176,18 @@ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/reg.h drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.h drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.h drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.h +drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.h +drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.h +drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/def.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/reg.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.h +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.h drivers/net/wireless/realtek/rtlwifi/stats.h drivers/net/wireless/realtek/rtlwifi/wifi.h include/asm-generic/set_memory.h diff --git a/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list b/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list index a901c4514d..4ecdace0a1 100644 --- a/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list +++ b/repos/pc/src/lib/pc_wifi/spec/x86_32/source.list @@ -133,6 +133,18 @@ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c drivers/net/wireless/realtek/rtlwifi/stats.c drivers/pci/pci-driver.c fs/nls/nls_base.c diff --git a/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list b/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list index 4c6d5be92a..f4a825344a 100644 --- a/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list +++ b/repos/pc/src/lib/pc_wifi/spec/x86_64/source.list @@ -178,6 +178,18 @@ drivers/net/wireless/realtek/rtlwifi/rtl8188ee/rf.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/sw.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/table.c drivers/net/wireless/realtek/rtlwifi/rtl8188ee/trx.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/dm_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/fw_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/main.c +drivers/net/wireless/realtek/rtlwifi/rtl8192c/phy_common.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/dm.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/hw.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/led.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/phy.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/rf.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/sw.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/table.c +drivers/net/wireless/realtek/rtlwifi/rtl8192ce/trx.c drivers/net/wireless/realtek/rtlwifi/stats.c drivers/pci/pci-driver.c fs/nls/nls_base.c diff --git a/repos/pc/src/pc_linux/target.inc b/repos/pc/src/pc_linux/target.inc index e829b5668a..48446f5df8 100644 --- a/repos/pc/src/pc_linux/target.inc +++ b/repos/pc/src/pc_linux/target.inc @@ -32,7 +32,7 @@ LX_ENABLE += RFKILL LX_ENABLE += WLAN_VENDOR_INTEL IWLWIFI IWLDVM IWLMVM # rtlwifi -LX_ENABLE += WLAN_VENDOR_REALTEK RTL_CARDS RTL8188EE +LX_ENABLE += WLAN_VENDOR_REALTEK RTL_CARDS RTL8188EE RTL8192CE # ath9k LX_ENABLE += WLAN_VENDOR_ATH ATH_COMMON ATH9K ATH9K_PCI