support rt5370 AP mode.

- patch ralink kernel-module.
- install ralink legacy/kernel module.
- increase dvbapp PR.
- rt3070 : fix iface name ra -> wlan.

diff --git a/meta-bsp/bm750/conf/machine/bm750.conf b/meta-bsp/bm750/conf/machine/bm750.conf
index ef4b454..5d49ae6 100644 (file)
--- a/meta-bsp/bm750/conf/machine/bm750.conf
+++ b/meta-bsp/bm750/conf/machine/bm750.conf
@@ -10,6 +10,8 @@ VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "audioeffect"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/duo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/rt5372_kernel_3.1.1.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/rt5372_kernel_3.1.1.patch
new file mode 100644 (file)
index 0000000..d70c5c6
--- /dev/null
+++ b/meta-bsp/common/recipes/linux/linux-vuplus-3.1.1/rt5372_kernel_3.1.1.patch
@@ -0,0 +1,437 @@
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2800.h linux/drivers/net/wireless/rt2x00/rt2800.h\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2800.h    2011-11-11 21:19:27.000000000 +0100\r
++++ linux/drivers/net/wireless/rt2x00/rt2800.h 2014-02-23 20:21:13.000000000 +0100\r
+@@ -68,6 +68,7 @@\r
+ #define RF3322                                0x000c\r
+ #define RF3853                                0x000d\r
+ #define RF5370                                0x5370\r
++#define RF5372                                0x5372\r
+ #define RF5390                                0x5390\r
+ \r
+ /*\r
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2800lib.c linux/drivers/net/wireless/rt2x00/rt2800lib.c\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2011-11-11 21:19:27.000000000 +0100\r
++++ linux/drivers/net/wireless/rt2x00/rt2800lib.c      2014-02-23 20:25:27.000000000 +0100\r
+@@ -402,7 +402,8 @@\r
+ \r
+       if (rt2x00_is_pci(rt2x00dev)) {\r
+               if (rt2x00_rt(rt2x00dev, RT3572) ||\r
+-                  rt2x00_rt(rt2x00dev, RT5390)) {\r
++                  rt2x00_rt(rt2x00dev, RT5390) ||\r
++                  rt2x00_rt(rt2x00dev, RT5392)) {\r
+                       rt2800_register_read(rt2x00dev, AUX_CTRL, &reg);\r
+                       rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1);\r
+                       rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1);\r
+@@ -1128,8 +1129,10 @@\r
+                          !(filter_flags & FIF_CONTROL));\r
+       rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_PSPOLL,\r
+                          !(filter_flags & FIF_PSPOLL));\r
+-      rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA, 1);\r
+-      rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR, 0);\r
++      rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BA,\r
++                         !(filter_flags & FIF_CONTROL));\r
++      rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_BAR,\r
++                         !(filter_flags & FIF_CONTROL));\r
+       rt2x00_set_field32(&reg, RX_FILTER_CFG_DROP_CNTL,\r
+                          !(filter_flags & FIF_CONTROL));\r
+       rt2800_register_write(rt2x00dev, RX_FILTER_CFG, reg);\r
+@@ -1867,19 +1870,25 @@\r
+               info->default_power2 = TXPOWER_A_TO_DEV(info->default_power2);\r
+       }\r
+ \r
+-      if (rt2x00_rf(rt2x00dev, RF2020) ||\r
+-          rt2x00_rf(rt2x00dev, RF3020) ||\r
+-          rt2x00_rf(rt2x00dev, RF3021) ||\r
+-          rt2x00_rf(rt2x00dev, RF3022) ||\r
+-          rt2x00_rf(rt2x00dev, RF3320))\r
++      switch (rt2x00dev->chip.rf) {\r
++      case RF2020:\r
++      case RF3020:\r
++      case RF3021:\r
++      case RF3022:\r
++      case RF3320:\r
+               rt2800_config_channel_rf3xxx(rt2x00dev, conf, rf, info);\r
+-      else if (rt2x00_rf(rt2x00dev, RF3052))\r
++              break;\r
++      case RF3052:\r
+               rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);\r
+-      else if (rt2x00_rf(rt2x00dev, RF5370) ||\r
+-               rt2x00_rf(rt2x00dev, RF5390))\r
++              break;\r
++      case RF5370:\r
++      case RF5372:\r
++      case RF5390:\r
+               rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);\r
+-      else\r
++              break;\r
++      default:\r
+               rt2800_config_channel_rf2xxx(rt2x00dev, conf, rf, info);\r
++      }\r
+ \r
+       /*\r
+        * Change BBP settings\r
+@@ -1890,7 +1899,8 @@\r
+       rt2800_bbp_write(rt2x00dev, 86, 0);\r
+ \r
+       if (rf->channel <= 14) {\r
+-              if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++              if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++                      !rt2x00_rt(rt2x00dev, RT5392)) {\r
+                       if (test_bit(CAPABILITY_EXTERNAL_LNA_BG,\r
+                                    &rt2x00dev->cap_flags)) {\r
+                               rt2800_bbp_write(rt2x00dev, 82, 0x62);\r
+@@ -2420,7 +2430,8 @@\r
+                   rt2x00_rt(rt2x00dev, RT3071) ||\r
+                   rt2x00_rt(rt2x00dev, RT3090) ||\r
+                   rt2x00_rt(rt2x00dev, RT3390) ||\r
+-                  rt2x00_rt(rt2x00dev, RT5390))\r
++                  rt2x00_rt(rt2x00dev, RT5390) ||\r
++                  rt2x00_rt(rt2x00dev, RT5392))\r
+                       return 0x1c + (2 * rt2x00dev->lna_gain);\r
+               else\r
+                       return 0x2e + rt2x00dev->lna_gain;\r
+@@ -2555,7 +2566,8 @@\r
+       } else if (rt2x00_rt(rt2x00dev, RT3572)) {\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\r
+-      } else if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      } else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                         rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);\r
+@@ -2934,7 +2946,8 @@\r
+                    rt2800_wait_bbp_ready(rt2x00dev)))\r
+               return -EACCES;\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_read(rt2x00dev, 4, &value);\r
+               rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);\r
+               rt2800_bbp_write(rt2x00dev, 4, value);\r
+@@ -2942,19 +2955,22 @@\r
+ \r
+       if (rt2800_is_305x_soc(rt2x00dev) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390))\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 31, 0x08);\r
+ \r
+       rt2800_bbp_write(rt2x00dev, 65, 0x2c);\r
+       rt2800_bbp_write(rt2x00dev, 66, 0x38);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 68, 0x0b);\r
+ \r
+       if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860C)) {\r
+               rt2800_bbp_write(rt2x00dev, 69, 0x16);\r
+               rt2800_bbp_write(rt2x00dev, 73, 0x12);\r
+-      } else if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      } else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                         rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_write(rt2x00dev, 69, 0x12);\r
+               rt2800_bbp_write(rt2x00dev, 73, 0x13);\r
+               rt2800_bbp_write(rt2x00dev, 75, 0x46);\r
+@@ -2972,7 +2988,8 @@\r
+           rt2x00_rt(rt2x00dev, RT3090) ||\r
+           rt2x00_rt(rt2x00dev, RT3390) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390)) {\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_write(rt2x00dev, 79, 0x13);\r
+               rt2800_bbp_write(rt2x00dev, 80, 0x05);\r
+               rt2800_bbp_write(rt2x00dev, 81, 0x33);\r
+@@ -2984,64 +3001,88 @@\r
+       }\r
+ \r
+       rt2800_bbp_write(rt2x00dev, 82, 0x62);\r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 83, 0x7a);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 83, 0x6a);\r
+ \r
+       if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x19);\r
+-      else if (rt2x00_rt(rt2x00dev, RT5390))\r
++      else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                       rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x9a);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x99);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 86, 0x38);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 86, 0x00);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392))\r
++              rt2800_bbp_write(rt2x00dev, 88, 0x90);\r
++\r
+       rt2800_bbp_write(rt2x00dev, 91, 0x04);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 92, 0x02);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 92, 0x00);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++              rt2800_bbp_write(rt2x00dev, 95, 0x9a);\r
++              rt2800_bbp_write(rt2x00dev, 98, 0x12);\r
++      }\r
++\r
+       if (rt2x00_rt_rev_gte(rt2x00dev, RT3070, REV_RT3070F) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3071, REV_RT3071E) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3090, REV_RT3090E) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3390, REV_RT3390E) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+           rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392) ||\r
+           rt2800_is_305x_soc(rt2x00dev))\r
+               rt2800_bbp_write(rt2x00dev, 103, 0xc0);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 103, 0x00);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 104, 0x92);\r
+ \r
+       if (rt2800_is_305x_soc(rt2x00dev))\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x01);\r
+-      else if (rt2x00_rt(rt2x00dev, RT5390))\r
++      else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                       rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x3c);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x05);\r
+ \r
+       if (rt2x00_rt(rt2x00dev, RT5390))\r
+               rt2800_bbp_write(rt2x00dev, 106, 0x03);\r
++      else if (rt2x00_rt(rt2x00dev, RT5392))\r
++              rt2800_bbp_write(rt2x00dev, 106, 0x12);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 106, 0x35);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 128, 0x12);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++              rt2800_bbp_write(rt2x00dev, 134, 0xd0);\r
++              rt2800_bbp_write(rt2x00dev, 135, 0xf6);\r
++      }\r
++\r
+       if (rt2x00_rt(rt2x00dev, RT3071) ||\r
+           rt2x00_rt(rt2x00dev, RT3090) ||\r
+           rt2x00_rt(rt2x00dev, RT3390) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390)) {\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_read(rt2x00dev, 138, &value);\r
+ \r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);\r
+@@ -3053,7 +3094,8 @@\r
+               rt2800_bbp_write(rt2x00dev, 138, value);\r
+       }\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               int ant, div_mode;\r
+ \r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);\r
+@@ -3179,13 +3221,15 @@\r
+           !rt2x00_rt(rt2x00dev, RT3390) &&\r
+           !rt2x00_rt(rt2x00dev, RT3572) &&\r
+           !rt2x00_rt(rt2x00dev, RT5390) &&\r
++          !rt2x00_rt(rt2x00dev, RT5392) &&\r
+           !rt2800_is_305x_soc(rt2x00dev))\r
+               return 0;\r
+ \r
+       /*\r
+        * Init RF calibration.\r
+        */\r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);\r
+               rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);\r
+@@ -3403,6 +3447,66 @@\r
+                       rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);\r
+               rt2800_rfcsr_write(rt2x00dev, 62, 0x00);\r
+               rt2800_rfcsr_write(rt2x00dev, 63, 0x00);\r
++      }       else if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++                      rt2800_rfcsr_write(rt2x00dev, 1, 0x17);\r
++                      rt2800_rfcsr_write(rt2x00dev, 2, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 3, 0x88);\r
++                      rt2800_rfcsr_write(rt2x00dev, 5, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);\r
++                      rt2800_rfcsr_write(rt2x00dev, 7, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 10, 0x53);\r
++                      rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);\r
++                      rt2800_rfcsr_write(rt2x00dev, 12, 0x46);\r
++                      rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);\r
++                      rt2800_rfcsr_write(rt2x00dev, 14, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 15, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 16, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 18, 0x03);\r
++                      rt2800_rfcsr_write(rt2x00dev, 19, 0x4d);\r
++                      rt2800_rfcsr_write(rt2x00dev, 20, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 21, 0x8d);\r
++                      rt2800_rfcsr_write(rt2x00dev, 22, 0x20);\r
++                      rt2800_rfcsr_write(rt2x00dev, 23, 0x0b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 24, 0x44);\r
++                      rt2800_rfcsr_write(rt2x00dev, 25, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 26, 0x82);\r
++                      rt2800_rfcsr_write(rt2x00dev, 27, 0x09);\r
++                      rt2800_rfcsr_write(rt2x00dev, 28, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 29, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 30, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 31, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 32, 0x20);\r
++                      rt2800_rfcsr_write(rt2x00dev, 33, 0xC0);\r
++                      rt2800_rfcsr_write(rt2x00dev, 34, 0x07);\r
++                      rt2800_rfcsr_write(rt2x00dev, 35, 0x12);\r
++                      rt2800_rfcsr_write(rt2x00dev, 36, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 37, 0x08);\r
++                      rt2800_rfcsr_write(rt2x00dev, 38, 0x89);\r
++                      rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 40, 0x0f);\r
++                      rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);\r
++                      rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);\r
++                      rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);\r
++                      rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);\r
++                      rt2800_rfcsr_write(rt2x00dev, 46, 0x73);\r
++                      rt2800_rfcsr_write(rt2x00dev, 47, 0x0c);\r
++                      rt2800_rfcsr_write(rt2x00dev, 48, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 49, 0x94);\r
++                      rt2800_rfcsr_write(rt2x00dev, 50, 0x94);\r
++                      rt2800_rfcsr_write(rt2x00dev, 51, 0x3a);\r
++                      rt2800_rfcsr_write(rt2x00dev, 52, 0x48);\r
++                      rt2800_rfcsr_write(rt2x00dev, 53, 0x44);\r
++                      rt2800_rfcsr_write(rt2x00dev, 54, 0x38);\r
++                      rt2800_rfcsr_write(rt2x00dev, 55, 0x43);\r
++                      rt2800_rfcsr_write(rt2x00dev, 56, 0xa1);\r
++                      rt2800_rfcsr_write(rt2x00dev, 57, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 58, 0x39);\r
++                      rt2800_rfcsr_write(rt2x00dev, 59, 0x07);\r
++                      rt2800_rfcsr_write(rt2x00dev, 60, 0x45);\r
++                      rt2800_rfcsr_write(rt2x00dev, 61, 0x91);\r
++                      rt2800_rfcsr_write(rt2x00dev, 62, 0x39);\r
++                      rt2800_rfcsr_write(rt2x00dev, 63, 0x07);\r
+       }\r
+ \r
+       if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {\r
+@@ -3470,7 +3574,8 @@\r
+                       rt2800_init_rx_filter(rt2x00dev, true, 0x27, 0x15);\r
+       }\r
+ \r
+-      if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++              !rt2x00_rt(rt2x00dev, RT5392)) {\r
+               /*\r
+                * Set back to initial state\r
+                */\r
+@@ -3498,7 +3603,8 @@\r
+       rt2x00_set_field32(&reg, OPT_14_CSR_BIT0, 1);\r
+       rt2800_register_write(rt2x00dev, OPT_14_CSR, reg);\r
+ \r
+-      if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++              !rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);\r
+               if (rt2x00_rt(rt2x00dev, RT3070) ||\r
+@@ -3566,7 +3672,8 @@\r
+               rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);\r
+       }\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);\r
+               rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);\r
+@@ -3850,7 +3957,8 @@\r
+        * RT53xx: defined in "EEPROM_CHIP_ID" field\r
+        */\r
+       rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);\r
+-      if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390)\r
++      if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||\r
++              rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)\r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);\r
+       else\r
+               value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);\r
+@@ -3858,15 +3966,19 @@\r
+       rt2x00_set_chip(rt2x00dev, rt2x00_get_field32(reg, MAC_CSR0_CHIPSET),\r
+                       value, rt2x00_get_field32(reg, MAC_CSR0_REVISION));\r
+ \r
+-      if (!rt2x00_rt(rt2x00dev, RT2860) &&\r
+-          !rt2x00_rt(rt2x00dev, RT2872) &&\r
+-          !rt2x00_rt(rt2x00dev, RT2883) &&\r
+-          !rt2x00_rt(rt2x00dev, RT3070) &&\r
+-          !rt2x00_rt(rt2x00dev, RT3071) &&\r
+-          !rt2x00_rt(rt2x00dev, RT3090) &&\r
+-          !rt2x00_rt(rt2x00dev, RT3390) &&\r
+-          !rt2x00_rt(rt2x00dev, RT3572) &&\r
+-          !rt2x00_rt(rt2x00dev, RT5390)) {\r
++      switch (rt2x00dev->chip.rt) {\r
++      case RT2860:\r
++      case RT2872:\r
++      case RT2883:\r
++      case RT3070:\r
++      case RT3071:\r
++      case RT3090:\r
++      case RT3390:\r
++      case RT3572:\r
++      case RT5390:\r
++      case RT5392:\r
++              break;\r
++      default:\r
+               ERROR(rt2x00dev, "Invalid RT chipset detected.\n");\r
+               return -ENODEV;\r
+       }\r
+@@ -3883,6 +3995,7 @@\r
+       case RF3052:\r
+       case RF3320:\r
+       case RF5370:\r
++      case RF5372:\r
+       case RF5390:\r
+               break;\r
+       default:\r
+@@ -4189,6 +4302,7 @@\r
+                  rt2x00_rf(rt2x00dev, RF3022) ||\r
+                  rt2x00_rf(rt2x00dev, RF3320) ||\r
+                  rt2x00_rf(rt2x00dev, RF5370) ||\r
++                 rt2x00_rf(rt2x00dev, RF5372) ||\r
+                  rt2x00_rf(rt2x00dev, RF5390)) {\r
+               spec->num_channels = 14;\r
+               spec->channels = rf_vals_3x;\r
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2x00.h linux/drivers/net/wireless/rt2x00/rt2x00.h\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2x00.h    2011-11-11 21:19:27.000000000 +0100\r
++++ linux/drivers/net/wireless/rt2x00/rt2x00.h 2014-02-23 20:20:33.000000000 +0100\r
+@@ -191,7 +191,8 @@\r
+ #define RT3572                0x3572\r
+ #define RT3593                0x3593  /* PCIe */\r
+ #define RT3883                0x3883  /* WSOC */\r
+-#define RT5390         0x5390  /* 2.4GHz */\r
++#define RT5390                0x5390  /* 2.4GHz */\r
++#define RT5392          0x5392 /* 2.4GHz */\r
+ \r
+       u16 rf;\r
+       u16 rev;\r

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/rt5372_kernel_3.3.8.patch b/meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/rt5372_kernel_3.3.8.patch
new file mode 100644 (file)
index 0000000..a655a07
--- /dev/null
+++ b/meta-bsp/common/recipes/linux/linux-vuplus-3.3.8/rt5372_kernel_3.3.8.patch
@@ -0,0 +1,387 @@
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2800.h linux/drivers/net/wireless/rt2x00/rt2800.h\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2800.h    2012-10-27 06:39:33.000000000 +0200\r
++++ linux/drivers/net/wireless/rt2x00/rt2800.h 2014-02-23 17:59:22.000000000 +0100\r
+@@ -68,6 +68,7 @@\r
+ #define RF3322                                0x000c\r
+ #define RF3053                                0x000d\r
+ #define RF5370                                0x5370\r
++#define RF5372                                0x5372\r
+ #define RF5390                                0x5390\r
+ \r
+ /*\r
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2800lib.c linux/drivers/net/wireless/rt2x00/rt2800lib.c\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2800lib.c 2012-10-27 06:39:33.000000000 +0200\r
++++ linux/drivers/net/wireless/rt2x00/rt2800lib.c      2014-02-23 17:59:21.000000000 +0100\r
+@@ -402,7 +402,8 @@\r
+ \r
+       if (rt2x00_is_pci(rt2x00dev)) {\r
+               if (rt2x00_rt(rt2x00dev, RT3572) ||\r
+-                  rt2x00_rt(rt2x00dev, RT5390)) {\r
++                  rt2x00_rt(rt2x00dev, RT5390) ||\r
++                  rt2x00_rt(rt2x00dev, RT5392)) {\r
+                       rt2800_register_read(rt2x00dev, AUX_CTRL, &reg);\r
+                       rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1);\r
+                       rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1);\r
+@@ -1956,6 +1957,7 @@\r
+               rt2800_config_channel_rf3052(rt2x00dev, conf, rf, info);\r
+               break;\r
+       case RF5370:\r
++      case RF5372:\r
+       case RF5390:\r
+               rt2800_config_channel_rf53xx(rt2x00dev, conf, rf, info);\r
+               break;\r
+@@ -1972,7 +1974,8 @@\r
+       rt2800_bbp_write(rt2x00dev, 86, 0);\r
+ \r
+       if (rf->channel <= 14) {\r
+-              if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++              if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++                      !rt2x00_rt(rt2x00dev, RT5392)) {\r
+                       if (test_bit(CAPABILITY_EXTERNAL_LNA_BG,\r
+                                    &rt2x00dev->cap_flags)) {\r
+                               rt2800_bbp_write(rt2x00dev, 82, 0x62);\r
+@@ -2502,7 +2505,8 @@\r
+                   rt2x00_rt(rt2x00dev, RT3071) ||\r
+                   rt2x00_rt(rt2x00dev, RT3090) ||\r
+                   rt2x00_rt(rt2x00dev, RT3390) ||\r
+-                  rt2x00_rt(rt2x00dev, RT5390))\r
++                  rt2x00_rt(rt2x00dev, RT5390) ||\r
++                  rt2x00_rt(rt2x00dev, RT5392))\r
+                       return 0x1c + (2 * rt2x00dev->lna_gain);\r
+               else\r
+                       return 0x2e + rt2x00dev->lna_gain;\r
+@@ -2637,7 +2641,8 @@\r
+       } else if (rt2x00_rt(rt2x00dev, RT3572)) {\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000400);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\r
+-      } else if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      } else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                         rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG0, 0x00000404);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG1, 0x00080606);\r
+               rt2800_register_write(rt2x00dev, TX_SW_CFG2, 0x00000000);\r
+@@ -3013,7 +3018,8 @@\r
+                    rt2800_wait_bbp_ready(rt2x00dev)))\r
+               return -EACCES;\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_read(rt2x00dev, 4, &value);\r
+               rt2x00_set_field8(&value, BBP4_MAC_IF_CTRL, 1);\r
+               rt2800_bbp_write(rt2x00dev, 4, value);\r
+@@ -3021,19 +3027,22 @@\r
+ \r
+       if (rt2800_is_305x_soc(rt2x00dev) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390))\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 31, 0x08);\r
+ \r
+       rt2800_bbp_write(rt2x00dev, 65, 0x2c);\r
+       rt2800_bbp_write(rt2x00dev, 66, 0x38);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 68, 0x0b);\r
+ \r
+       if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860C)) {\r
+               rt2800_bbp_write(rt2x00dev, 69, 0x16);\r
+               rt2800_bbp_write(rt2x00dev, 73, 0x12);\r
+-      } else if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      } else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                         rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_write(rt2x00dev, 69, 0x12);\r
+               rt2800_bbp_write(rt2x00dev, 73, 0x13);\r
+               rt2800_bbp_write(rt2x00dev, 75, 0x46);\r
+@@ -3051,7 +3060,8 @@\r
+           rt2x00_rt(rt2x00dev, RT3090) ||\r
+           rt2x00_rt(rt2x00dev, RT3390) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390)) {\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_write(rt2x00dev, 79, 0x13);\r
+               rt2800_bbp_write(rt2x00dev, 80, 0x05);\r
+               rt2800_bbp_write(rt2x00dev, 81, 0x33);\r
+@@ -3063,64 +3073,88 @@\r
+       }\r
+ \r
+       rt2800_bbp_write(rt2x00dev, 82, 0x62);\r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 83, 0x7a);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 83, 0x6a);\r
+ \r
+       if (rt2x00_rt_rev(rt2x00dev, RT2860, REV_RT2860D))\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x19);\r
+-      else if (rt2x00_rt(rt2x00dev, RT5390))\r
++      else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                       rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x9a);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 84, 0x99);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 86, 0x38);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 86, 0x00);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392))\r
++              rt2800_bbp_write(rt2x00dev, 88, 0x90);\r
++\r
+       rt2800_bbp_write(rt2x00dev, 91, 0x04);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 92, 0x02);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 92, 0x00);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++              rt2800_bbp_write(rt2x00dev, 95, 0x9a);\r
++              rt2800_bbp_write(rt2x00dev, 98, 0x12);\r
++      }\r
++\r
+       if (rt2x00_rt_rev_gte(rt2x00dev, RT3070, REV_RT3070F) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3071, REV_RT3071E) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3090, REV_RT3090E) ||\r
+           rt2x00_rt_rev_gte(rt2x00dev, RT3390, REV_RT3390E) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+           rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392) ||\r
+           rt2800_is_305x_soc(rt2x00dev))\r
+               rt2800_bbp_write(rt2x00dev, 103, 0xc0);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 103, 0x00);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 104, 0x92);\r
+ \r
+       if (rt2800_is_305x_soc(rt2x00dev))\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x01);\r
+-      else if (rt2x00_rt(rt2x00dev, RT5390))\r
++      else if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++                       rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x3c);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 105, 0x05);\r
+ \r
+       if (rt2x00_rt(rt2x00dev, RT5390))\r
+               rt2800_bbp_write(rt2x00dev, 106, 0x03);\r
++      else if (rt2x00_rt(rt2x00dev, RT5392))\r
++              rt2800_bbp_write(rt2x00dev, 106, 0x12);\r
+       else\r
+               rt2800_bbp_write(rt2x00dev, 106, 0x35);\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390))\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392))\r
+               rt2800_bbp_write(rt2x00dev, 128, 0x12);\r
+ \r
++      if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++              rt2800_bbp_write(rt2x00dev, 134, 0xd0);\r
++              rt2800_bbp_write(rt2x00dev, 135, 0xf6);\r
++      }\r
++\r
+       if (rt2x00_rt(rt2x00dev, RT3071) ||\r
+           rt2x00_rt(rt2x00dev, RT3090) ||\r
+           rt2x00_rt(rt2x00dev, RT3390) ||\r
+           rt2x00_rt(rt2x00dev, RT3572) ||\r
+-          rt2x00_rt(rt2x00dev, RT5390)) {\r
++          rt2x00_rt(rt2x00dev, RT5390) ||\r
++          rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_bbp_read(rt2x00dev, 138, &value);\r
+ \r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF0, &eeprom);\r
+@@ -3132,7 +3166,8 @@\r
+               rt2800_bbp_write(rt2x00dev, 138, value);\r
+       }\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               int ant, div_mode;\r
+ \r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_NIC_CONF1, &eeprom);\r
+@@ -3258,13 +3293,15 @@\r
+           !rt2x00_rt(rt2x00dev, RT3390) &&\r
+           !rt2x00_rt(rt2x00dev, RT3572) &&\r
+           !rt2x00_rt(rt2x00dev, RT5390) &&\r
++          !rt2x00_rt(rt2x00dev, RT5392) &&\r
+           !rt2800_is_305x_soc(rt2x00dev))\r
+               return 0;\r
+ \r
+       /*\r
+        * Init RF calibration.\r
+        */\r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 2, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR2_RESCAL_EN, 1);\r
+               rt2800_rfcsr_write(rt2x00dev, 2, rfcsr);\r
+@@ -3482,6 +3519,66 @@\r
+                       rt2800_rfcsr_write(rt2x00dev, 61, 0xdd);\r
+               rt2800_rfcsr_write(rt2x00dev, 62, 0x00);\r
+               rt2800_rfcsr_write(rt2x00dev, 63, 0x00);\r
++      }       else if (rt2x00_rt(rt2x00dev, RT5392)) {\r
++                      rt2800_rfcsr_write(rt2x00dev, 1, 0x17);\r
++                      rt2800_rfcsr_write(rt2x00dev, 2, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 3, 0x88);\r
++                      rt2800_rfcsr_write(rt2x00dev, 5, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 6, 0xe0);\r
++                      rt2800_rfcsr_write(rt2x00dev, 7, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 10, 0x53);\r
++                      rt2800_rfcsr_write(rt2x00dev, 11, 0x4a);\r
++                      rt2800_rfcsr_write(rt2x00dev, 12, 0x46);\r
++                      rt2800_rfcsr_write(rt2x00dev, 13, 0x9f);\r
++                      rt2800_rfcsr_write(rt2x00dev, 14, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 15, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 16, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 18, 0x03);\r
++                      rt2800_rfcsr_write(rt2x00dev, 19, 0x4d);\r
++                      rt2800_rfcsr_write(rt2x00dev, 20, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 21, 0x8d);\r
++                      rt2800_rfcsr_write(rt2x00dev, 22, 0x20);\r
++                      rt2800_rfcsr_write(rt2x00dev, 23, 0x0b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 24, 0x44);\r
++                      rt2800_rfcsr_write(rt2x00dev, 25, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 26, 0x82);\r
++                      rt2800_rfcsr_write(rt2x00dev, 27, 0x09);\r
++                      rt2800_rfcsr_write(rt2x00dev, 28, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 29, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 30, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 31, 0x80);\r
++                      rt2800_rfcsr_write(rt2x00dev, 32, 0x20);\r
++                      rt2800_rfcsr_write(rt2x00dev, 33, 0xC0);\r
++                      rt2800_rfcsr_write(rt2x00dev, 34, 0x07);\r
++                      rt2800_rfcsr_write(rt2x00dev, 35, 0x12);\r
++                      rt2800_rfcsr_write(rt2x00dev, 36, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 37, 0x08);\r
++                      rt2800_rfcsr_write(rt2x00dev, 38, 0x89);\r
++                      rt2800_rfcsr_write(rt2x00dev, 39, 0x1b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 40, 0x0f);\r
++                      rt2800_rfcsr_write(rt2x00dev, 41, 0xbb);\r
++                      rt2800_rfcsr_write(rt2x00dev, 42, 0xd5);\r
++                      rt2800_rfcsr_write(rt2x00dev, 43, 0x9b);\r
++                      rt2800_rfcsr_write(rt2x00dev, 44, 0x0e);\r
++                      rt2800_rfcsr_write(rt2x00dev, 45, 0xa2);\r
++                      rt2800_rfcsr_write(rt2x00dev, 46, 0x73);\r
++                      rt2800_rfcsr_write(rt2x00dev, 47, 0x0c);\r
++                      rt2800_rfcsr_write(rt2x00dev, 48, 0x10);\r
++                      rt2800_rfcsr_write(rt2x00dev, 49, 0x94);\r
++                      rt2800_rfcsr_write(rt2x00dev, 50, 0x94);\r
++                      rt2800_rfcsr_write(rt2x00dev, 51, 0x3a);\r
++                      rt2800_rfcsr_write(rt2x00dev, 52, 0x48);\r
++                      rt2800_rfcsr_write(rt2x00dev, 53, 0x44);\r
++                      rt2800_rfcsr_write(rt2x00dev, 54, 0x38);\r
++                      rt2800_rfcsr_write(rt2x00dev, 55, 0x43);\r
++                      rt2800_rfcsr_write(rt2x00dev, 56, 0xa1);\r
++                      rt2800_rfcsr_write(rt2x00dev, 57, 0x00);\r
++                      rt2800_rfcsr_write(rt2x00dev, 58, 0x39);\r
++                      rt2800_rfcsr_write(rt2x00dev, 59, 0x07);\r
++                      rt2800_rfcsr_write(rt2x00dev, 60, 0x45);\r
++                      rt2800_rfcsr_write(rt2x00dev, 61, 0x91);\r
++                      rt2800_rfcsr_write(rt2x00dev, 62, 0x39);\r
++                      rt2800_rfcsr_write(rt2x00dev, 63, 0x07);\r
+       }\r
+ \r
+       if (rt2x00_rt_rev_lt(rt2x00dev, RT3070, REV_RT3070F)) {\r
+@@ -3549,7 +3646,8 @@\r
+                       rt2800_init_rx_filter(rt2x00dev, true, 0x27, 0x15);\r
+       }\r
+ \r
+-      if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++              !rt2x00_rt(rt2x00dev, RT5392)) {\r
+               /*\r
+                * Set back to initial state\r
+                */\r
+@@ -3577,7 +3675,8 @@\r
+       rt2x00_set_field32(&reg, OPT_14_CSR_BIT0, 1);\r
+       rt2800_register_write(rt2x00dev, OPT_14_CSR, reg);\r
+ \r
+-      if (!rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (!rt2x00_rt(rt2x00dev, RT5390) &&\r
++              !rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 17, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR17_TX_LO1_EN, 0);\r
+               if (rt2x00_rt(rt2x00dev, RT3070) ||\r
+@@ -3645,7 +3744,8 @@\r
+               rt2800_rfcsr_write(rt2x00dev, 27, rfcsr);\r
+       }\r
+ \r
+-      if (rt2x00_rt(rt2x00dev, RT5390)) {\r
++      if (rt2x00_rt(rt2x00dev, RT5390) ||\r
++              rt2x00_rt(rt2x00dev, RT5392)) {\r
+               rt2800_rfcsr_read(rt2x00dev, 38, &rfcsr);\r
+               rt2x00_set_field8(&rfcsr, RFCSR38_RX_LO1_EN, 0);\r
+               rt2800_rfcsr_write(rt2x00dev, 38, rfcsr);\r
+@@ -3929,7 +4029,8 @@\r
+        * RT53xx: defined in "EEPROM_CHIP_ID" field\r
+        */\r
+       rt2800_register_read(rt2x00dev, MAC_CSR0, &reg);\r
+-      if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390)\r
++      if (rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5390 ||\r
++              rt2x00_get_field32(reg, MAC_CSR0_CHIPSET) == RT5392)\r
+               rt2x00_eeprom_read(rt2x00dev, EEPROM_CHIP_ID, &value);\r
+       else\r
+               value = rt2x00_get_field16(eeprom, EEPROM_NIC_CONF0_RF_TYPE);\r
+@@ -3947,6 +4048,7 @@\r
+       case RT3390:\r
+       case RT3572:\r
+       case RT5390:\r
++      case RT5392:\r
+               break;\r
+       default:\r
+               ERROR(rt2x00dev, "Invalid RT chipset detected.\n");\r
+@@ -3965,6 +4067,7 @@\r
+       case RF3052:\r
+       case RF3320:\r
+       case RF5370:\r
++      case RF5372:\r
+       case RF5390:\r
+               break;\r
+       default:\r
+@@ -4271,6 +4374,7 @@\r
+                  rt2x00_rf(rt2x00dev, RF3022) ||\r
+                  rt2x00_rf(rt2x00dev, RF3320) ||\r
+                  rt2x00_rf(rt2x00dev, RF5370) ||\r
++                 rt2x00_rf(rt2x00dev, RF5372) ||\r
+                  rt2x00_rf(rt2x00dev, RF5390)) {\r
+               spec->num_channels = 14;\r
+               spec->channels = rf_vals_3x;\r
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2800pci.c linux/drivers/net/wireless/rt2x00/rt2800pci.c\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2800pci.c 2012-10-27 06:39:33.000000000 +0200\r
++++ linux/drivers/net/wireless/rt2x00/rt2800pci.c      2014-02-24 22:56:12.744488448 +0100\r
+@@ -480,7 +480,8 @@\r
+ \r
+       if (rt2x00_is_pcie(rt2x00dev) &&\r
+           (rt2x00_rt(rt2x00dev, RT3572) ||\r
+-           rt2x00_rt(rt2x00dev, RT5390))) {\r
++           rt2x00_rt(rt2x00dev, RT5390) ||\r
++           rt2x00_rt(rt2x00dev, RT5392))) {\r
+               rt2x00pci_register_read(rt2x00dev, AUX_CTRL, &reg);\r
+               rt2x00_set_field32(&reg, AUX_CTRL_FORCE_PCIE_CLK, 1);\r
+               rt2x00_set_field32(&reg, AUX_CTRL_WAKE_PCIE_EN, 1);\r
+diff -Naur linux.orig/drivers/net/wireless/rt2x00/rt2x00.h linux/drivers/net/wireless/rt2x00/rt2x00.h\r
+--- linux.orig/drivers/net/wireless/rt2x00/rt2x00.h    2012-10-27 06:39:33.000000000 +0200\r
++++ linux/drivers/net/wireless/rt2x00/rt2x00.h 2014-02-23 17:59:23.000000000 +0100\r
+@@ -192,6 +192,7 @@\r
+ #define RT3593                0x3593\r
+ #define RT3883                0x3883  /* WSOC */\r
+ #define RT5390                0x5390  /* 2.4GHz */\r
++#define RT5392          0x5392 /* 2.4GHz */\r
+ \r
+       u16 rf;\r
+       u16 rev;\r

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
index 1e7ffae..cd98980 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.1.1.bb
@@ -3,7 +3,7 @@ SECTION = "kernel"
 LICENSE = "GPLv2"
 LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
-PR = "r2"
+PR = "r3"
 KV = "3.1.1"
 SRCREV = "r2"
 
@@ -13,6 +13,7 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/linux-${KV}_${SRCREV}.tar.
        file://fix_cpu_proc.patch;patch=1;pnum=1 \
         file://${MACHINE}_defconfig \
        file://igmp.patch;patch=1;pnum=1 \
+       file://rt5372_kernel_3.1.1.patch \
 "
 
 SRC_URI[md5sum] = "4dc3ac322453abbfaade7020cddea205"

diff --git a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
index f1739a6..1c60f38 100644 (file)
--- a/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
+++ b/meta-bsp/common/recipes/linux/linux-vuplus_3.3.8.bb
@@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d7810fab7487fb0aad327b76f1be7cd7"
 
 KV = "3.3.8"
 
-PR = "r1"
+PR = "r2"
 SRCREV = ""
 
 MODULE = "linux-3.3.8"
@@ -18,6 +18,7 @@ SRC_URI += "http://archive.vuplus.com/download/kernel/stblinux-3.3.6-2.0.tar.bz2
         file://dvb_backport.patch;patch=1;pnum=1 \
        file://bmips-no-array-bounds.patch;patch=1;pnum=1 \
         file://${MACHINE}_defconfig \
+       file://rt5372_kernel_3.3.8.patch \
        "
 
 S = "${WORKDIR}/linux"

diff --git a/meta-bsp/vuduo2/conf/machine/vuduo2.conf b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
index 6268fa8..5dc42a9 100644 (file)
--- a/meta-bsp/vuduo2/conf/machine/vuduo2.conf
+++ b/meta-bsp/vuduo2/conf/machine/vuduo2.conf
@@ -19,6 +19,8 @@ VUPLUS_FEATURES += "transcoding"
 VUPLUS_FEATURES += "webmanual"
 VUPLUS_FEATURES += "wol"
 VUPLUS_FEATURES += "audioeffect"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/duo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-bsp/vusolo/conf/machine/vusolo.conf b/meta-bsp/vusolo/conf/machine/vusolo.conf
index 5db1309..13fdce7 100644 (file)
--- a/meta-bsp/vusolo/conf/machine/vusolo.conf
+++ b/meta-bsp/vusolo/conf/machine/vusolo.conf
@@ -7,6 +7,8 @@ VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "audioeffect"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/solo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-bsp/vusolo2/conf/machine/vusolo2.conf b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
index 3f89a91..824027d 100644 (file)
--- a/meta-bsp/vusolo2/conf/machine/vusolo2.conf
+++ b/meta-bsp/vusolo2/conf/machine/vusolo2.conf
@@ -18,6 +18,8 @@ VUPLUS_FEATURES += "webif"
 VUPLUS_FEATURES += "autoshutdown"
 VUPLUS_FEATURES += "transcoding"
 VUPLUS_FEATURES += "audioeffect"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/solo2"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-bsp/vuultimo/conf/machine/vuultimo.conf b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
index 6e8bf9a..954f588 100644 (file)
--- a/meta-bsp/vuultimo/conf/machine/vuultimo.conf
+++ b/meta-bsp/vuultimo/conf/machine/vuultimo.conf
@@ -15,6 +15,8 @@ VUPLUS_FEATURES += "streamtv"
 VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "vuplus-fpga-update"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/ultimo"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "3894"

diff --git a/meta-bsp/vuuno/conf/machine/vuuno.conf b/meta-bsp/vuuno/conf/machine/vuuno.conf
index 88f2f65..d08872a 100644 (file)
--- a/meta-bsp/vuuno/conf/machine/vuuno.conf
+++ b/meta-bsp/vuuno/conf/machine/vuuno.conf
@@ -12,6 +12,8 @@ VUPLUS_FEATURES += "dlna"
 VUPLUS_FEATURES += "3gmodem"
 VUPLUS_FEATURES += "fpgaupgrade"
 VUPLUS_FEATURES += "vuplus-fpga-update"
+VUPLUS_FEATURES += "ralink-kmod"
+VUPLUS_FEATURES += "ralink-legacy"
 
 IMAGE_UNPACK_PATH = "vuplus/uno"
 MKFS_UBI_MAX_ERASE_BLK_COUNT = "4096"

diff --git a/meta-openvuplus/recipes-connectivity/ralink/rt3070-2.5.0.3/change_device_name_wlan_from_ra.patch b/meta-openvuplus/recipes-connectivity/ralink/rt3070-2.5.0.3/change_device_name_wlan_from_ra.patch
new file mode 100644 (file)
index 0000000..2e39f98
--- /dev/null
+++ b/meta-openvuplus/recipes-connectivity/ralink/rt3070-2.5.0.3/change_device_name_wlan_from_ra.patch
@@ -0,0 +1,68 @@
+diff --git a/common/cmm_wpa.c b/common/cmm_wpa.c
+index f5692dc..4670ffa 100644
+--- a/common/cmm_wpa.c
++++ b/common/cmm_wpa.c
+@@ -4050,7 +4050,7 @@ VOID WPAInstallSharedKey(
+               pSharedKey->CipherAlg = CIPHER_AES;
+       else
+       {
+-              DBGPRINT(RT_DEBUG_ERROR, ("%s : fails (IF/ra%d) \n", 
++              DBGPRINT(RT_DEBUG_ERROR, ("%s : fails (IF/wlan%d) \n", 
+                                                                               __FUNCTION__, BssIdx)); 
+               return;
+       }
+@@ -4062,7 +4062,7 @@ VOID WPAInstallSharedKey(
+               /* Sanity check the length */
+               if ((GtkLen != LEN_WEP64) && (GtkLen != LEN_WEP128))
+               {
+-                      DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/ra%d) WEP key invlaid(%d) \n", 
++                      DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/wlan%d) WEP key invlaid(%d) \n", 
+                                                                               __FUNCTION__, BssIdx, GtkLen)); 
+                       return;
+               }
+@@ -4075,7 +4075,7 @@ VOID WPAInstallSharedKey(
+               /* Sanity check the length */
+               if (GtkLen < LEN_TK)
+               {
+-                      DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/ra%d) WPA key invlaid(%d) \n", 
++                      DBGPRINT(RT_DEBUG_ERROR, ("%s : (IF/wlan%d) WPA key invlaid(%d) \n", 
+                                                                               __FUNCTION__, BssIdx, GtkLen)); 
+                       return;
+               }
+diff --git a/include/rtmp_def.h b/include/rtmp_def.h
+index 9025630..81518f7 100644
+--- a/include/rtmp_def.h
++++ b/include/rtmp_def.h
+@@ -1473,8 +1473,8 @@
+ #define IS_OPMODE_AP(_x)              ((_x)->OpMode == OPMODE_AP)
+ #define IS_OPMODE_STA(_x)             ((_x)->OpMode == OPMODE_STA)
+ 
+-#define INF_MAIN_DEV_NAME             "ra"
+-#define INF_MBSSID_DEV_NAME           "ra"
++#define INF_MAIN_DEV_NAME             "wlan"
++#define INF_MBSSID_DEV_NAME           "wlan"
+ #define INF_WDS_DEV_NAME              "wds"
+ #define INF_APCLI_DEV_NAME            "apcli"
+ #define INF_MESH_DEV_NAME             "mesh"
+diff --git a/os/linux/rt_profile.c b/os/linux/rt_profile.c
+index f3e45dc..4e8eb3d 100644
+--- a/os/linux/rt_profile.c
++++ b/os/linux/rt_profile.c
+@@ -162,7 +162,7 @@ NDIS_STATUS        RTMPReadParametersHook(
+               for (i = 0; i < pAd->ApCfg.BssidNum; i++)
+               {
+                       pAd->ApCfg.MBSSID[i].Hostapd=FALSE;
+-                      DBGPRINT(RT_DEBUG_TRACE, ("Reset ra%d hostapd support=FLASE", i));
++                      DBGPRINT(RT_DEBUG_TRACE, ("Reset wlan%d hostapd support=FLASE", i));
+                       
+               }
+ #endif /*HOSTAPD_SUPPORT */
+@@ -255,7 +255,7 @@ VOID RtmpDrvSendWirelessEvent(
+               if (pAddr)
+                       pBufPtr += sprintf(pBufPtr, "(RT2860) STA(%02x:%02x:%02x:%02x:%02x:%02x) ", PRINT_MAC(pAddr));                          
+               else if (BssIdx < MAX_MBSSID_NUM(pAd))
+-                      pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(ra%d) ", BssIdx);
++                      pBufPtr += sprintf(pBufPtr, "(RT2860) BSS(wlan%d) ", BssIdx);
+               else
+                       pBufPtr += sprintf(pBufPtr, "(RT2860) ");
+ 

diff --git a/meta-openvuplus/recipes-connectivity/ralink/rt3070_2.5.0.3.bb b/meta-openvuplus/recipes-connectivity/ralink/rt3070_2.5.0.3.bb
index 3b83801..6c99be4 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/ralink/rt3070_2.5.0.3.bb
+++ b/meta-openvuplus/recipes-connectivity/ralink/rt3070_2.5.0.3.bb
@@ -2,12 +2,13 @@ SUMMARY = "Driver for Ralink RT8070/3070/3370/5370/5372 USB 802.11abgn WiFi stic
 SECTION = "kernel/modules"
 LICENSE = "GPLv2+"
 LIC_FILES_CHKSUM = "file://os/linux/rt_linux.c;endline=25;md5=21ed2a5918a3062a6c0323ef549f0803"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = " \
         http://sources.dreamboxupdate.com/download/sources/2011_0719_RT3070_RT3370_RT5370_RT5372_Linux_STA_V${PV}_DPO.tar.bz2 \
         file://makefile.patch \
         file://config.patch \
+        file://change_device_name_wlan_from_ra.patch \
 "
 SRC_URI[md5sum] = "8ea0d247ac5881de1cb4c113ebf65724"
 SRC_URI[sha256sum] = "e732d6b114137aa0badf46281d25d442278639d798735317b0061d3ae573593e"
@@ -21,6 +22,9 @@ EXTRA_OEMAKE = "LINUX_SRC=${STAGING_KERNEL_DIR}"
 do_install() {
         install -d ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless
         install -m 0644 ${S}/*sta${KERNEL_OBJECT_SUFFIX} ${D}${base_libdir}/modules/${KERNEL_VERSION}/drivers/net/wireless
-        install -d ${D}${sysconfdir}/Wireless/RT2870STA
-        install -m 0644 ${S}/RT2870STA.dat ${D}${sysconfdir}/Wireless/RT2870STA
+        install -d ${D}${sysconfdir}/modprobe.d
+        touch ${D}${sysconfdir}/modprobe.d/blacklist-wlan.conf
+        echo "blacklist rt2800usb" >> ${D}${sysconfdir}/modprobe.d/blacklist-wlan.conf
+        echo "blacklist rt2800lib" >> ${D}${sysconfdir}/modprobe.d/blacklist-wlan.conf
 }
+

diff --git a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
index efb014b..00b16e5 100644 (file)
--- a/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
+++ b/meta-openvuplus/recipes-connectivity/tasks/task-vuplus-wlan.bb
@@ -2,7 +2,7 @@ DESCRIPTION = "Vuplus: W-LAN Task for the Vuplus Distribution"
 SECTION = "vuplus/base"
 LICENSE = "MIT"
 LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
-PR = "r14"
+PR = "r15"
 
 inherit task
 
@@ -22,10 +22,6 @@ WIFI_FIRMWARES = "\
        firmware-rt3070 \
 "
 
-RALINK_MODULE = "${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb rt2870sta firmware-rt3070', 'rt3070', d)}"
-
-REALTEK_MODULE = "r8192cu"
-
 KERNEL_WIFI_MODULES = " \
        kernel-module-ath9k-htc \
        kernel-module-carl9170 \
@@ -40,15 +36,22 @@ KERNEL_WIFI_MODULES = " \
        kernel-module-stp \
        kernel-module-bridge \
        kernel-module-hostap \
+       ${@base_contains('VUPLUS_FEATURES', 'ralink-kmod', 'kernel-module-rt2800usb', ' ', d)} \
 "
 
 KERNEL_WIFI_MODULES += "${@base_version_less_or_equal('VUPLUS_KERNEL_VERSION', '3.1.1', 'kernel-module-r8192u-usb', '', d)}"
 
+LEGACY_MODULES = " \
+       ${@base_contains('VUPLUS_FEATURES', 'ralink-legacy', 'rt3070', ' ', d)} \
+       r8192cu \
+"
+
 RDEPENDS_${PN}_append = "\
        ${WIFI_FIRMWARES} \
        ${KERNEL_WIFI_MODULES} \
-       ${RALINK_MODULE} \
-       ${REALTEK_MODULE} \
+       ${LEGACY_MODULES} \
+       rt2870sta \
 "
+
 PACKAGE_ARCH = "${MACHINE_ARCH}"
 

diff --git a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
index 2efb3d1..eb58593 100644 (file)
--- a/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
+++ b/meta-openvuplus/recipes-vuplus/enigma2/enigma2.bb
@@ -89,7 +89,7 @@ RDEPENDS_enigma2-plugin-systemplugins-backupsuitehdd = "mtd-utils-mkfs.ubifs mtd
 RDEPENDS_enigma2-plugin-systemplugins-backupsuiteusb = "enigma2-plugin-extensions-backupsuitehdd"
 
 PN = "enigma2"
-PR = "r62"
+PR = "r63"
 
 SRCDATE = "20121128"
 #SRCDATE is NOT used by git to checkout a specific revision