package/mac80211/patches/623-rt2x00-rf_vals-rt3352-xtal20.patch

   1 Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c
   2 ===================================================================
   3 --- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2800lib.c
   4 +++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2800lib.c
   5 @@ -5072,6 +5072,27 @@ static const struct rf_channel rf_vals_3
   6         {173, 0x61, 0, 9},
   7  };
   8
   9 +/*
  10 + * RF value list for rt3xxx with Xtal20MHz
  11 + * Supports: 2.4 GHz (all) (RF3322)
  12 + */
  13 +static const struct rf_channel rf_vals_xtal20mhz_3x[] = {
  14 +       {1,    0xE2,     2,  0x14},
  15 +       {2,    0xE3,     2,  0x14},
  16 +       {3,    0xE4,     2,  0x14},
  17 +       {4,    0xE5,     2,  0x14},
  18 +       {5,    0xE6,     2,  0x14},
  19 +       {6,    0xE7,     2,  0x14},
  20 +       {7,    0xE8,     2,  0x14},
  21 +       {8,    0xE9,     2,  0x14},
  22 +       {9,    0xEA,     2,  0x14},
  23 +       {10,   0xEB,     2,  0x14},
  24 +       {11,   0xEC,     2,  0x14},
  25 +       {12,   0xED,     2,  0x14},
  26 +       {13,   0xEE,     2,  0x14},
  27 +       {14,   0xF0,     2,  0x18},
  28 +};
  29 +
  30  static int rt2800_probe_hw_mode(struct rt2x00_dev *rt2x00dev)
  31  {
  32         struct hw_mode_spec *spec = &rt2x00dev->spec;
  33 @@ -5149,7 +5170,6 @@ static int rt2800_probe_hw_mode(struct r
  34                    rt2x00_rf(rt2x00dev, RF3022) ||
  35                    rt2x00_rf(rt2x00dev, RF3290) ||
  36                    rt2x00_rf(rt2x00dev, RF3320) ||
  37 -                  rt2x00_rf(rt2x00dev, RF3322) ||
  38                    rt2x00_rf(rt2x00dev, RF5360) ||
  39                    rt2x00_rf(rt2x00dev, RF5370) ||
  40                    rt2x00_rf(rt2x00dev, RF5372) ||
  41 @@ -5157,6 +5177,12 @@ static int rt2800_probe_hw_mode(struct r
  42                    rt2x00_rf(rt2x00dev, RF5392)) {
  43                 spec->num_channels = 14;
  44                 spec->channels = rf_vals_3x;
  45 +       } else if (rt2x00_rf(rt2x00dev, RF3322)) {
  46 +               spec->num_channels = 14;
  47 +               if (spec->clk_is_20mhz)
  48 +                       spec->channels = rf_vals_xtal20mhz_3x;
  49 +               else
  50 +                       spec->channels = rf_vals_3x;
  51         } else if (rt2x00_rf(rt2x00dev, RF3052)) {
  52                 spec->supported_bands |= SUPPORT_BAND_5GHZ;
  53                 spec->num_channels = ARRAY_SIZE(rf_vals_3x);
  54 @@ -5250,6 +5276,19 @@ static int rt2800_probe_hw_mode(struct r
  55         return 0;
  56  }
  57
  58 +int rt2800_probe_clk(struct rt2x00_dev *rt2x00dev)
  59 +{
  60 +       struct rt2x00_platform_data *pdata = rt2x00dev->dev->platform_data;
  61 +       struct hw_mode_spec *spec = &rt2x00dev->spec;
  62 +
  63 +       if (!pdata)
  64 +               return -EINVAL;
  65 +
  66 +       spec->clk_is_20mhz = pdata->clk_is_20mhz;
  67 +
  68 +       return 0;
  69 +}
  70 +
  71  int rt2800_probe_hw(struct rt2x00_dev *rt2x00dev)
  72  {
  73         int retval;
  74 @@ -5275,6 +5314,15 @@ int rt2800_probe_hw(struct rt2x00_dev *r
  75         rt2800_register_write(rt2x00dev, GPIO_CTRL, reg);
  76
  77         /*
  78 +        * Probe SoC clock.
  79 +        */
  80 +       if (rt2x00_is_soc(rt2x00dev)) {
  81 +               retval = rt2800_probe_clk(rt2x00dev);
  82 +               if (retval)
  83 +                       return retval;
  84 +       }
  85 +
  86 +       /*
  87          * Initialize hw specifications.
  88          */
  89         retval = rt2800_probe_hw_mode(rt2x00dev);
  90 Index: compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h
  91 ===================================================================
  92 --- compat-wireless-2012-09-07.orig/drivers/net/wireless/rt2x00/rt2x00.h
  93 +++ compat-wireless-2012-09-07/drivers/net/wireless/rt2x00/rt2x00.h
  94 @@ -421,6 +421,7 @@ static inline struct rt2x00_intf* vif_to
  95   * @channels: Device/chipset specific channel values (See &struct rf_channel).
  96   * @channels_info: Additional information for channels (See &struct channel_info).
  97   * @ht: Driver HT Capabilities (See &ieee80211_sta_ht_cap).
  98 + * @clk_is_20mhz: External crystal of WiSoC is 20MHz instead of 40MHz
  99   */
 100  struct hw_mode_spec {
 101         unsigned int supported_bands;
 102 @@ -437,6 +438,7 @@ struct hw_mode_spec {
 103         const struct channel_info *channels_info;
 104
 105         struct ieee80211_sta_ht_cap ht;
 106 +       int clk_is_20mhz;
 107  };
 108
 109  /*
 110 Index: compat-wireless-2012-09-07/include/linux/rt2x00_platform.h
 111 ===================================================================
 112 --- compat-wireless-2012-09-07.orig/include/linux/rt2x00_platform.h
 113 +++ compat-wireless-2012-09-07/include/linux/rt2x00_platform.h
 114 @@ -18,6 +18,7 @@ struct rt2x00_platform_data {
 115
 116         int disable_2ghz;
 117         int disable_5ghz;
 118 +       int clk_is_20mhz;
 119  };
 120
 121  #endif /* _RT2X00_PLATFORM_H */