From cac9030aabacf11f8ba19515e36e0c0ff1eba6fc Mon Sep 17 00:00:00 2001 From: Ricardo Pardini Date: Thu, 28 Sep 2023 13:59:47 +0200 Subject: [PATCH] `rockchip64`/`edge` 6.5.y: rebase patches against v6.5.5; archeology --- .../board-pbp-add-dp-alt-mode.patch | 17 +- .../board-radxa-e25-sdmmc0-fix.patch | 4 +- .../board-radxa-e25-usb3-and-emmc-fix.patch | 4 +- ...ecs-Add-RK3308-internal-codec-driver.patch | 2 +- .../general-add-miniDP-virtual-extcon.patch | 4 +- .../general-add-pll-hdmi-timings.patch | 2 +- .../general-add-xtx-spi-nor-chips.patch | 8 +- .../general-disable-mtu-validation.patch | 4 +- ...-r8152-add-LED-configuration-from-OF.patch | 10 +- .../regulator-add-fan53200-driver.patch | 2 +- .../rockchip64-6.5/rk3399-fix-usb-phy.patch | 13 + ...plement-rockchip-PCIe-bus-scan-delay.patch | 4 +- .../rockchip64-6.5/rk356x-vop2-support.patch | 8 +- .../wifi-4003-ssv-6051-driver.patch | 4 +- ...ifi-4003-uwe5622-adjust-for-rockchip.patch | 621 +++--------------- 15 files changed, 149 insertions(+), 558 deletions(-) diff --git a/patch/kernel/archive/rockchip64-6.5/board-pbp-add-dp-alt-mode.patch b/patch/kernel/archive/rockchip64-6.5/board-pbp-add-dp-alt-mode.patch index 7724122d3..dd57ce104 100644 --- a/patch/kernel/archive/rockchip64-6.5/board-pbp-add-dp-alt-mode.patch +++ b/patch/kernel/archive/rockchip64-6.5/board-pbp-add-dp-alt-mode.patch @@ -7,9 +7,8 @@ Subject: add-dp-alt-mode-to-PBP arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts | 5 + drivers/phy/rockchip/phy-rockchip-typec.c | 17 ++ drivers/usb/typec/altmodes/displayport.c | 52 +++- - drivers/usb/typec/bus.c | 8 +- drivers/usb/typec/tcpm/tcpm.c | 139 +++++++++- - 5 files changed, 217 insertions(+), 4 deletions(-) + 4 files changed, 210 insertions(+), 3 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts index 054c6a4d1a45..48b865d30b14 100644 @@ -176,7 +175,7 @@ index cdf8261e22db..05172e17b2bf 100644 ret = sysfs_create_group(&alt->dev.kobj, &dp_altmode_group); if (ret) diff --git a/drivers/usb/typec/tcpm/tcpm.c b/drivers/usb/typec/tcpm/tcpm.c -index cc1d83926497..ca3908c37b1b 100644 +index 1596afee6c86..f4c41de58f17 100644 --- a/drivers/usb/typec/tcpm/tcpm.c +++ b/drivers/usb/typec/tcpm/tcpm.c @@ -8,6 +8,7 @@ @@ -275,7 +274,7 @@ index cc1d83926497..ca3908c37b1b 100644 tcpm_register_partner_altmodes(port); } break; -@@ -3712,6 +3754,7 @@ static int tcpm_src_attach(struct tcpm_port *port) +@@ -3720,6 +3762,7 @@ static int tcpm_src_attach(struct tcpm_port *port) static void tcpm_typec_disconnect(struct tcpm_port *port) { if (port->connected) { @@ -283,7 +282,7 @@ index cc1d83926497..ca3908c37b1b 100644 typec_partner_set_usb_power_delivery(port->partner, NULL); typec_unregister_partner(port->partner); port->partner = NULL; -@@ -3798,6 +3841,8 @@ static void tcpm_detach(struct tcpm_port *port) +@@ -3806,6 +3849,8 @@ static void tcpm_detach(struct tcpm_port *port) } tcpm_reset_port(port); @@ -292,7 +291,7 @@ index cc1d83926497..ca3908c37b1b 100644 } static void tcpm_src_detach(struct tcpm_port *port) -@@ -6144,6 +6189,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port) +@@ -6179,6 +6224,64 @@ static int tcpm_port_register_pd(struct tcpm_port *port) return ret; } @@ -357,7 +356,7 @@ index cc1d83926497..ca3908c37b1b 100644 static int tcpm_fw_get_caps(struct tcpm_port *port, struct fwnode_handle *fwnode) { -@@ -6154,6 +6257,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, +@@ -6189,6 +6292,23 @@ static int tcpm_fw_get_caps(struct tcpm_port *port, if (!fwnode) return -EINVAL; @@ -381,7 +380,7 @@ index cc1d83926497..ca3908c37b1b 100644 /* * This fwnode has a "compatible" property, but is never populated as a * struct device. Instead we simply parse it to read the properties. -@@ -6610,6 +6730,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) +@@ -6645,6 +6765,17 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) goto out_destroy_wq; port->try_role = port->typec_caps.prefer_role; @@ -399,7 +398,7 @@ index cc1d83926497..ca3908c37b1b 100644 port->typec_caps.fwnode = tcpc->fwnode; port->typec_caps.revision = 0x0120; /* Type-C spec release 1.2 */ -@@ -6652,6 +6783,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) +@@ -6687,6 +6818,12 @@ struct tcpm_port *tcpm_register_port(struct device *dev, struct tcpc_dev *tcpc) port->port_altmode, ALTMODE_DISCOVERY_MAX); port->registered = true; diff --git a/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-sdmmc0-fix.patch b/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-sdmmc0-fix.patch index cadc79281..41758a620 100644 --- a/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-sdmmc0-fix.patch +++ b/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-sdmmc0-fix.patch @@ -18,10 +18,10 @@ Subject: [ARCHEOLOGY] Improve SD card compatibility on Radxa E25 (#5165) 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -index 63c4bd873188..9bc67abff3ea 100644 +index 72ad74c38a2b..5751dc7e2ebc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -@@ -186,7 +186,7 @@ &sdmmc0 { +@@ -194,7 +194,7 @@ &sdmmc0 { disable-wp; pinctrl-names = "default"; pinctrl-0 = <&sdmmc0_bus4 &sdmmc0_clk &sdmmc0_cmd>; diff --git a/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-usb3-and-emmc-fix.patch b/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-usb3-and-emmc-fix.patch index 845b484f5..afd5918a0 100644 --- a/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-usb3-and-emmc-fix.patch +++ b/patch/kernel/archive/rockchip64-6.5/board-radxa-e25-usb3-and-emmc-fix.patch @@ -47,10 +47,10 @@ index 45b03dcbbad4..ffae714d56dc 100644 + dr_mode = "host"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -index 9bc67abff3ea..8046c941e611 100644 +index 5751dc7e2ebc..7d7d00adf10a 100644 --- a/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +++ b/arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts -@@ -201,6 +201,8 @@ &usb_host0_ohci { +@@ -209,6 +209,8 @@ &usb_host0_ohci { }; &usb_host0_xhci { diff --git a/patch/kernel/archive/rockchip64-6.5/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch b/patch/kernel/archive/rockchip64-6.5/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch index 255fb49a5..ae402dbe9 100644 --- a/patch/kernel/archive/rockchip64-6.5/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch +++ b/patch/kernel/archive/rockchip64-6.5/board-rockpis-0018-ASoC-codecs-Add-RK3308-internal-codec-driver.patch @@ -15,7 +15,7 @@ Signed-off-by: Xing Zheng 4 files changed, 2571 insertions(+) diff --git a/sound/soc/codecs/Kconfig b/sound/soc/codecs/Kconfig -index c2de4ee72183..bb49830427bb 100644 +index 947473d2da7d..35cf63ff5457 100644 --- a/sound/soc/codecs/Kconfig +++ b/sound/soc/codecs/Kconfig @@ -174,6 +174,7 @@ config SND_SOC_ALL_CODECS diff --git a/patch/kernel/archive/rockchip64-6.5/general-add-miniDP-virtual-extcon.patch b/patch/kernel/archive/rockchip64-6.5/general-add-miniDP-virtual-extcon.patch index 0774e6656..467a3655d 100644 --- a/patch/kernel/archive/rockchip64-6.5/general-add-miniDP-virtual-extcon.patch +++ b/patch/kernel/archive/rockchip64-6.5/general-add-miniDP-virtual-extcon.patch @@ -59,10 +59,10 @@ Subject: [ARCHEOLOGY] RK3399 Typec DP (#2676) 3 files changed, 296 insertions(+) diff --git a/drivers/extcon/Kconfig b/drivers/extcon/Kconfig -index 0ef1971d22bb..ea510315ee87 100644 +index 8de9023c2a38..21f0f856cacb 100644 --- a/drivers/extcon/Kconfig +++ b/drivers/extcon/Kconfig -@@ -190,4 +190,14 @@ config EXTCON_USBC_TUSB320 +@@ -191,4 +191,14 @@ config EXTCON_USBC_TUSB320 Say Y here to enable support for USB Type C cable detection extcon support using a TUSB320. diff --git a/patch/kernel/archive/rockchip64-6.5/general-add-pll-hdmi-timings.patch b/patch/kernel/archive/rockchip64-6.5/general-add-pll-hdmi-timings.patch index b8353d826..23c712a3a 100644 --- a/patch/kernel/archive/rockchip64-6.5/general-add-pll-hdmi-timings.patch +++ b/patch/kernel/archive/rockchip64-6.5/general-add-pll-hdmi-timings.patch @@ -69,7 +69,7 @@ Subject: [ARCHEOLOGY] Adding pll hdmi timing to rockchip64-dev too 1 file changed, 71 insertions(+) diff --git a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c -index 1e1563f5fffc..d70a3f3c00c4 100644 +index fbdc23953b52..a67213a20d9c 100644 --- a/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c +++ b/drivers/phy/rockchip/phy-rockchip-inno-hdmi.c @@ -316,6 +316,77 @@ static const struct pre_pll_config pre_pll_cfg_table[] = { diff --git a/patch/kernel/archive/rockchip64-6.5/general-add-xtx-spi-nor-chips.patch b/patch/kernel/archive/rockchip64-6.5/general-add-xtx-spi-nor-chips.patch index 470a84324..1bbe4f966 100644 --- a/patch/kernel/archive/rockchip64-6.5/general-add-xtx-spi-nor-chips.patch +++ b/patch/kernel/archive/rockchip64-6.5/general-add-xtx-spi-nor-chips.patch @@ -27,10 +27,10 @@ index e347b435a038..364413da729b 100644 obj-$(CONFIG_MTD_SPI_NOR) += controllers/ diff --git a/drivers/mtd/spi-nor/core.c b/drivers/mtd/spi-nor/core.c -index 5f29fac8669a..8e737ce9bee7 100644 +index 72973cfb1d20..6f30fed5760e 100644 --- a/drivers/mtd/spi-nor/core.c +++ b/drivers/mtd/spi-nor/core.c -@@ -2014,6 +2014,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { +@@ -2015,6 +2015,7 @@ static const struct spi_nor_manufacturer *manufacturers[] = { &spi_nor_winbond, &spi_nor_xilinx, &spi_nor_xmc, @@ -39,10 +39,10 @@ index 5f29fac8669a..8e737ce9bee7 100644 static const struct flash_info spi_nor_generic_flash = { diff --git a/drivers/mtd/spi-nor/core.h b/drivers/mtd/spi-nor/core.h -index 4fb5ff09c63a..099a47cceba0 100644 +index 2453bd5743ac..ce395aee5472 100644 --- a/drivers/mtd/spi-nor/core.h +++ b/drivers/mtd/spi-nor/core.h -@@ -644,6 +644,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; +@@ -646,6 +646,7 @@ extern const struct spi_nor_manufacturer spi_nor_sst; extern const struct spi_nor_manufacturer spi_nor_winbond; extern const struct spi_nor_manufacturer spi_nor_xilinx; extern const struct spi_nor_manufacturer spi_nor_xmc; diff --git a/patch/kernel/archive/rockchip64-6.5/general-disable-mtu-validation.patch b/patch/kernel/archive/rockchip64-6.5/general-disable-mtu-validation.patch index 51b8cf097..27419562a 100644 --- a/patch/kernel/archive/rockchip64-6.5/general-disable-mtu-validation.patch +++ b/patch/kernel/archive/rockchip64-6.5/general-disable-mtu-validation.patch @@ -15,10 +15,10 @@ Signed-off-by: Igor Pecovnik 1 file changed, 12 deletions(-) diff --git a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -index 4727f7be4f86..c47e125e5c9c 100644 +index 6931973028ae..e2374cd8e59e 100644 --- a/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +++ b/drivers/net/ethernet/stmicro/stmmac/stmmac_main.c -@@ -5605,27 +5605,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) +@@ -5607,27 +5607,15 @@ static void stmmac_set_rx_mode(struct net_device *dev) static int stmmac_change_mtu(struct net_device *dev, int new_mtu) { struct stmmac_priv *priv = netdev_priv(dev); diff --git a/patch/kernel/archive/rockchip64-6.5/net-usb-r8152-add-LED-configuration-from-OF.patch b/patch/kernel/archive/rockchip64-6.5/net-usb-r8152-add-LED-configuration-from-OF.patch index e842b4c58..d5ebbe5a0 100644 --- a/patch/kernel/archive/rockchip64-6.5/net-usb-r8152-add-LED-configuration-from-OF.patch +++ b/patch/kernel/archive/rockchip64-6.5/net-usb-r8152-add-LED-configuration-from-OF.patch @@ -13,7 +13,7 @@ Signed-off-by: David Bauer 1 file changed, 23 insertions(+) diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c -index 0738baa5b82e..3f09916a7dd1 100644 +index e88bedca8f32..ef6dfc8eeb37 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -11,6 +11,7 @@ @@ -24,7 +24,7 @@ index 0738baa5b82e..3f09916a7dd1 100644 #include #include #include -@@ -6894,6 +6895,22 @@ static void rtl_tally_reset(struct r8152 *tp) +@@ -6897,6 +6898,22 @@ static void rtl_tally_reset(struct r8152 *tp) ocp_write_word(tp, MCU_TYPE_PLA, PLA_RSTTALLY, ocp_data); } @@ -47,7 +47,7 @@ index 0738baa5b82e..3f09916a7dd1 100644 static void r8152b_init(struct r8152 *tp) { u32 ocp_data; -@@ -6935,6 +6952,8 @@ static void r8152b_init(struct r8152 *tp) +@@ -6938,6 +6955,8 @@ static void r8152b_init(struct r8152 *tp) ocp_data = ocp_read_word(tp, MCU_TYPE_USB, USB_USB_CTRL); ocp_data &= ~(RX_AGG_DISABLE | RX_ZERO_EN); ocp_write_word(tp, MCU_TYPE_USB, USB_USB_CTRL, ocp_data); @@ -56,7 +56,7 @@ index 0738baa5b82e..3f09916a7dd1 100644 } static void r8153_init(struct r8152 *tp) -@@ -7075,6 +7094,8 @@ static void r8153_init(struct r8152 *tp) +@@ -7078,6 +7097,8 @@ static void r8153_init(struct r8152 *tp) tp->coalesce = COALESCE_SLOW; break; } @@ -65,7 +65,7 @@ index 0738baa5b82e..3f09916a7dd1 100644 } static void r8153b_init(struct r8152 *tp) -@@ -7157,6 +7178,8 @@ static void r8153b_init(struct r8152 *tp) +@@ -7160,6 +7181,8 @@ static void r8153b_init(struct r8152 *tp) rtl_tally_reset(tp); tp->coalesce = 15000; /* 15 us */ diff --git a/patch/kernel/archive/rockchip64-6.5/regulator-add-fan53200-driver.patch b/patch/kernel/archive/rockchip64-6.5/regulator-add-fan53200-driver.patch index 03478fe92..803830cbf 100644 --- a/patch/kernel/archive/rockchip64-6.5/regulator-add-fan53200-driver.patch +++ b/patch/kernel/archive/rockchip64-6.5/regulator-add-fan53200-driver.patch @@ -17,7 +17,7 @@ Signed-off-by: Rock Shen 4 files changed, 532 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig -index a25d783dfb95..ef79ce4677a3 100644 +index d8bae57af16d..b486a36d5e08 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -712,6 +712,7 @@ CONFIG_REGULATOR_BD718XX=y diff --git a/patch/kernel/archive/rockchip64-6.5/rk3399-fix-usb-phy.patch b/patch/kernel/archive/rockchip64-6.5/rk3399-fix-usb-phy.patch index 9d36cd1a7..a606a460b 100644 --- a/patch/kernel/archive/rockchip64-6.5/rk3399-fix-usb-phy.patch +++ b/patch/kernel/archive/rockchip64-6.5/rk3399-fix-usb-phy.patch @@ -1,3 +1,13 @@ +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 +From: Paolo Sabatino +Date: Mon, 4 Sep 2023 14:55:50 +0200 +Subject: increase timeout for usb3 type C phy init + +rockchip64: increase timeout for usb3 type C phy init +--- + drivers/phy/rockchip/phy-rockchip-typec.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + diff --git a/drivers/phy/rockchip/phy-rockchip-typec.c b/drivers/phy/rockchip/phy-rockchip-typec.c index aae021e192a4..5b09e19b2add 100644 --- a/drivers/phy/rockchip/phy-rockchip-typec.c @@ -11,3 +21,6 @@ index aae021e192a4..5b09e19b2add 100644 } if (tcphy->mode == MODE_DISCONNECT) +-- +Armbian + diff --git a/patch/kernel/archive/rockchip64-6.5/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch b/patch/kernel/archive/rockchip64-6.5/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch index 858ba6bdd..955e7bff4 100644 --- a/patch/kernel/archive/rockchip64-6.5/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch +++ b/patch/kernel/archive/rockchip64-6.5/rk3399-rp64-pcie-Reimplement-rockchip-PCIe-bus-scan-delay.patch @@ -74,7 +74,7 @@ Subject: [ARCHEOLOGY] rockchip-[current,edge]: add pcie hack and lsi scsi/sas 4 files changed, 41 insertions(+) diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt -index 722b6eca2e93..8686d7a98e4c 100644 +index 23ebe34ff901..9cfdac82e52c 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4469,6 +4469,14 @@ @@ -167,7 +167,7 @@ index 1aa84035a8bc..c2bf64fcf300 100644 } EXPORT_SYMBOL_GPL(rockchip_pcie_parse_dt); diff --git a/drivers/pci/controller/pcie-rockchip.h b/drivers/pci/controller/pcie-rockchip.h -index fe0333778fd9..befb64392b14 100644 +index 6111de35f84c..591d2f122051 100644 --- a/drivers/pci/controller/pcie-rockchip.h +++ b/drivers/pci/controller/pcie-rockchip.h @@ -318,6 +318,8 @@ struct rockchip_pcie { diff --git a/patch/kernel/archive/rockchip64-6.5/rk356x-vop2-support.patch b/patch/kernel/archive/rockchip64-6.5/rk356x-vop2-support.patch index 0c29b462b..090803aa5 100644 --- a/patch/kernel/archive/rockchip64-6.5/rk356x-vop2-support.patch +++ b/patch/kernel/archive/rockchip64-6.5/rk356x-vop2-support.patch @@ -142,11 +142,11 @@ Subject: [ARCHEOLOGY] [RFC] RK3288 : Add HDMI resolutions (#1887) > X-Git-Archeology: Subject: bump rockchip64 edge to v6.3 > X-Git-Archeology: --- - drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 145 +++++----- - 1 file changed, 67 insertions(+), 78 deletions(-) + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 147 +++++----- + 1 file changed, 68 insertions(+), 79 deletions(-) diff --git a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c -index 112699949db9..4f9fa4fd2629 100644 +index 112699949db9..fa0954b4e241 100644 --- a/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c +++ b/drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c @@ -92,86 +92,88 @@ static struct rockchip_hdmi *to_rockchip_hdmi(struct drm_encoder *encoder) @@ -333,7 +333,7 @@ index 112699949db9..4f9fa4fd2629 100644 { ~0UL, 0x0000, 0x0000, 0x0000} }; -@@ -257,7 +246,7 @@ +@@ -257,7 +246,7 @@ dw_hdmi_rockchip_mode_valid(struct dw_hdmi *dw_hdmi, void *data, struct rockchip_hdmi *hdmi = data; const struct dw_hdmi_mpll_config *mpll_cfg = rockchip_mpll_cfg; int pclk = mode->clock * 1000; diff --git a/patch/kernel/archive/rockchip64-6.5/wifi-4003-ssv-6051-driver.patch b/patch/kernel/archive/rockchip64-6.5/wifi-4003-ssv-6051-driver.patch index 4953d5caf..16b47a003 100644 --- a/patch/kernel/archive/rockchip64-6.5/wifi-4003-ssv-6051-driver.patch +++ b/patch/kernel/archive/rockchip64-6.5/wifi-4003-ssv-6051-driver.patch @@ -67,7 +67,7 @@ Subject: add ssv6xxx wifi driver 60 files changed, 48981 insertions(+) diff --git a/drivers/net/wireless/Kconfig b/drivers/net/wireless/Kconfig -index 7555af5195ec..480596d9d36a 100644 +index 1351192eb9e0..408b25079882 100644 --- a/drivers/net/wireless/Kconfig +++ b/drivers/net/wireless/Kconfig @@ -18,6 +18,7 @@ menuconfig WLAN @@ -79,7 +79,7 @@ index 7555af5195ec..480596d9d36a 100644 source "drivers/net/wireless/ath/Kconfig" source "drivers/net/wireless/atmel/Kconfig" diff --git a/drivers/net/wireless/Makefile b/drivers/net/wireless/Makefile -index 4d7374d567d1..8e1619384556 100644 +index 3154f8c57544..2853cdf2c09b 100644 --- a/drivers/net/wireless/Makefile +++ b/drivers/net/wireless/Makefile @@ -3,6 +3,7 @@ diff --git a/patch/kernel/archive/rockchip64-6.5/wifi-4003-uwe5622-adjust-for-rockchip.patch b/patch/kernel/archive/rockchip64-6.5/wifi-4003-uwe5622-adjust-for-rockchip.patch index 751d92d73..bb0756820 100644 --- a/patch/kernel/archive/rockchip64-6.5/wifi-4003-uwe5622-adjust-for-rockchip.patch +++ b/patch/kernel/archive/rockchip64-6.5/wifi-4003-uwe5622-adjust-for-rockchip.patch @@ -1,447 +1,53 @@ -From 7827d00e29334f5801b92ad83924f07c673c2015 Mon Sep 17 00:00:00 2001 +From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001 From: Paolo Sabatino Date: Sun, 22 Jan 2023 14:13:39 +0000 -Subject: [PATCH] adjust uwe5622 driver for rockchip +Subject: adjust uwe5622 driver for rockchip --- - drivers/net/wireless/uwe5622/Kconfig | 3 +- - drivers/net/wireless/uwe5622/Makefile | 2 +- - drivers/net/wireless/uwe5622/tty-sdio/Kconfig | 0 - .../net/wireless/uwe5622/tty-sdio/Makefile | 9 +- - .../wireless/uwe5622/tty-sdio/Makefile.old | 31 + - .../uwe5622/tty-sdio/alignment/sitm.c | 0 - .../uwe5622/tty-sdio/alignment/sitm.h | 0 - drivers/net/wireless/uwe5622/tty-sdio/dump.c | 4 +- - drivers/net/wireless/uwe5622/tty-sdio/dump.h | 0 - drivers/net/wireless/uwe5622/tty-sdio/lpm.c | 4 - - drivers/net/wireless/uwe5622/tty-sdio/lpm.h | 0 - .../net/wireless/uwe5622/tty-sdio/rfkill.c | 0 - .../net/wireless/uwe5622/tty-sdio/rfkill.h | 0 - drivers/net/wireless/uwe5622/tty-sdio/tty.c | 0 - drivers/net/wireless/uwe5622/tty-sdio/tty.h | 0 - drivers/net/wireless/uwe5622/tty-sdio/woble.c | 0 - drivers/net/wireless/uwe5622/tty-sdio/woble.h | 0 - .../net/wireless/uwe5622/unisocwcn/Kconfig | 0 - .../net/wireless/uwe5622/unisocwcn/Makefile | 4 +- - .../wireless/uwe5622/unisocwcn/boot/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/boot/Makefile | 6 +- - .../unisocwcn/boot/gnss_firmware_bin.h | 0 - .../unisocwcn/boot/marlin_firmware_bin.h | 0 - .../uwe5622/unisocwcn/boot/wcn_integrate.c | 52 +- - .../uwe5622/unisocwcn/boot/wcn_integrate.h | 0 - .../unisocwcn/boot/wcn_integrate_boot.c | 35 +- - .../unisocwcn/boot/wcn_integrate_boot.h | 0 - .../unisocwcn/boot/wcn_integrate_dev.c | 22 +- - .../unisocwcn/boot/wcn_integrate_dev.h | 0 - .../wireless/uwe5622/unisocwcn/fw/bin2hex.c | 0 - .../uwe5622/unisocwcn/fw/firmware_hex.h | 0 - .../uwe5622/unisocwcn/fw/usb_fdl.bin.hex | 0 - .../wireless/uwe5622/unisocwcn/fw/version.txt | 0 - .../uwe5622/unisocwcn/fw/wcnmodem.bin.hex | 0 - .../wireless/uwe5622/unisocwcn/gnss/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/gnss/Makefile | 0 - .../uwe5622/unisocwcn/include/bus_common.h | 0 - .../unisocwcn/include/marlin_platform.h | 3 +- - .../wireless/uwe5622/unisocwcn/include/mchn.h | 0 - .../uwe5622/unisocwcn/include/uwe5621_glb.h | 0 - .../uwe5622/unisocwcn/include/uwe5622_glb.h | 0 - .../uwe5622/unisocwcn/include/uwe5623_glb.h | 0 - .../uwe5622/unisocwcn/include/uwe562x_glb.h | 5 + - .../include/vendor/hisilicon/hi_drv_gpio.h | 0 - .../include/vendor/hisilicon/hi_type.h | 0 - .../uwe5622/unisocwcn/include/wcn_bus.h | 0 - .../uwe5622/unisocwcn/include/wcn_glb.h | 0 - .../uwe5622/unisocwcn/include/wcn_glb_reg.h | 0 - .../uwe5622/unisocwcn/include/wcn_types.h | 0 - .../uwe5622/unisocwcn/include/wcn_wrapper.h | 20 + - .../wireless/uwe5622/unisocwcn/log/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/log/Makefile | 0 - .../wireless/uwe5622/unisocwcn/pcie/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/pcie/Makefile | 0 - .../uwe5622/unisocwcn/pcie/edma_engine.c | 0 - .../uwe5622/unisocwcn/pcie/edma_engine.h | 0 - .../uwe5622/unisocwcn/pcie/edma_test.c | 0 - .../wireless/uwe5622/unisocwcn/pcie/ioctl.c | 0 - .../wireless/uwe5622/unisocwcn/pcie/ioctl.h | 0 - .../wireless/uwe5622/unisocwcn/pcie/mchn.c | 0 - .../wireless/uwe5622/unisocwcn/pcie/mchn.h | 0 - .../wireless/uwe5622/unisocwcn/pcie/pcie.c | 0 - .../wireless/uwe5622/unisocwcn/pcie/pcie.h | 0 - .../uwe5622/unisocwcn/pcie/pcie_attach_bus.c | 0 - .../uwe5622/unisocwcn/pcie/pcie_dbg.c | 0 - .../uwe5622/unisocwcn/pcie/pcie_dbg.h | 0 - .../uwe5622/unisocwcn/platform/Kconfig | 0 - .../uwe5622/unisocwcn/platform/Makefile | 0 - .../uwe5622/unisocwcn/platform/bufring.c | 3 +- - .../uwe5622/unisocwcn/platform/bufring.h | 0 - .../unisocwcn/platform/gnss/gnss_common.h | 0 - .../unisocwcn/platform/gnss/gnss_common_ctl.c | 0 - .../unisocwcn/platform/gnss/gnss_dbg.c | 0 - .../unisocwcn/platform/gnss/gnss_dump.c | 0 - .../unisocwcn/platform/gnss/gnss_dump.h | 0 - .../platform/gnss/gnss_pmnotify_ctl.c | 0 - .../uwe5622/unisocwcn/platform/loopcheck.c | 10 +- - .../uwe5622/unisocwcn/platform/loopcheck.h | 0 - .../uwe5622/unisocwcn/platform/mdbg_type.h | 0 - .../uwe5622/unisocwcn/platform/mem_pd_mgr.c | 21 +- - .../uwe5622/unisocwcn/platform/mem_pd_mgr.h | 0 - .../uwe5622/unisocwcn/platform/pcie_boot.c | 2 - - .../uwe5622/unisocwcn/platform/pcie_boot.h | 0 - .../uwe5622/unisocwcn/platform/rdc_debug.c | 0 - .../uwe5622/unisocwcn/platform/rdc_debug.h | 0 - .../uwe5622/unisocwcn/platform/rf/rf.c | 22 +- - .../uwe5622/unisocwcn/platform/rf/rf.h | 0 - .../uwe5622/unisocwcn/platform/usb_boot.c | 0 - .../uwe5622/unisocwcn/platform/usb_boot.h | 0 - .../unisocwcn/platform/wcn_bind_helper.c | 1444 +++++++++++++++++ - .../uwe5622/unisocwcn/platform/wcn_boot.c | 62 +- - .../uwe5622/unisocwcn/platform/wcn_debugfs.c | 8 +- - .../uwe5622/unisocwcn/platform/wcn_dump.c | 112 +- - .../uwe5622/unisocwcn/platform/wcn_dump.h | 0 - .../unisocwcn/platform/wcn_dump_integrate.c | 2 +- - .../unisocwcn/platform/wcn_dump_integrate.h | 0 - .../uwe5622/unisocwcn/platform/wcn_gnss.h | 0 - .../uwe5622/unisocwcn/platform/wcn_log.c | 0 - .../uwe5622/unisocwcn/platform/wcn_log.h | 0 - .../uwe5622/unisocwcn/platform/wcn_misc.c | 13 +- - .../uwe5622/unisocwcn/platform/wcn_misc.h | 0 - .../uwe5622/unisocwcn/platform/wcn_op.c | 0 - .../uwe5622/unisocwcn/platform/wcn_op.h | 0 - .../unisocwcn/platform/wcn_parn_parser.c | 4 +- - .../unisocwcn/platform/wcn_parn_parser.h | 0 - .../uwe5622/unisocwcn/platform/wcn_procfs.c | 15 +- - .../uwe5622/unisocwcn/platform/wcn_procfs.h | 0 - .../uwe5622/unisocwcn/platform/wcn_swd_dp.c | 0 - .../uwe5622/unisocwcn/platform/wcn_swd_dp.h | 0 - .../uwe5622/unisocwcn/platform/wcn_txrx.c | 0 - .../uwe5622/unisocwcn/platform/wcn_txrx.h | 0 - .../wireless/uwe5622/unisocwcn/sdio/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/sdio/Makefile | 0 - .../wireless/uwe5622/unisocwcn/sdio/sdio_v3.c | 16 +- - .../wireless/uwe5622/unisocwcn/sdio/sdiohal.h | 2 +- - .../uwe5622/unisocwcn/sdio/sdiohal_common.c | 0 - .../uwe5622/unisocwcn/sdio/sdiohal_ctl.c | 0 - .../uwe5622/unisocwcn/sdio/sdiohal_main.c | 19 +- - .../uwe5622/unisocwcn/sdio/sdiohal_rx.c | 2 +- - .../uwe5622/unisocwcn/sdio/sdiohal_tx.c | 2 +- - .../wireless/uwe5622/unisocwcn/sipc/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/sipc/Makefile | 0 - .../uwe5622/unisocwcn/sipc/wcn_sipc.c | 0 - .../uwe5622/unisocwcn/sipc/wcn_sipc.h | 0 - .../wireless/uwe5622/unisocwcn/sleep/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/sleep/Makefile | 0 - .../uwe5622/unisocwcn/sleep/sdio_int.c | 0 - .../uwe5622/unisocwcn/sleep/sdio_int.h | 0 - .../uwe5622/unisocwcn/sleep/slp_mgr.c | 0 - .../uwe5622/unisocwcn/sleep/slp_mgr.h | 0 - .../uwe5622/unisocwcn/sleep/slp_pcie.c | 0 - .../uwe5622/unisocwcn/sleep/slp_pcie.h | 0 - .../uwe5622/unisocwcn/sleep/slp_sdio.c | 1 + - .../uwe5622/unisocwcn/sleep/slp_sdio.h | 1 + - .../uwe5622/unisocwcn/sleep/slp_test.c | 0 - .../wireless/uwe5622/unisocwcn/tool/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/tool/Makefile | 0 - .../unisocwcn/tool/cp2log_config/readme.txt | 0 - .../cp2log_config/unisoc_cp2log_config.txt | 0 - .../wireless/uwe5622/unisocwcn/usb/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/usb/Makefile | 0 - .../wireless/uwe5622/unisocwcn/usb/wcn_usb.c | 0 - .../wireless/uwe5622/unisocwcn/usb/wcn_usb.h | 0 - .../uwe5622/unisocwcn/usb/wcn_usb_download.c | 8 +- - .../uwe5622/unisocwcn/usb/wcn_usb_io.c | 0 - .../uwe5622/unisocwcn/usb/wcn_usb_rx_tx.c | 0 - .../uwe5622/unisocwcn/usb/wcn_usb_store.c | 0 - .../uwe5622/unisocwcn/usb/wcn_usb_test.c | 4 - - .../net/wireless/uwe5622/unisocwcn/vm/Kconfig | 0 - .../wireless/uwe5622/unisocwcn/vm/Makefile | 0 - .../net/wireless/uwe5622/unisocwcn/wcn_bus.c | 0 - drivers/net/wireless/uwe5622/unisocwifi/11h.c | 10 +- - drivers/net/wireless/uwe5622/unisocwifi/11h.h | 0 - .../wireless/uwe5622/unisocwifi/Android.mk | 0 - .../net/wireless/uwe5622/unisocwifi/Kconfig | 0 - .../net/wireless/uwe5622/unisocwifi/Makefile | 0 - .../wireless/uwe5622/unisocwifi/api_version.c | 4 - - .../wireless/uwe5622/unisocwifi/cfg80211.c | 63 +- - .../wireless/uwe5622/unisocwifi/cfg80211.h | 0 - .../net/wireless/uwe5622/unisocwifi/cmdevt.c | 251 +-- - .../net/wireless/uwe5622/unisocwifi/cmdevt.h | 0 - .../uwe5622/unisocwifi/dbg_ini_util.c | 0 - .../uwe5622/unisocwifi/dbg_ini_util.h | 0 - .../net/wireless/uwe5622/unisocwifi/debug.c | 0 - .../net/wireless/uwe5622/unisocwifi/debug.h | 0 - .../net/wireless/uwe5622/unisocwifi/defrag.c | 0 - .../net/wireless/uwe5622/unisocwifi/defrag.h | 0 - .../wireless/uwe5622/unisocwifi/edma_test.c | 0 - .../wireless/uwe5622/unisocwifi/edma_test.h | 0 - .../net/wireless/uwe5622/unisocwifi/ibss.c | 0 - .../net/wireless/uwe5622/unisocwifi/ibss.h | 0 - .../net/wireless/uwe5622/unisocwifi/intf.h | 20 +- - .../wireless/uwe5622/unisocwifi/intf_ops.h | 22 - - .../net/wireless/uwe5622/unisocwifi/main.c | 12 +- - drivers/net/wireless/uwe5622/unisocwifi/mm.c | 0 - drivers/net/wireless/uwe5622/unisocwifi/mm.h | 0 - drivers/net/wireless/uwe5622/unisocwifi/msg.c | 2 - - drivers/net/wireless/uwe5622/unisocwifi/msg.h | 2 - - drivers/net/wireless/uwe5622/unisocwifi/nan.c | 0 - drivers/net/wireless/uwe5622/unisocwifi/nan.h | 0 - drivers/net/wireless/uwe5622/unisocwifi/npi.c | 18 +- - drivers/net/wireless/uwe5622/unisocwifi/npi.h | 0 - drivers/net/wireless/uwe5622/unisocwifi/qos.c | 53 +- - drivers/net/wireless/uwe5622/unisocwifi/qos.h | 4 +- - .../wireless/uwe5622/unisocwifi/reg_domain.c | 0 - .../wireless/uwe5622/unisocwifi/reg_domain.h | 0 - .../net/wireless/uwe5622/unisocwifi/reorder.c | 0 - .../net/wireless/uwe5622/unisocwifi/reorder.h | 0 - .../wireless/uwe5622/unisocwifi/rf_marlin3.c | 4 +- - .../wireless/uwe5622/unisocwifi/rf_marlin3.h | 0 - .../wireless/uwe5622/unisocwifi/rfkill-bt.c | 825 ++++++++++ - .../wireless/uwe5622/unisocwifi/rfkill-wlan.c | 971 +++++++++++ - .../uwe5622/unisocwifi/rnd_mac_addr.c | 0 - .../uwe5622/unisocwifi/rnd_mac_addr.h | 0 - drivers/net/wireless/uwe5622/unisocwifi/rtt.c | 0 - drivers/net/wireless/uwe5622/unisocwifi/rtt.h | 0 - .../net/wireless/uwe5622/unisocwifi/rx_msg.c | 10 - - .../net/wireless/uwe5622/unisocwifi/rx_msg.h | 0 - .../wireless/uwe5622/unisocwifi/softap_hook.c | 0 - .../wireless/uwe5622/unisocwifi/softap_hook.h | 0 - .../net/wireless/uwe5622/unisocwifi/sprdwl.h | 2 - - .../net/wireless/uwe5622/unisocwifi/tcp_ack.c | 0 - .../net/wireless/uwe5622/unisocwifi/tcp_ack.h | 0 - .../net/wireless/uwe5622/unisocwifi/tracer.c | 0 - .../net/wireless/uwe5622/unisocwifi/tracer.h | 0 - .../net/wireless/uwe5622/unisocwifi/tx_msg.c | 10 +- - .../net/wireless/uwe5622/unisocwifi/tx_msg.h | 0 - .../net/wireless/uwe5622/unisocwifi/txrx.c | 39 +- - .../net/wireless/uwe5622/unisocwifi/txrx.h | 0 - .../net/wireless/uwe5622/unisocwifi/vendor.c | 14 +- - .../net/wireless/uwe5622/unisocwifi/vendor.h | 0 - .../net/wireless/uwe5622/unisocwifi/version.h | 0 - .../net/wireless/uwe5622/unisocwifi/wl_core.c | 156 +- - .../net/wireless/uwe5622/unisocwifi/wl_core.h | 0 - .../net/wireless/uwe5622/unisocwifi/wl_intf.c | 112 +- - .../net/wireless/uwe5622/unisocwifi/wl_intf.h | 2 - - .../net/wireless/uwe5622/unisocwifi/work.c | 0 - .../net/wireless/uwe5622/unisocwifi/work.h | 0 - 218 files changed, 3730 insertions(+), 849 deletions(-) - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/Makefile - create mode 100755 drivers/net/wireless/uwe5622/tty-sdio/Makefile.old - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/alignment/sitm.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/alignment/sitm.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/dump.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/dump.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/lpm.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/lpm.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/rfkill.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/rfkill.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/tty.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/tty.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/woble.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/tty-sdio/woble.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/gnss_firmware_bin.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/marlin_firmware_bin.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_boot.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_boot.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/boot/wcn_integrate_dev.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/fw/bin2hex.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/fw/firmware_hex.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/fw/usb_fdl.bin.hex - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/fw/version.txt - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/fw/wcnmodem.bin.hex - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/gnss/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/gnss/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/bus_common.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/mchn.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/uwe5621_glb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/uwe5622_glb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/uwe5623_glb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/uwe562x_glb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/vendor/hisilicon/hi_drv_gpio.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/vendor/hisilicon/hi_type.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/wcn_bus.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/wcn_glb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/wcn_glb_reg.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/include/wcn_types.h - create mode 100755 drivers/net/wireless/uwe5622/unisocwcn/include/wcn_wrapper.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/log/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/log/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/edma_engine.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/edma_engine.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/edma_test.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/ioctl.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/ioctl.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/mchn.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/mchn.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/pcie.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/pcie.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/pcie_attach_bus.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/pcie_dbg.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/pcie/pcie_dbg.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_common.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_common_ctl.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_dbg.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_dump.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_dump.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/gnss/gnss_pmnotify_ctl.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/loopcheck.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/loopcheck.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/mdbg_type.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/mem_pd_mgr.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/mem_pd_mgr.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/rdc_debug.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/rdc_debug.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/rf/rf.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/rf/rf.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/usb_boot.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/usb_boot.h - create mode 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_bind_helper.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_debugfs.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_dump.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_dump.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_dump_integrate.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_dump_integrate.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_gnss.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_log.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_log.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_op.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_op.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_parn_parser.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_swd_dp.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_swd_dp.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_txrx.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_txrx.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_common.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_ctl.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sipc/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sipc/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sipc/wcn_sipc.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sipc/wcn_sipc.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/sdio_int.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/sdio_int.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_mgr.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_mgr.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_pcie.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_pcie.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_sdio.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_sdio.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/sleep/slp_test.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/tool/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/tool/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/tool/cp2log_config/readme.txt - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/tool/cp2log_config/unisoc_cp2log_config.txt - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_io.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_rx_tx.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_store.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_test.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/vm/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/vm/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwcn/wcn_bus.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/11h.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/11h.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/Android.mk - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/Kconfig - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/Makefile - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/api_version.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/cfg80211.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/cmdevt.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/dbg_ini_util.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/dbg_ini_util.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/debug.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/debug.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/defrag.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/defrag.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/edma_test.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/edma_test.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/ibss.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/ibss.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/intf.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/main.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/mm.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/mm.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/msg.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/msg.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/nan.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/nan.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/npi.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/npi.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/qos.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/qos.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/reg_domain.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/reg_domain.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/reorder.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/reorder.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.h - create mode 100644 drivers/net/wireless/uwe5622/unisocwifi/rfkill-bt.c - create mode 100644 drivers/net/wireless/uwe5622/unisocwifi/rfkill-wlan.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rnd_mac_addr.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rnd_mac_addr.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rtt.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rtt.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/rx_msg.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/softap_hook.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/softap_hook.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tcp_ack.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tcp_ack.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tracer.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tracer.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/tx_msg.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/txrx.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/txrx.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/vendor.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/vendor.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/version.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/wl_core.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/wl_core.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/work.c - mode change 100644 => 100755 drivers/net/wireless/uwe5622/unisocwifi/work.h + drivers/net/wireless/uwe5622/Kconfig | 3 +- + drivers/net/wireless/uwe5622/Makefile | 2 +- + drivers/net/wireless/uwe5622/tty-sdio/Makefile | 9 +- + drivers/net/wireless/uwe5622/unisocwcn/Makefile | 4 +- + drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h | 3 +- + drivers/net/wireless/uwe5622/unisocwcn/include/wcn_wrapper.h | 20 + + drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c | 1 + + drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c | 2 - + drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_bind_helper.c | 1444 ++++++++++ + drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c | 10 +- + drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c | 13 +- + drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c | 11 +- + drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c | 12 +- + drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h | 2 +- + drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c | 19 +- + drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c | 2 +- + drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c | 2 +- + drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c | 4 + + drivers/net/wireless/uwe5622/unisocwifi/api_version.c | 4 - + drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c | 59 +- + drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c | 241 +- + drivers/net/wireless/uwe5622/unisocwifi/intf.h | 20 +- + drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h | 22 - + drivers/net/wireless/uwe5622/unisocwifi/main.c | 12 +- + drivers/net/wireless/uwe5622/unisocwifi/msg.c | 2 - + drivers/net/wireless/uwe5622/unisocwifi/msg.h | 2 - + drivers/net/wireless/uwe5622/unisocwifi/npi.c | 18 +- + drivers/net/wireless/uwe5622/unisocwifi/qos.c | 53 +- + drivers/net/wireless/uwe5622/unisocwifi/qos.h | 4 +- + drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c | 4 +- + drivers/net/wireless/uwe5622/unisocwifi/rfkill-bt.c | 825 ++++++ + drivers/net/wireless/uwe5622/unisocwifi/rfkill-wlan.c | 971 +++++++ + drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c | 10 - + drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h | 2 - + drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c | 10 +- + drivers/net/wireless/uwe5622/unisocwifi/txrx.c | 23 +- + drivers/net/wireless/uwe5622/unisocwifi/vendor.c | 2 +- + drivers/net/wireless/uwe5622/unisocwifi/wl_core.c | 108 +- + drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c | 112 +- + drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h | 2 - + 40 files changed, 3472 insertions(+), 597 deletions(-) diff --git a/drivers/net/wireless/uwe5622/Kconfig b/drivers/net/wireless/uwe5622/Kconfig -index a1e123b039b..fe6c8d115c9 100644 +index a1e123b039bd..fe6c8d115c92 100644 --- a/drivers/net/wireless/uwe5622/Kconfig +++ b/drivers/net/wireless/uwe5622/Kconfig @@ -1,7 +1,6 @@ @@ -454,7 +60,7 @@ index a1e123b039b..fe6c8d115c9 100644 help This is support for spreadtrum wireless chip. diff --git a/drivers/net/wireless/uwe5622/Makefile b/drivers/net/wireless/uwe5622/Makefile -index a5767f50df8..d2210439f3c 100644 +index a5767f50df80..d2210439f3cc 100644 --- a/drivers/net/wireless/uwe5622/Makefile +++ b/drivers/net/wireless/uwe5622/Makefile @@ -1,4 +1,4 @@ @@ -466,7 +72,7 @@ index a5767f50df8..d2210439f3c 100644 diff --git a/drivers/net/wireless/uwe5622/tty-sdio/Makefile b/drivers/net/wireless/uwe5622/tty-sdio/Makefile old mode 100644 new mode 100755 -index 9dcb75258df..2f6f89189e8 +index 9dcb75258dfe..2f6f89189e8a --- a/drivers/net/wireless/uwe5622/tty-sdio/Makefile +++ b/drivers/net/wireless/uwe5622/tty-sdio/Makefile @@ -1,13 +1,16 @@ @@ -494,11 +100,10 @@ index 9dcb75258df..2f6f89189e8 obj-$(CONFIG_TTY_OVERY_SDIO) += sprdbt_tty.o - +endif - diff --git a/drivers/net/wireless/uwe5622/unisocwcn/Makefile b/drivers/net/wireless/uwe5622/unisocwcn/Makefile old mode 100644 new mode 100755 -index f9c59574754..939acb5c927 +index f9c595747547..939acb5c9274 --- a/drivers/net/wireless/uwe5622/unisocwcn/Makefile +++ b/drivers/net/wireless/uwe5622/unisocwcn/Makefile @@ -70,8 +70,8 @@ ifeq ($(CONFIG_RK_WIFI_DEVICE_UWE5622),y) @@ -512,11 +117,10 @@ index f9c59574754..939acb5c927 BSP_CHIP_ID := uwe5622 WCN_HW_TYPE := sdio endif - diff --git a/drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h b/drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h old mode 100644 new mode 100755 -index 7a78181a458..ae8daac4664 +index 7a78181a4586..ae8daac46644 --- a/drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h +++ b/drivers/net/wireless/uwe5622/unisocwcn/include/marlin_platform.h @@ -83,8 +83,7 @@ enum marlin_wake_host_en { @@ -529,10 +133,9 @@ index 7a78181a458..ae8daac4664 }; enum wcn_hw_type wcn_get_hw_if_type(void); - diff --git a/drivers/net/wireless/uwe5622/unisocwcn/include/wcn_wrapper.h b/drivers/net/wireless/uwe5622/unisocwcn/include/wcn_wrapper.h new file mode 100755 -index 00000000000..909a4c7ecce +index 000000000000..909a4c7ecce0 --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/include/wcn_wrapper.h @@ -0,0 +1,20 @@ @@ -560,7 +163,7 @@ index 00000000000..909a4c7ecce diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c old mode 100644 new mode 100755 -index 7cb79f2f2d0..0473748a2a5 +index 7cb79f2f2d0c..b8459b914cb1 --- a/drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/bufring.c @@ -117,6 +117,7 @@ void mdbg_ring_destroy(struct mdbg_ring_t *ring) @@ -570,11 +173,11 @@ index 7cb79f2f2d0..0473748a2a5 + ring = NULL; } } - + diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c old mode 100644 new mode 100755 -index 9ce23ada563..26824b505ba +index 9ce23ada5635..26824b505ba8 --- a/drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/pcie_boot.c @@ -24,8 +24,6 @@ @@ -586,10 +189,9 @@ index 9ce23ada563..26824b505ba static char *load_firmware_data(int size) { int read_len; - diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_bind_helper.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_bind_helper.c new file mode 100755 -index 00000000000..6454d62766d +index 000000000000..6454d62766d9 --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_bind_helper.c @@ -0,0 +1,1444 @@ @@ -2040,7 +1642,7 @@ index 00000000000..6454d62766d diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c old mode 100644 new mode 100755 -index 220bac67ddd..58b9d290f23 +index b243b39c2133..83b899e5e2de --- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_boot.c @@ -92,7 +92,7 @@ struct gpio_config { @@ -2052,7 +1654,7 @@ index 220bac67ddd..58b9d290f23 /* path of cp2 firmware. */ #ifdef CONFIG_CUSTOMIZE_UNISOC_FW_PATH #define UNISOC_FW_PATH_DEFAULT CONFIG_CUSTOMIZE_UNISOC_FW_PATH -@@ -2318,7 +2316,7 @@ static int marlin_start_run(void) +@@ -2313,7 +2313,7 @@ static int marlin_start_run(void) return ret; } @@ -2061,7 +1663,7 @@ index 220bac67ddd..58b9d290f23 #include static void expand_seed(u8 *seed, u8 *out) -@@ -2424,7 +2422,7 @@ static int marlin_bind_verify(void) +@@ -2419,7 +2419,7 @@ static int marlin_bind_verify(void) return ret; } @@ -2070,7 +1672,7 @@ index 220bac67ddd..58b9d290f23 static int check_cp_ready(void) { -@@ -2449,7 +2447,7 @@ static int check_cp_ready(void) +@@ -2444,7 +2444,7 @@ static int check_cp_ready(void) marlin_dev->sync_f.prj_type); if (marlin_dev->sync_f.init_status == SYNC_ALL_FINISHED) i = 0; @@ -2079,7 +1681,7 @@ index 220bac67ddd..58b9d290f23 else if (marlin_dev->sync_f.init_status == SYNC_VERIFY_WAITING) { ret = marlin_bind_verify(); -@@ -2459,7 +2457,7 @@ static int check_cp_ready(void) +@@ -2454,7 +2454,7 @@ static int check_cp_ready(void) return ret; } } @@ -2091,7 +1693,7 @@ index 220bac67ddd..58b9d290f23 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c old mode 100644 new mode 100755 -index 126746321ef..e7e48258c21 +index 126746321efc..e7e48258c216 --- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_misc.c @@ -18,7 +18,8 @@ @@ -2130,7 +1732,7 @@ index 126746321ef..e7e48258c21 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c old mode 100644 new mode 100755 -index 77b4ec259e3..ce3f8d110ae +index 77b4ec259e3d..30b53a4a00ca --- a/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/platform/wcn_procfs.c @@ -94,12 +94,12 @@ void mdbg_assert_interface(char *str) @@ -2158,7 +1760,7 @@ index 77b4ec259e3..ce3f8d110ae #endif } -@@ -764,12 +761,6 @@ static ssize_t mdbg_proc_write(struct file *filp, +@@ -764,12 +765,6 @@ static ssize_t mdbg_proc_write(struct file *filp, return count; } @@ -2174,7 +1776,7 @@ index 77b4ec259e3..ce3f8d110ae diff --git a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c old mode 100644 new mode 100755 -index 98f48335316..a37fe8c55d6 +index 98f483353168..eec80dea067b --- a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdio_v3.c @@ -128,9 +128,9 @@ static void sdio_remove_card(void) @@ -2206,7 +1808,7 @@ index 98f48335316..a37fe8c55d6 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h old mode 100644 new mode 100755 -index c26bfb3251b..f87dfafe9c8 +index c26bfb3251b4..f87dfafe9c83 --- a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal.h @@ -62,7 +62,7 @@ extern long int sdiohal_log_level; @@ -2221,7 +1823,7 @@ index c26bfb3251b..f87dfafe9c8 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c old mode 100644 new mode 100755 -index 0f67a7f35c3..a10b7909e95 +index 0f67a7f35c30..a10b7909e95d --- a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_main.c @@ -48,9 +48,9 @@ extern void sdio_clk_always_on(int on); @@ -2267,7 +1869,7 @@ index 0f67a7f35c3..a10b7909e95 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c old mode 100644 new mode 100755 -index 2a64dac7af5..e968c09b233 +index 2a64dac7af55..e968c09b2335 --- a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_rx.c @@ -205,7 +205,7 @@ int sdiohal_rx_thread(void *data) @@ -2282,7 +1884,7 @@ index 2a64dac7af5..e968c09b233 diff --git a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c old mode 100644 new mode 100755 -index c0790f6cdd1..b3b000e951b +index c0790f6cdd13..b3b000e951b8 --- a/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/sdio/sdiohal_tx.c @@ -141,7 +141,7 @@ int sdiohal_tx_thread(void *data) @@ -2297,10 +1899,10 @@ index c0790f6cdd1..b3b000e951b diff --git a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c old mode 100644 new mode 100755 -index 6e95b0f3ce8..0c2664d876f +index 6e95b0f3ce87..0039e23426ee --- a/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c +++ b/drivers/net/wireless/uwe5622/unisocwcn/usb/wcn_usb_download.c -@@ -344,3 +340,7 @@ int wcn_usb_dinit(void) +@@ -344,3 +344,7 @@ int wcn_usb_dinit(void) if (!this->download) wcn_usb_dp("%s create file[download] failed\n", __func__); @@ -2311,7 +1913,7 @@ index 6e95b0f3ce8..0c2664d876f diff --git a/drivers/net/wireless/uwe5622/unisocwifi/api_version.c b/drivers/net/wireless/uwe5622/unisocwifi/api_version.c old mode 100644 new mode 100755 -index 91bcfee46fb..b677980115e +index 91bcfee46fb8..b677980115ef --- a/drivers/net/wireless/uwe5622/unisocwifi/api_version.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/api_version.c @@ -449,11 +449,7 @@ int sprdwl_api_available_check(struct sprdwl_priv *priv, @@ -2329,10 +1931,10 @@ index 91bcfee46fb..b677980115e diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c old mode 100644 new mode 100755 -index 53b5fd0ec29..f26113c08af +index b2f9a877edce..64e15243dc84 --- a/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/cfg80211.c -@@ -1725,20 +1721,6 @@ static int sprdwl_cfg80211_sched_scan_stop(struct wiphy *wiphy, +@@ -1725,20 +1725,6 @@ static int sprdwl_cfg80211_sched_scan_stop(struct wiphy *wiphy, #ifdef SYNC_DISCONNECT void sprdwl_disconnect_handle(struct sprdwl_vif *vif) { @@ -2353,7 +1955,7 @@ index 53b5fd0ec29..f26113c08af vif->sm_state = SPRDWL_DISCONNECTED; /* Clear bssid & ssid */ -@@ -1784,19 +1766,17 @@ static int sprdwl_cfg80211_disconnect(struct wiphy *wiphy, +@@ -1788,19 +1774,17 @@ static int sprdwl_cfg80211_disconnect(struct wiphy *wiphy, goto out; } #ifdef SYNC_DISCONNECT @@ -2376,7 +1978,7 @@ index 53b5fd0ec29..f26113c08af #endif trace_deauth_reason(vif->mode, reason_code, LOCAL_EVENT); out: -@@ -2249,9 +2229,8 @@ void sprdwl_report_scan_result(struct sprdwl_vif *vif, u16 chan, s16 rssi, +@@ -2253,9 +2237,8 @@ void sprdwl_report_scan_result(struct sprdwl_vif *vif, u16 chan, s16 rssi, ie, ielen, signal, GFP_KERNEL); if (unlikely(!bss)) @@ -2388,7 +1990,7 @@ index 53b5fd0ec29..f26113c08af cfg80211_put_bss(wiphy, bss); /*check log mac flag and call report fake probe*/ -@@ -2382,11 +2361,10 @@ void sprdwl_report_connection(struct sprdwl_vif *vif, +@@ -2386,11 +2369,10 @@ void sprdwl_report_connection(struct sprdwl_vif *vif, mgmt->bssid, tsf, capability, beacon_interval, ie, ielen, conn_info->signal, GFP_KERNEL); @@ -2404,7 +2006,7 @@ index 53b5fd0ec29..f26113c08af } else { wl_ndev_log(L_ERR, vif->ndev, "%s No Beason IE!\n", __func__); } -@@ -2702,9 +2680,24 @@ static int sprdwl_cfg80211_mgmt_tx(struct wiphy *wiphy, +@@ -2706,9 +2688,24 @@ static int sprdwl_cfg80211_mgmt_tx(struct wiphy *wiphy, /* send tx mgmt */ if (len > 0) { ret = sprdwl_tx_mgmt(vif->priv, vif->ctx_id, @@ -2432,7 +2034,7 @@ index 53b5fd0ec29..f26113c08af if (ret) if (!dont_wait_for_ack) cfg80211_mgmt_tx_status(wdev, *cookie, buf, len, -@@ -3110,7 +3103,7 @@ static int sprdwl_cfg80211_set_mac_acl(struct wiphy *wiphy, +@@ -3117,7 +3114,7 @@ static int sprdwl_cfg80211_set_mac_acl(struct wiphy *wiphy, unsigned char *mac_addr = NULL; if (!acl || !acl->n_acl_entries) { @@ -2440,11 +2042,11 @@ index 53b5fd0ec29..f26113c08af + wl_ndev_log(L_ERR, ndev, "%s no ACL data\n", __func__); return 0; } - + diff --git a/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c old mode 100644 new mode 100755 -index 809e24ca700..42c394d22b9 +index 55c76b74195a..1f2f6efb9184 --- a/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/cmdevt.c @@ -400,7 +400,6 @@ struct sprdwl_msg_buf *__sprdwl_cmd_getbuf(struct sprdwl_priv *priv, @@ -2938,7 +2540,7 @@ index 809e24ca700..42c394d22b9 } void sprdwl_event_mic_failure(struct sprdwl_vif *vif, u8 *data, u16 len) -@@ -3600,11 +3471,9 @@ unsigned short sprdwl_rx_event_process(struct sprdwl_priv *priv, u8 *msg) +@@ -3600,11 +3475,9 @@ unsigned short sprdwl_rx_event_process(struct sprdwl_priv *priv, u8 *msg) sprdwl_event_nan(vif, data, len); break; #endif /* NAN_SUPPORT */ @@ -2950,7 +2552,7 @@ index 809e24ca700..42c394d22b9 case WIFI_EVENT_BA: sprdwl_event_ba_mgmt(vif, data, len); break; -@@ -3724,14 +3593,14 @@ int sprdwl_sync_disconnect_event(struct sprdwl_vif *vif, unsigned int timeout) +@@ -3724,14 +3597,14 @@ int sprdwl_sync_disconnect_event(struct sprdwl_vif *vif, unsigned int timeout) #endif int sprdwl_set_packet_offload(struct sprdwl_priv *priv, u8 vif_ctx_id, @@ -2968,11 +2570,10 @@ index 809e24ca700..42c394d22b9 msg = sprdwl_cmd_getbuf(priv, sizeof(*p) + len, vif_ctx_id, SPRDWL_HEAD_RSP, WIFI_CMD_PACKET_OFFLOAD); - diff --git a/drivers/net/wireless/uwe5622/unisocwifi/intf.h b/drivers/net/wireless/uwe5622/unisocwifi/intf.h old mode 100644 new mode 100755 -index c17356251e0..41b9bd5a3fe +index c17356251e02..41b9bd5a3fe9 --- a/drivers/net/wireless/uwe5622/unisocwifi/intf.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/intf.h @@ -24,35 +24,17 @@ struct sprdwl_priv; @@ -3015,7 +2616,7 @@ index c17356251e0..41b9bd5a3fe diff --git a/drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h b/drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h old mode 100644 new mode 100755 -index 3844b0b0676..c580b304026 +index 3844b0b06767..c580b3040260 --- a/drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/intf_ops.h @@ -28,11 +28,7 @@ inline struct sprdwl_msg_buf *sprdwl_intf_get_msg_buf(struct sprdwl_priv *priv, @@ -3080,7 +2681,7 @@ index 3844b0b0676..c580b304026 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/main.c b/drivers/net/wireless/uwe5622/unisocwifi/main.c old mode 100644 new mode 100755 -index 46b9039519c..f1d6d7285d8 +index 46b9039519cd..f1d6d7285d88 --- a/drivers/net/wireless/uwe5622/unisocwifi/main.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/main.c @@ -994,9 +994,8 @@ static int sprdwl_inetaddr_event(struct notifier_block *this, @@ -3112,7 +2713,7 @@ index 46b9039519c..f1d6d7285d8 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/msg.c b/drivers/net/wireless/uwe5622/unisocwifi/msg.c old mode 100644 new mode 100755 -index f71a6879615..47f78c4343b +index f71a6879615d..47f78c4343be --- a/drivers/net/wireless/uwe5622/unisocwifi/msg.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/msg.c @@ -169,7 +169,6 @@ struct sprdwl_msg_buf *sprdwl_get_msgbuf_by_data(void *data, @@ -3132,7 +2733,7 @@ index f71a6879615..47f78c4343b diff --git a/drivers/net/wireless/uwe5622/unisocwifi/msg.h b/drivers/net/wireless/uwe5622/unisocwifi/msg.h old mode 100644 new mode 100755 -index 67a4b474e74..dd57521ae70 +index 67a4b474e74e..dd57521ae708 --- a/drivers/net/wireless/uwe5622/unisocwifi/msg.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/msg.h @@ -215,7 +215,5 @@ void sprdwl_dequeue_msg_buf(struct sprdwl_msg_buf *msg_buf, @@ -3146,7 +2747,7 @@ index 67a4b474e74..dd57521ae70 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/npi.c b/drivers/net/wireless/uwe5622/unisocwifi/npi.c old mode 100644 new mode 100755 -index 90b333b701b..e165d2aa71a +index 42fe960c8289..a71d18a01d46 --- a/drivers/net/wireless/uwe5622/unisocwifi/npi.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/npi.c @@ -33,9 +33,6 @@ static struct genl_family sprdwl_nl_genl_family; @@ -3214,7 +2815,7 @@ index 90b333b701b..e165d2aa71a diff --git a/drivers/net/wireless/uwe5622/unisocwifi/qos.c b/drivers/net/wireless/uwe5622/unisocwifi/qos.c old mode 100644 new mode 100755 -index d0e42a882cb..7abcc0a02ee +index d0e42a882cb4..7abcc0a02ee3 --- a/drivers/net/wireless/uwe5622/unisocwifi/qos.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/qos.c @@ -552,15 +552,9 @@ void wmm_ac_init(struct sprdwl_priv *priv) @@ -3317,7 +2918,7 @@ index d0e42a882cb..7abcc0a02ee diff --git a/drivers/net/wireless/uwe5622/unisocwifi/qos.h b/drivers/net/wireless/uwe5622/unisocwifi/qos.h old mode 100644 new mode 100755 -index 3d69d1c5730..06eeb5c8161 +index 3d69d1c5730a..06eeb5c81618 --- a/drivers/net/wireless/uwe5622/unisocwifi/qos.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/qos.h @@ -237,13 +237,11 @@ u16 get_wmmac_admitted_time(u8 tsid); @@ -3338,7 +2939,7 @@ index 3d69d1c5730..06eeb5c8161 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c b/drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c old mode 100644 new mode 100755 -index ca307f12ac9..a2f6cc394ce +index ca307f12ac99..a2f6cc394ce1 --- a/drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/rf_marlin3.c @@ -181,9 +181,9 @@ static struct nvm_name_table g_config_table[] = { @@ -3355,7 +2956,7 @@ index ca307f12ac9..a2f6cc394ce CF_TAB("Chain0_165", tx_scale.chain0[38][0], 1), diff --git a/drivers/net/wireless/uwe5622/unisocwifi/rfkill-bt.c b/drivers/net/wireless/uwe5622/unisocwifi/rfkill-bt.c new file mode 100644 -index 00000000000..a3abdd850ff +index 000000000000..a3abdd850ffa --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwifi/rfkill-bt.c @@ -0,0 +1,825 @@ @@ -4186,7 +3787,7 @@ index 00000000000..a3abdd850ff +MODULE_LICENSE("GPL"); diff --git a/drivers/net/wireless/uwe5622/unisocwifi/rfkill-wlan.c b/drivers/net/wireless/uwe5622/unisocwifi/rfkill-wlan.c new file mode 100644 -index 00000000000..a0933abb0bf +index 000000000000..a0933abb0bfa --- /dev/null +++ b/drivers/net/wireless/uwe5622/unisocwifi/rfkill-wlan.c @@ -0,0 +1,971 @@ @@ -5164,7 +4765,7 @@ index 00000000000..a0933abb0bf diff --git a/drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c b/drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c old mode 100644 new mode 100755 -index b51207d19c8..d80267ad55e +index b51207d19c89..d80267ad55ef --- a/drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/rx_msg.c @@ -384,9 +384,6 @@ int sprdwl_pkt_log_save(struct sprdwl_intf *intf, void *data) @@ -5201,7 +4802,7 @@ index b51207d19c8..d80267ad55e diff --git a/drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h b/drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h old mode 100644 new mode 100755 -index a1b2f8544ec..f612a9e9967 +index a1b2f8544ec4..f612a9e9967b --- a/drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/sprdwl.h @@ -176,8 +176,6 @@ struct wmm_params_element { @@ -5216,7 +4817,7 @@ index a1b2f8544ec..f612a9e9967 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c b/drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c old mode 100644 new mode 100755 -index 40d51a7130d..d7375248dde +index 40d51a7130d9..d7375248ddef --- a/drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/tx_msg.c @@ -530,9 +530,9 @@ void sprdwl_fc_add_share_credit(struct sprdwl_vif *vif) @@ -5246,7 +4847,7 @@ index 40d51a7130d..d7375248dde diff --git a/drivers/net/wireless/uwe5622/unisocwifi/txrx.c b/drivers/net/wireless/uwe5622/unisocwifi/txrx.c old mode 100644 new mode 100755 -index 227339ada73..b0a24a3615b +index 227339ada73f..a7a21aacffcf --- a/drivers/net/wireless/uwe5622/unisocwifi/txrx.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/txrx.c @@ -23,9 +23,7 @@ @@ -5306,11 +4907,10 @@ index 227339ada73..b0a24a3615b } return ret; - diff --git a/drivers/net/wireless/uwe5622/unisocwifi/vendor.c b/drivers/net/wireless/uwe5622/unisocwifi/vendor.c old mode 100644 new mode 100755 -index 6fba95b60d6..1b4ec43ce59 +index 6fba95b60d62..85b12b78dd72 --- a/drivers/net/wireless/uwe5622/unisocwifi/vendor.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/vendor.c @@ -453,7 +453,7 @@ static int sprdwl_vendor_get_llstat_handler(struct wiphy *wiphy, @@ -5322,31 +4922,10 @@ index 6fba95b60d6..1b4ec43ce59 u32 reply_radio_length, reply_iface_length; struct sprdwl_priv *priv = wiphy_priv(wiphy); - -@@ -575,7 +575,7 @@ static int sprdwl_vendor_clr_llstat_handler(struct wiphy *wiphy, - struct nlattr *tb[SPRDWL_LL_STATS_CLR_MAX + 1]; - u32 *stats_clear_rsp_mask, stats_clear_req_mask = 0; - u16 r_len = sizeof(*stats_clear_rsp_mask); -- u8 r_buf[r_len]; -+ u8 r_buf[sizeof(*stats_clear_rsp_mask)]; - u32 reply_length, ret, err; - - struct sprdwl_priv *priv = wiphy_priv(wiphy); -@@ -2409,8 +2409,8 @@ static int sprdwl_vendor_memory_dump(struct wiphy *wiphy, - /*CMD ID:61*/ - static const struct nla_policy sprdwl_get_wifi_info_policy[ - SPRDWL_ATTR_WIFI_INFO_GET_MAX + 1] = { -- [SPRDWL_ATTR_WIFI_INFO_DRIVER_VERSION] = {.type = NLA_U8}, -- [SPRDWL_ATTR_WIFI_INFO_FIRMWARE_VERSION] = {.type = NLA_U8}, -+ [SPRDWL_ATTR_WIFI_INFO_DRIVER_VERSION] = {.type = NLA_U32}, -+ [SPRDWL_ATTR_WIFI_INFO_FIRMWARE_VERSION] = {.type = NLA_U32}, - }; - - static int sprdwl_vendor_get_driver_info(struct wiphy *wiphy, diff --git a/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c b/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c old mode 100644 new mode 100755 -index 042a4df0161..19a00d1f384 +index 4ffaacb58de5..206824604ec5 --- a/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/wl_core.c @@ -538,20 +538,12 @@ static struct notifier_block boost_notifier = { @@ -5517,7 +5096,7 @@ index 042a4df0161..19a00d1f384 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c b/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c old mode 100644 new mode 100755 -index a6def0e0682..bb8d3762579 +index a6def0e0682d..bb8d37625791 --- a/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c +++ b/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.c @@ -32,6 +32,10 @@ @@ -5731,7 +5310,7 @@ index a6def0e0682..bb8d3762579 diff --git a/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h b/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h old mode 100644 new mode 100755 -index b159c685a5e..7e609023f63 +index b159c685a5e0..7e609023f634 --- a/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h +++ b/drivers/net/wireless/uwe5622/unisocwifi/wl_intf.h @@ -60,7 +60,6 @@ @@ -5749,5 +5328,5 @@ index b159c685a5e..7e609023f63 -void sprdwl_bus_deinit(void); #endif /* __SPRDWL_INTF_SDIO_SC2355_H__ */ -- -2.34.1 +Armbian