update .gitignore
[librecmc/librecmc.git] / package / kernel / mac80211 / patches / 328-ath9k-parse-the-device-configuration-from-an-OF-node.patch
1 From cea03be5a848823cb8052e2e7b93cb2249d5f60c Mon Sep 17 00:00:00 2001
2 From: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
3 Date: Sun, 16 Oct 2016 22:59:07 +0200
4 Subject: [PATCH 3/3] ath9k: parse the device configuration from an OF node
5
6 This allows setting the MAC address and specifying that the firmware
7 will be requested from userspace (because there might not be a hardware
8 EEPROM connected to the chip) for ath9k based PCI devices using
9 the device tree.
10
11 There is some out-of-tree code to "convert devicetree to
12 ath9k_platform_data" (for example in OpenWrt and LEDE) which becomes
13 obsolete with this patch.
14
15 Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
16 Signed-off-by: Kalle Valo <kvalo@qca.qualcomm.com>
17 ---
18  drivers/net/wireless/ath/ath9k/init.c | 42 +++++++++++++++++++++++++++++++++++
19  1 file changed, 42 insertions(+)
20
21 --- a/drivers/net/wireless/ath/ath9k/init.c
22 +++ b/drivers/net/wireless/ath/ath9k/init.c
23 @@ -20,6 +20,8 @@
24  #include <linux/slab.h>
25  #include <linux/ath9k_platform.h>
26  #include <linux/module.h>
27 +#include <linux/of.h>
28 +#include <linux/of_net.h>
29  #include <linux/relay.h>
30  #include <net/ieee80211_radiotap.h>
31  
32 @@ -554,6 +556,42 @@ static int ath9k_init_platform(struct at
33         return 0;
34  }
35  
36 +static int ath9k_of_init(struct ath_softc *sc)
37 +{
38 +       struct device_node *np = sc->dev->of_node;
39 +       struct ath_hw *ah = sc->sc_ah;
40 +       struct ath_common *common = ath9k_hw_common(ah);
41 +       enum ath_bus_type bus_type = common->bus_ops->ath_bus_type;
42 +       const char *mac;
43 +       char eeprom_name[100];
44 +       int ret;
45 +
46 +       if (!of_device_is_available(np))
47 +               return 0;
48 +
49 +       ath_dbg(common, CONFIG, "parsing configuration from OF node\n");
50 +
51 +       if (of_property_read_bool(np, "qca,no-eeprom")) {
52 +               /* ath9k-eeprom-<bus>-<id>.bin */
53 +               scnprintf(eeprom_name, sizeof(eeprom_name),
54 +                         "ath9k-eeprom-%s-%s.bin",
55 +                         ath_bus_type_to_string(bus_type), dev_name(ah->dev));
56 +
57 +               ret = ath9k_eeprom_request(sc, eeprom_name);
58 +               if (ret)
59 +                       return ret;
60 +       }
61 +
62 +       mac = of_get_mac_address(np);
63 +       if (mac)
64 +               ether_addr_copy(common->macaddr, mac);
65 +
66 +       ah->ah_flags &= ~AH_USE_EEPROM;
67 +       ah->ah_flags |= AH_NO_EEP_SWAP;
68 +
69 +       return 0;
70 +}
71 +
72  static int ath9k_init_softc(u16 devid, struct ath_softc *sc,
73                             const struct ath_bus_ops *bus_ops)
74  {
75 @@ -610,6 +648,10 @@ static int ath9k_init_softc(u16 devid, s
76         if (ret)
77                 return ret;
78  
79 +       ret = ath9k_of_init(sc);
80 +       if (ret)
81 +               return ret;
82 +
83         if (ath9k_led_active_high != -1)
84                 ah->config.led_active_high = ath9k_led_active_high == 1;
85