Commit 66f742f36cb7d6a4f371d72fe5b6e4c7d19e587b

Authored by Eric Lee
1 parent fa5318953a
Exists in v3.2_SBC_SMARTMEN

Upgrade eMMC from 4GB to 8GB

Showing 3 changed files with 18 additions and 15 deletions Side-by-side Diff

drivers/mmc/core/mmc.c
... ... @@ -262,7 +262,7 @@
262 262 }
263 263  
264 264 card->ext_csd.rev = ext_csd[EXT_CSD_REV];
265   - if (card->ext_csd.rev > 7) {
  265 + if (card->ext_csd.rev > 8) {
266 266 pr_err("%s: unrecognised EXT_CSD revision %d\n",
267 267 mmc_hostname(card->host), card->ext_csd.rev);
268 268 err = -EINVAL;
drivers/net/wireless/rtlwifi/rtl8192cu/rf.c
... ... @@ -85,17 +85,15 @@
85 85 if (mac->act_scanning) {
86 86 tx_agc[RF90_PATH_A] = 0x3f3f3f3f;
87 87 tx_agc[RF90_PATH_B] = 0x3f3f3f3f;
88   - if (turbo_scanoff) {
89   - for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
90   - tx_agc[idx1] = ppowerlevel[idx1] |
91   - (ppowerlevel[idx1] << 8) |
92   - (ppowerlevel[idx1] << 16) |
93   - (ppowerlevel[idx1] << 24);
94   - if (rtlhal->interface == INTF_USB) {
95   - if (tx_agc[idx1] > 0x20 &&
96   - rtlefuse->external_pa)
97   - tx_agc[idx1] = 0x20;
98   - }
  88 + for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
  89 + tx_agc[idx1] = ppowerlevel[idx1] |
  90 + (ppowerlevel[idx1] << 8) |
  91 + (ppowerlevel[idx1] << 16) |
  92 + (ppowerlevel[idx1] << 24);
  93 + if (rtlhal->interface == INTF_USB) {
  94 + if (tx_agc[idx1] > 0x20 &&
  95 + rtlefuse->external_pa)
  96 + tx_agc[idx1] = 0x20;
99 97 }
100 98 }
101 99 } else {
... ... @@ -107,7 +105,7 @@
107 105 TXHIGHPWRLEVEL_LEVEL1) {
108 106 tx_agc[RF90_PATH_A] = 0x00000000;
109 107 tx_agc[RF90_PATH_B] = 0x00000000;
110   - } else{
  108 + } else {
111 109 for (idx1 = RF90_PATH_A; idx1 <= RF90_PATH_B; idx1++) {
112 110 tx_agc[idx1] = ppowerlevel[idx1] |
113 111 (ppowerlevel[idx1] << 8) |
... ... @@ -380,7 +378,12 @@
380 378 regoffset == RTXAGC_B_MCS07_MCS04)
381 379 regoffset = 0xc98;
382 380 for (i = 0; i < 3; i++) {
383   - writeVal = (writeVal > 6) ? (writeVal - 6) : 0;
  381 + if (i != 2)
  382 + writeVal = (writeVal > 8) ?
  383 + (writeVal - 8) : 0;
  384 + else
  385 + writeVal = (writeVal > 6) ?
  386 + (writeVal - 6) : 0;
384 387 rtl_write_byte(rtlpriv, (u32)(regoffset + i),
385 388 (u8)writeVal);
386 389 }
drivers/net/wireless/rtlwifi/usb.c
... ... @@ -105,7 +105,7 @@
105 105 reqtype = REALTEK_USB_VENQT_READ;
106 106  
107 107 status = usb_control_msg(udev, pipe, request, reqtype, value, index,
108   - pdata, len, 0); /* max. timeout */
  108 + pdata, len, 1000); /* max. timeout */
109 109  
110 110 if (status < 0)
111 111 pr_err("reg 0x%x, usbctrl_vendorreq TimeOut! status:0x%x value=0x%x\n",