107 lines
2.8 KiB
Diff
107 lines
2.8 KiB
Diff
--- a/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2800lib.c
|
|
@@ -8185,6 +8185,27 @@ static const struct rf_channel rf_vals_5
|
|
{196, 83, 0, 12, 1},
|
|
};
|
|
|
|
+/*
|
|
+ * RF value list for rt3xxx with Xtal20MHz
|
|
+ * Supports: 2.4 GHz (all) (RF3322)
|
|
+ */
|
|
+static const struct rf_channel rf_vals_xtal20mhz_3x[] = {
|
|
+ {1, 0xE2, 2, 0x14},
|
|
+ {2, 0xE3, 2, 0x14},
|
|
+ {3, 0xE4, 2, 0x14},
|
|
+ {4, 0xE5, 2, 0x14},
|
|
+ {5, 0xE6, 2, 0x14},
|
|
+ {6, 0xE7, 2, 0x14},
|
|
+ {7, 0xE8, 2, 0x14},
|
|
+ {8, 0xE9, 2, 0x14},
|
|
+ {9, 0xEA, 2, 0x14},
|
|
+ {10, 0xEB, 2, 0x14},
|
|
+ {11, 0xEC, 2, 0x14},
|
|
+ {12, 0xED, 2, 0x14},
|
|
+ {13, 0xEE, 2, 0x14},
|
|
+ {14, 0xF0, 2, 0x18},
|
|
+};
|
|
+
|
|
static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
struct hw_mode_spec *spec = &rt2x00dev->spec;
|
|
@@ -8271,7 +8292,10 @@ static int rt2800_probe_hw_mode(struct r
|
|
case RF5390:
|
|
case RF5392:
|
|
spec->num_channels = 14;
|
|
- spec->channels = rf_vals_3x;
|
|
+ if (spec->clk_is_20mhz)
|
|
+ spec->channels = rf_vals_xtal20mhz_3x;
|
|
+ else
|
|
+ spec->channels = rf_vals_3x;
|
|
break;
|
|
|
|
case RF3052:
|
|
@@ -8455,6 +8479,19 @@ static int rt2800_probe_rt(struct rt2x00
|
|
return 0;
|
|
}
|
|
|
|
+int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
|
|
+{
|
|
+ struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
|
|
+ struct hw_mode_spec *spec = &rt2x00dev->spec;
|
|
+
|
|
+ if (!pdata)
|
|
+ return -EINVAL;
|
|
+
|
|
+ spec->clk_is_20mhz = pdata->clk_is_20mhz;
|
|
+
|
|
+ return 0;
|
|
+}
|
|
+
|
|
int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
|
|
{
|
|
struct rt2800_drv_data *drv_data = rt2x00dev->drv_data;
|
|
@@ -8497,6 +8534,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
|
|
rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
|
|
|
|
/*
|
|
+ * Probe SoC clock.
|
|
+ */
|
|
+ if (rt2x00_is_soc(rt2x00dev)) {
|
|
+ retval = rt2800_probe_clk(rt2x00dev);
|
|
+ if (retval)
|
|
+ return retval;
|
|
+ }
|
|
+
|
|
+ /*
|
|
* Initialize hw specifications.
|
|
*/
|
|
retval = rt2800_probe_hw_mode(rt2x00dev);
|
|
--- a/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
+++ b/drivers/net/wireless/ralink/rt2x00/rt2x00.h
|
|
@@ -400,6 +400,7 @@ static inline struct rt2x00_intf* vif_to
|
|
* @channels: Device/chipset specific channel values (See &struct rf_channel).
|
|
* @channels_info: Additional information for channels (See &struct channel_info).
|
|
* @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
|
|
+ * @clk_is_20mhz: External crystal of WiSoC is 20MHz instead of 40MHz
|
|
*/
|
|
struct hw_mode_spec {
|
|
unsigned int supported_bands;
|
|
@@ -416,6 +417,7 @@ struct hw_mode_spec {
|
|
const struct channel_info *channels_info;
|
|
|
|
struct ieee80211_sta_ht_cap ht;
|
|
+ int clk_is_20mhz;
|
|
};
|
|
|
|
/*
|
|
--- a/include/linux/rt2x00_platform.h
|
|
+++ b/include/linux/rt2x00_platform.h
|
|
@@ -18,6 +18,7 @@ struct rt2x00_platform_data {
|
|
|
|
int disable_2ghz;
|
|
int disable_5ghz;
|
|
+ int clk_is_20mhz;
|
|
};
|
|
|
|
#endif /* _RT2X00_PLATFORM_H */
|