Commit 8df245c4 authored by Jakub Kicinski's avatar Jakub Kicinski
Browse files

Merge tag 'wireless-drivers-next-2020-10-09' of... 

Merge tag 'wireless-drivers-next-2020-10-09' of git://git.kernel.org/pub/scm/linux/kernel/git/kvalo/wireless-drivers-next



Kalle Valo says:

====================
wireless-drivers-next patches for v5.10

Fourth and last set of patches for v5.10. Most of these are iwlwifi
patches, but few small fixes to other drivers as well.

Major changes:

iwlwifi

* PNVM support (platform-specific phy config data)

* bump the FW API support to 59
====================

Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parents 16573e7c b7d96bca

drivers/net/wireless/ath/ath11k/mac.c

+3 −1
Original line number Diff line number Diff line
@@ -6041,8 +6041,10 @@ static int ath11k_mac_setup_iface_combinations(struct ath11k *ar) 
	n_limits = 2;



	limits = kcalloc(n_limits, sizeof(*limits), GFP_KERNEL);

	if (!limits)

	if (!limits) {

		kfree(combinations);

		return -ENOMEM;

	}



	limits[0].max = 1;

	limits[0].types |= BIT(NL80211_IFTYPE_STATION);

drivers/net/wireless/intel/iwlwifi/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ iwlwifi-objs += iwl-trans.o 
iwlwifi-objs		+= queue/tx.o



iwlwifi-objs		+= fw/img.o fw/notif-wait.o

iwlwifi-objs		+= fw/dbg.o

iwlwifi-objs		+= fw/dbg.o fw/pnvm.o

iwlwifi-$(CONFIG_IWLMVM) += fw/paging.o fw/smem.o fw/init.o

iwlwifi-$(CONFIG_ACPI) += fw/acpi.o

iwlwifi-$(CONFIG_IWLWIFI_DEBUGFS) += fw/debugfs.o

drivers/net/wireless/intel/iwlwifi/cfg/22000.c

+2 −2
Original line number Diff line number Diff line
@@ -57,7 +57,7 @@ 
#include "iwl-prph.h"



/* Highest firmware API version supported */

#define IWL_22000_UCODE_API_MAX	57

#define IWL_22000_UCODE_API_MAX	59



/* Lowest firmware API version supported */

#define IWL_22000_UCODE_API_MIN	39
@@ -253,7 +253,7 @@ const struct iwl_cfg_trans_params iwl_qu_trans_cfg = { 
	.device_family = IWL_DEVICE_FAMILY_22000,

	.base_params = &iwl_22000_base_params,

	.integrated = true,

	.xtal_latency = 5000,

	.xtal_latency = 500,

	.ltr_delay = IWL_CFG_TRANS_LTR_DELAY_200US,

};

drivers/net/wireless/intel/iwlwifi/cfg/9000.c

+13 −4
Original line number Diff line number Diff line
@@ -6,7 +6,7 @@ 
 * GPL LICENSE SUMMARY

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 *

 * This program is free software; you can redistribute it and/or modify

 * it under the terms of version 2 of the GNU General Public License as
@@ -20,7 +20,7 @@ 
 * BSD LICENSE

 *

 * Copyright(c) 2015-2017 Intel Deutschland GmbH

 * Copyright (C) 2018 - 2019 Intel Corporation

 * Copyright(c) 2018 - 2020 Intel Corporation

 * All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without
@@ -180,7 +180,16 @@ const struct iwl_cfg_trans_params iwl9560_trans_cfg = { 
	.mq_rx_supported = true,

	.rf_id = true,

	.integrated = true,

	.xtal_latency = 5000,

	.xtal_latency = 650,

};



const struct iwl_cfg_trans_params iwl9560_long_latency_trans_cfg = {

	.device_family = IWL_DEVICE_FAMILY_9000,

	.base_params = &iwl9000_base_params,

	.mq_rx_supported = true,

	.rf_id = true,

	.integrated = true,

	.xtal_latency = 2820,

};



const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = {
@@ -189,7 +198,7 @@ const struct iwl_cfg_trans_params iwl9560_shared_clk_trans_cfg = { 
	.mq_rx_supported = true,

	.rf_id = true,

	.integrated = true,

	.xtal_latency = 5000,

	.xtal_latency = 670,

	.extra_phy_cfg_flags = FW_PHY_CFG_SHARED_CLK

};

drivers/net/wireless/intel/iwlwifi/dvm/calib.c

+1 −1
Original line number Diff line number Diff line
@@ -761,7 +761,7 @@ static inline u8 find_first_chain(u8 mask) 
	return CHAIN_C;

}



/**

/*

 * Run disconnected antenna algorithm to find out which antennas are

 * disconnected.

 */

CRA Git | Maintained and supported by SUSTech CRA and CCSE