mt76: mt76x2: disable merge of OTP ROM data by default

The reference driver does not seem to enable it by default, only under certain
conditions, e.g. when a .bin file is loaded.
Make it opt-in via a device tree property for now, in case it is needed on some
boards.

Signed-off-by: Felix Fietkau <nbd@nbd.name>

diff --git a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
index 4a748a6f0ce204dcf4350fc22baa801d9f6db812..410ffce3bafffcf7c055db3740c7e668fcc61aba 100644 (file)
--- a/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
+++ b/drivers/net/wireless/mediatek/mt76/mt76x2/eeprom.c
@@ -4,6 +4,7 @@
  */
 
 #include <linux/module.h>
+#include <linux/of.h>
 #include <asm/unaligned.h>
 #include "mt76x2.h"
 #include "eeprom.h"
@@ -76,6 +77,7 @@ mt76x2_apply_cal_free_data(struct mt76x02_dev *dev, u8 *efuse)
                MT_EE_RF_5G_GRP4_5_RX_HIGH_GAIN,
                MT_EE_RF_5G_GRP4_5_RX_HIGH_GAIN + 1,
        };
+       struct device_node *np = dev->mt76.dev->of_node;
        u8 *eeprom = dev->mt76.eeprom.data;
        u8 prev_grp0[4] = {
                eeprom[MT_EE_TX_POWER_0_START_5G],
@@ -86,6 +88,9 @@ mt76x2_apply_cal_free_data(struct mt76x02_dev *dev, u8 *efuse)
        u16 val;
        int i;
 
+       if (!np || !of_property_read_bool(np, "mediatek,eeprom-merge-otp"))
+               return;
+
        if (!mt76x2_has_cal_free_data(dev, efuse))
                return;