Merge branch 'master' into for-upstream

Conflicts:

	Documentation/ABI/testing/sysfs-bus-usb
	drivers/Makefile

2 files changed, 60 insertions, 46 deletions

diff --git a/drivers/ssb/pci.c b/drivers/ssb/pci.c
index f883dcfffe06..d5cde051806b 100644
--- a/drivers/ssb/pci.c
+++ b/drivers/ssb/pci.c
@@ -327,11 +327,9 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         s8 gain;
         u16 loc[3];
 
-        if (out->revision == 3) {                       /* rev 3 moved MAC */
+        if (out->revision == 3)                 /* rev 3 moved MAC */
                 loc[0] = SSB_SPROM3_IL0MAC;
-                loc[1] = SSB_SPROM3_ET0MAC;
-                loc[2] = SSB_SPROM3_ET1MAC;
-        } else {
+        else {
                 loc[0] = SSB_SPROM1_IL0MAC;
                 loc[1] = SSB_SPROM1_ET0MAC;
                 loc[2] = SSB_SPROM1_ET1MAC;
@@ -340,13 +338,15 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
                 v = in[SPOFF(loc[0]) + i];
                 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
         }
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(loc[1]) + i];
-                *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
-        }
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(loc[2]) + i];
-                *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
+        if (out->revision < 3) {        /* only rev 1-2 have et0, et1 */
+                for (i = 0; i < 3; i++) {
+                        v = in[SPOFF(loc[1]) + i];
+                        *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
+                }
+                for (i = 0; i < 3; i++) {
+                        v = in[SPOFF(loc[2]) + i];
+                        *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
+                }
         }
         SPEX(et0phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET0A, 0);
         SPEX(et1phyaddr, SSB_SPROM1_ETHPHY, SSB_SPROM1_ETHPHY_ET1A,
@@ -399,30 +399,33 @@ static void sprom_extract_r123(struct ssb_sprom *out, const u16 *in)
         out->antenna_gain.ghz5.a3 = gain;
 }
 
-static void sprom_extract_r4(struct ssb_sprom *out, const u16 *in)
+static void sprom_extract_r45(struct ssb_sprom *out, const u16 *in)
 {
         int i;
         u16 v;
+        u16 il0mac_offset;
 
-        /* extract the equivalent of the r1 variables */
+        if (out->revision == 4)
+                il0mac_offset = SSB_SPROM4_IL0MAC;
+        else
+                il0mac_offset = SSB_SPROM5_IL0MAC;
+        /* extract the MAC address */
         for (i = 0; i < 3; i++) {
-                v = in[SPOFF(SSB_SPROM4_IL0MAC) + i];
+                v = in[SPOFF(il0mac_offset) + i];
                 *(((__be16 *)out->il0mac) + i) = cpu_to_be16(v);
         }
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(SSB_SPROM4_ET0MAC) + i];
-                *(((__be16 *)out->et0mac) + i) = cpu_to_be16(v);
-        }
-        for (i = 0; i < 3; i++) {
-                v = in[SPOFF(SSB_SPROM4_ET1MAC) + i];
-                *(((__be16 *)out->et1mac) + i) = cpu_to_be16(v);
-        }
         SPEX(et0phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET0A, 0);
         SPEX(et1phyaddr, SSB_SPROM4_ETHPHY, SSB_SPROM4_ETHPHY_ET1A,
              SSB_SPROM4_ETHPHY_ET1A_SHIFT);
