mac80211: rebase ontop of v4.18.5
[openwrt/staging/wigyori.git] / package / kernel / mac80211 / patches / ath / 080-ath10k_thermal_config.patch
1 Index: backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/Kconfig
2 ===================================================================
3 --- backports-v4.18-rc7.orig/drivers/net/wireless/ath/ath10k/Kconfig
4 +++ backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/Kconfig
5 @@ -85,6 +85,12 @@ config ATH10K_TRACING
6 ---help---
7 Select this to ath10k use tracing infrastructure.
8
9 +config ATH10K_THERMAL
10 + bool "Atheros ath10k thermal monitoring support"
11 + depends on THERMAL
12 + ---help---
13 + Select this to ath10k use hwmon for thermal measurement.
14 +
15 config ATH10K_DFS_CERTIFIED
16 bool "Atheros DFS support for certified platforms"
17 depends on ATH10K && CFG80211_CERTIFICATION_ONUS
18 Index: backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/Makefile
19 ===================================================================
20 --- backports-v4.18-rc7.orig/drivers/net/wireless/ath/ath10k/Makefile
21 +++ backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/Makefile
22 @@ -18,7 +18,7 @@ ath10k_core-y += mac.o \
23 ath10k_core-$(CPTCFG_ATH10K_SPECTRAL) += spectral.o
24 ath10k_core-$(CPTCFG_NL80211_TESTMODE) += testmode.o
25 ath10k_core-$(CPTCFG_ATH10K_TRACING) += trace.o
26 -ath10k_core-$(CONFIG_THERMAL) += thermal.o
27 +ath10k_core-$(CPTCFG_ATH10K_THERMAL) += thermal.o
28 ath10k_core-$(CPTCFG_MAC80211_DEBUGFS) += debugfs_sta.o
29 ath10k_core-$(CONFIG_PM) += wow.o
30 ath10k_core-$(CONFIG_DEV_COREDUMP) += coredump.o
31 Index: backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/thermal.h
32 ===================================================================
33 --- backports-v4.18-rc7.orig/drivers/net/wireless/ath/ath10k/thermal.h
34 +++ backports-v4.18-rc7/drivers/net/wireless/ath/ath10k/thermal.h
35 @@ -36,7 +36,7 @@ struct ath10k_thermal {
36 int temperature;
37 };
38
39 -#if IS_REACHABLE(CONFIG_THERMAL)
40 +#if IS_REACHABLE(CPTCFG_ATH10K_THERMAL)
41 int ath10k_thermal_register(struct ath10k *ar);
42 void ath10k_thermal_unregister(struct ath10k *ar);
43 void ath10k_thermal_event_temperature(struct ath10k *ar, int temperature);
44 Index: backports-v4.18-rc7/local-symbols
45 ===================================================================
46 --- backports-v4.18-rc7.orig/local-symbols
47 +++ backports-v4.18-rc7/local-symbols
48 @@ -144,6 +144,7 @@ ATH10K_SNOC=
49 ATH10K_DEBUG=
50 ATH10K_DEBUGFS=
51 ATH10K_SPECTRAL=
52 +ATH10K_THERMAL=
53 ATH10K_TRACING=
54 ATH10K_DFS_CERTIFIED=
55 WCN36XX=