|
@@ -1117,23 +1117,22 @@ static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev)
|
|
|
{
|
|
|
u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV;
|
|
|
|
|
|
- /* The REJECT bit changed position in TMSLOW between
|
|
|
- * Backplane revisions. */
|
|
|
+ /* The REJECT bit seems to be different for Backplane rev 2.3 */
|
|
|
switch (rev) {
|
|
|
case SSB_IDLOW_SSBREV_22:
|
|
|
- return SSB_TMSLOW_REJECT_22;
|
|
|
+ case SSB_IDLOW_SSBREV_24:
|
|
|
+ case SSB_IDLOW_SSBREV_26:
|
|
|
+ return SSB_TMSLOW_REJECT;
|
|
|
case SSB_IDLOW_SSBREV_23:
|
|
|
return SSB_TMSLOW_REJECT_23;
|
|
|
- case SSB_IDLOW_SSBREV_24: /* TODO - find the proper REJECT bits */
|
|
|
- case SSB_IDLOW_SSBREV_25: /* same here */
|
|
|
- case SSB_IDLOW_SSBREV_26: /* same here */
|
|
|
+ case SSB_IDLOW_SSBREV_25: /* TODO - find the proper REJECT bit */
|
|
|
case SSB_IDLOW_SSBREV_27: /* same here */
|
|
|
- return SSB_TMSLOW_REJECT_23; /* this is a guess */
|
|
|
+ return SSB_TMSLOW_REJECT; /* this is a guess */
|
|
|
default:
|
|
|
printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev);
|
|
|
WARN_ON(1);
|
|
|
}
|
|
|
- return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23);
|
|
|
+ return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23);
|
|
|
}
|
|
|
|
|
|
int ssb_device_is_enabled(struct ssb_device *dev)
|