Difuse/difos
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ath10k: fix compilation error with CONFIG_OF not available

Browse source 
of_platform_device_create require CONFIG_OF selected.
Add an ifdef and register to the of platform only if of is available.

Fixes: 985954ccbd ("kernel: add ath10k support for of_get_mac_address")
Signed-off-by: Ansuel Smith <ansuelsmth@gmail.com>
This commit is contained in:
Ansuel Smith 2021-07-19 17:58:00 +02:00 committed by Petr Štetiar
parent 32adbfc789
commit 853e8465a7
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
package/kernel/ath10k-ct/patches/203-ath10k-Try-to-get-mac-address-from-dts.patch
View file

@ -30,15 +30,17 @@ index 5f4e12196..9ed7b9883 100644
#include <linux/property.h> #include <linux/property.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop); @@ -2961,8 +2963,14 @@ EXPORT_SYMBOL(ath10k_core_stop);
static int ath10k_core_probe_fw(struct ath10k *ar) static int ath10k_core_probe_fw(struct ath10k *ar)
{ {
struct bmi_target_info target_info; struct bmi_target_info target_info;
+ const char *mac; + const char *mac;
int ret = 0; int ret = 0;
+#ifdef CONFIG_OF
+ /* register the platform to be found by the of api */ + /* register the platform to be found by the of api */
+ of_platform_device_create(ar->dev->of_node, NULL, NULL); + of_platform_device_create(ar->dev->of_node, NULL, NULL);
+#endif
+ +
ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
if (ret) { if (ret) {

4
package/kernel/mac80211/patches/ath/984-ath10k-Try-to-get-mac-address-from-dts.patch
View file

@ -30,15 +30,17 @@ index 5f4e12196..9ed7b9883 100644
#include <linux/property.h> #include <linux/property.h>
#include <linux/dmi.h> #include <linux/dmi.h>
#include <linux/ctype.h> #include <linux/ctype.h>
@@ -2961,8 +2963,12 @@ EXPORT_SYMBOL(ath10k_core_stop); @@ -2961,8 +2963,14 @@ EXPORT_SYMBOL(ath10k_core_stop);
static int ath10k_core_probe_fw(struct ath10k *ar) static int ath10k_core_probe_fw(struct ath10k *ar)
{ {
struct bmi_target_info target_info; struct bmi_target_info target_info;
+ const char *mac; + const char *mac;
int ret = 0; int ret = 0;
+#ifdef CONFIG_OF
+ /* register the platform to be found by the of api */ + /* register the platform to be found by the of api */
+ of_platform_device_create(ar->dev->of_node, NULL, NULL); + of_platform_device_create(ar->dev->of_node, NULL, NULL);
+#endif
+ +
ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL); ret = ath10k_hif_power_up(ar, ATH10K_FIRMWARE_MODE_NORMAL);
if (ret) { if (ret) {