diff options
Diffstat (limited to 'drivers/ssb')
-rw-r--r-- | drivers/ssb/main.c | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/drivers/ssb/main.c b/drivers/ssb/main.c index 74aa2cca7d8c..ad3da93a428c 100644 --- a/drivers/ssb/main.c +++ b/drivers/ssb/main.c | |||
@@ -1117,23 +1117,22 @@ static u32 ssb_tmslow_reject_bitmask(struct ssb_device *dev) | |||
1117 | { | 1117 | { |
1118 | u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV; | 1118 | u32 rev = ssb_read32(dev, SSB_IDLOW) & SSB_IDLOW_SSBREV; |
1119 | 1119 | ||
1120 | /* The REJECT bit changed position in TMSLOW between | 1120 | /* The REJECT bit seems to be different for Backplane rev 2.3 */ |
1121 | * Backplane revisions. */ | ||
1122 | switch (rev) { | 1121 | switch (rev) { |
1123 | case SSB_IDLOW_SSBREV_22: | 1122 | case SSB_IDLOW_SSBREV_22: |
1124 | return SSB_TMSLOW_REJECT_22; | 1123 | case SSB_IDLOW_SSBREV_24: |
1124 | case SSB_IDLOW_SSBREV_26: | ||
1125 | return SSB_TMSLOW_REJECT; | ||
1125 | case SSB_IDLOW_SSBREV_23: | 1126 | case SSB_IDLOW_SSBREV_23: |
1126 | return SSB_TMSLOW_REJECT_23; | 1127 | return SSB_TMSLOW_REJECT_23; |
1127 | case SSB_IDLOW_SSBREV_24: /* TODO - find the proper REJECT bits */ | 1128 | case SSB_IDLOW_SSBREV_25: /* TODO - find the proper REJECT bit */ |
1128 | case SSB_IDLOW_SSBREV_25: /* same here */ | ||
1129 | case SSB_IDLOW_SSBREV_26: /* same here */ | ||
1130 | case SSB_IDLOW_SSBREV_27: /* same here */ | 1129 | case SSB_IDLOW_SSBREV_27: /* same here */ |
1131 | return SSB_TMSLOW_REJECT_23; /* this is a guess */ | 1130 | return SSB_TMSLOW_REJECT; /* this is a guess */ |
1132 | default: | 1131 | default: |
1133 | printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev); | 1132 | printk(KERN_INFO "ssb: Backplane Revision 0x%.8X\n", rev); |
1134 | WARN_ON(1); | 1133 | WARN_ON(1); |
1135 | } | 1134 | } |
1136 | return (SSB_TMSLOW_REJECT_22 | SSB_TMSLOW_REJECT_23); | 1135 | return (SSB_TMSLOW_REJECT | SSB_TMSLOW_REJECT_23); |
1137 | } | 1136 | } |
1138 | 1137 | ||
1139 | int ssb_device_is_enabled(struct ssb_device *dev) | 1138 | int ssb_device_is_enabled(struct ssb_device *dev) |