-        SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
-        SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
-        SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
+        if (out->revision == 4) {
+                SPEX(country_code, SSB_SPROM4_CCODE, 0xFFFF, 0);
+                SPEX(boardflags_lo, SSB_SPROM4_BFLLO, 0xFFFF, 0);
+                SPEX(boardflags_hi, SSB_SPROM4_BFLHI, 0xFFFF, 0);
+        } else {
+                SPEX(country_code, SSB_SPROM5_CCODE, 0xFFFF, 0);
+                SPEX(boardflags_lo, SSB_SPROM5_BFLLO, 0xFFFF, 0);
+                SPEX(boardflags_hi, SSB_SPROM5_BFLHI, 0xFFFF, 0);
+        }
         SPEX(ant_available_a, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_A,
              SSB_SPROM4_ANTAVAIL_A_SHIFT);
         SPEX(ant_available_bg, SSB_SPROM4_ANTAVAIL, SSB_SPROM4_ANTAVAIL_BG,
@@ -433,12 +436,21 @@ static void sprom_extract_r4(struct ssb_sprom *out, const u16 *in)
         SPEX(maxpwr_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_MAXP_A_MASK, 0);
         SPEX(itssi_a, SSB_SPROM4_MAXP_A, SSB_SPROM4_ITSSI_A,
              SSB_SPROM4_ITSSI_A_SHIFT);
-        SPEX(gpio0, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P0, 0);
-        SPEX(gpio1, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P1,
-             SSB_SPROM4_GPIOA_P1_SHIFT);
-        SPEX(gpio2, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P2, 0);
-        SPEX(gpio3, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P3,
-             SSB_SPROM4_GPIOB_P3_SHIFT);
+        if (out->revision == 4) {
+                SPEX(gpio0, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P0, 0);
+                SPEX(gpio1, SSB_SPROM4_GPIOA, SSB_SPROM4_GPIOA_P1,
+                     SSB_SPROM4_GPIOA_P1_SHIFT);
+                SPEX(gpio2, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P2, 0);
+                SPEX(gpio3, SSB_SPROM4_GPIOB, SSB_SPROM4_GPIOB_P3,
+                     SSB_SPROM4_GPIOB_P3_SHIFT);
+        } else {
+                SPEX(gpio0, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P0, 0);
+                SPEX(gpio1, SSB_SPROM5_GPIOA, SSB_SPROM5_GPIOA_P1,
+                     SSB_SPROM5_GPIOA_P1_SHIFT);
+                SPEX(gpio2, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P2, 0);
+                SPEX(gpio3, SSB_SPROM5_GPIOB, SSB_SPROM5_GPIOB_P3,
+                     SSB_SPROM5_GPIOB_P3_SHIFT);
+        }
 
         /* Extract the antenna gain values. */
         SPEX(antenna_gain.ghz24.a0, SSB_SPROM4_AGAIN01,
@@ -462,6 +474,8 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
 
         out->revision = in[size - 1] & 0x00FF;
         ssb_dprintk(KERN_DEBUG PFX "SPROM revision %d detected.\n", out->revision);
+        memset(out->et0mac, 0xFF, 6);           /* preset et0 and et1 mac */
+        memset(out->et1mac, 0xFF, 6);
         if ((bus->chip_id & 0xFF00) == 0x4400) {
                 /* Workaround: The BCM44XX chip has a stupid revision
                  * number stored in the SPROM.
@@ -471,16 +485,16 @@ static int sprom_extract(struct ssb_bus *bus, struct ssb_sprom *out,
         } else if (bus->chip_id == 0x4321) {
                 /* the BCM4328 has a chipid == 0x4321 and a rev 4 SPROM */
                 out->revision = 4;
-                sprom_extract_r4(out, in);
+                sprom_extract_r45(out, in);
         } else {
                 if (out->revision == 0)
                         goto unsupported;
                 if (out->revision >= 1 && out->revision <= 3) {
                         sprom_extract_r123(out, in);
                 }
-                if (out->revision == 4)
-                        sprom_extract_r4(out, in);
-                if (out->revision >= 5)
+                if (out->revision == 4 || out->revision == 5)
+                        sprom_extract_r45(out, in);
+                if (out->revision > 5)
                         goto unsupported;
         }
 
diff --git a/drivers/ssb/pcmcia.c b/drivers/ssb/pcmcia.c
index 24c2a46c1476..fbfadbac67e8 100644
--- a/drivers/ssb/pcmcia.c
+++ b/drivers/ssb/pcmcia.c
@@ -80,7 +80,7 @@ static int ssb_pcmcia_cfg_write(struct ssb_bus *bus, u8 offset, u8 value)
         reg.Action = CS_WRITE;
         reg.Value = value;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
 
         return 0;
@@ -96,7 +96,7 @@ static int ssb_pcmcia_cfg_read(struct ssb_bus *bus, u8 offset, u8 *value)
         reg.Offset = offset;
         reg.Action = CS_READ;
         res = pcmcia_access_configuration_register(bus->host_pcmcia, &reg);
-        if (unlikely(res != CS_SUCCESS))
+        if (unlikely(res != 0))
                 return -EBUSY;
         *value = reg.Value;
 
@@ -638,17 +638,17 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "MAC first tpl data");
+        GOTO_ERROR_ON(res != 0, "MAC first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "MAC tpl < 1");
                 if (tuple.TupleData[0] == CISTPL_FUNCE_LAN_NODE_ID)
                         break;
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "MAC next tpl data");
+                GOTO_ERROR_ON(res != 0, "MAC next tpl data");
         }
         GOTO_ERROR_ON(tuple.TupleDataLen != ETH_ALEN + 2, "MAC tpl size");
         memcpy(sprom->il0mac, &tuple.TupleData[2], ETH_ALEN);
@@ -659,9 +659,9 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
         tuple.TupleData = buf;
         tuple.TupleDataMax = sizeof(buf);
         res = pcmcia_get_first_tuple(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl");
         res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-        GOTO_ERROR_ON(res != CS_SUCCESS, "VEN first tpl data");
+        GOTO_ERROR_ON(res != 0, "VEN first tpl data");
         while (1) {
                 GOTO_ERROR_ON(tuple.TupleDataLen < 1, "VEN tpl < 1");
                 switch (tuple.TupleData[0]) {
@@ -733,11 +733,11 @@ int ssb_pcmcia_get_invariants(struct ssb_bus *bus,
                         break;
                 }
                 res = pcmcia_get_next_tuple(bus->host_pcmcia, &tuple);
-                if (res == CS_NO_MORE_ITEMS)
+                if (res == -ENOSPC)
                         break;
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl");
                 res = pcmcia_get_tuple_data(bus->host_pcmcia, &tuple);
-                GOTO_ERROR_ON(res != CS_SUCCESS, "VEN next tpl data");
+                GOTO_ERROR_ON(res != 0, "VEN next tpl data");
         }
 
         return 0;