diff options
Diffstat (limited to 'drivers/net/wireless/rt2x00/rt2800lib.c')
-rw-r--r-- | drivers/net/wireless/rt2x00/rt2800lib.c | 24 |
1 files changed, 14 insertions, 10 deletions
diff --git a/drivers/net/wireless/rt2x00/rt2800lib.c b/drivers/net/wireless/rt2x00/rt2800lib.c index c7108050af3..621dac18ca6 100644 --- a/drivers/net/wireless/rt2x00/rt2800lib.c +++ b/drivers/net/wireless/rt2x00/rt2800lib.c | |||
@@ -1684,24 +1684,28 @@ static void rt2800_efuse_read(struct rt2x00_dev *rt2x00dev, unsigned int i) | |||
1684 | { | 1684 | { |
1685 | u32 reg; | 1685 | u32 reg; |
1686 | 1686 | ||
1687 | rt2800_register_read(rt2x00dev, EFUSE_CTRL, ®); | 1687 | mutex_lock(&rt2x00dev->csr_mutex); |
1688 | |||
1689 | rt2800_register_read_lock(rt2x00dev, EFUSE_CTRL, ®); | ||
1688 | rt2x00_set_field32(®, EFUSE_CTRL_ADDRESS_IN, i); | 1690 | rt2x00_set_field32(®, EFUSE_CTRL_ADDRESS_IN, i); |
1689 | rt2x00_set_field32(®, EFUSE_CTRL_MODE, 0); | 1691 | rt2x00_set_field32(®, EFUSE_CTRL_MODE, 0); |
1690 | rt2x00_set_field32(®, EFUSE_CTRL_KICK, 1); | 1692 | rt2x00_set_field32(®, EFUSE_CTRL_KICK, 1); |
1691 | rt2800_register_write(rt2x00dev, EFUSE_CTRL, reg); | 1693 | rt2800_register_write_lock(rt2x00dev, EFUSE_CTRL, reg); |
1692 | 1694 | ||
1693 | /* Wait until the EEPROM has been loaded */ | 1695 | /* Wait until the EEPROM has been loaded */ |
1694 | rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, ®); | 1696 | rt2800_regbusy_read(rt2x00dev, EFUSE_CTRL, EFUSE_CTRL_KICK, ®); |
1695 | 1697 | ||
1696 | /* Apparently the data is read from end to start */ | 1698 | /* Apparently the data is read from end to start */ |
1697 | rt2800_register_read(rt2x00dev, EFUSE_DATA3, | 1699 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA3, |
1698 | (u32 *)&rt2x00dev->eeprom[i]); | 1700 | (u32 *)&rt2x00dev->eeprom[i]); |
1699 | rt2800_register_read(rt2x00dev, EFUSE_DATA2, | 1701 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA2, |
1700 | (u32 *)&rt2x00dev->eeprom[i + 2]); | 1702 | (u32 *)&rt2x00dev->eeprom[i + 2]); |
1701 | rt2800_register_read(rt2x00dev, EFUSE_DATA1, | 1703 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA1, |
1702 | (u32 *)&rt2x00dev->eeprom[i + 4]); | 1704 | (u32 *)&rt2x00dev->eeprom[i + 4]); |
1703 | rt2800_register_read(rt2x00dev, EFUSE_DATA0, | 1705 | rt2800_register_read_lock(rt2x00dev, EFUSE_DATA0, |
1704 | (u32 *)&rt2x00dev->eeprom[i + 6]); | 1706 | (u32 *)&rt2x00dev->eeprom[i + 6]); |
1707 | |||
1708 | mutex_unlock(&rt2x00dev->csr_mutex); | ||
1705 | } | 1709 | } |
1706 | 1710 | ||
1707 | void rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev) | 1711 | void rt2800_read_eeprom_efuse(struct rt2x00_dev *rt2x00dev) |