developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 1 | From 14baf1e2df409bdfdf3255dbe8ad5ecc1852b8b0 Mon Sep 17 00:00:00 2001 |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 2 | From: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 3 | Date: Tue, 15 Mar 2022 14:21:13 +0800 |
| 4 | Subject: [PATCH] mt76: mt7915: update mt7986 CR for different adie version |
| 5 | |
| 6 | Signed-off-by: Peter Chiu <chui-hao.chiu@mediatek.com> |
| 7 | --- |
| 8 | mt7915/regs.h | 1 + |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 9 | mt7915/soc.c | 21 ++++++++++++++++++--- |
| 10 | 2 files changed, 19 insertions(+), 3 deletions(-) |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 11 | |
| 12 | diff --git a/mt7915/regs.h b/mt7915/regs.h |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 13 | index cb7c7e14..97984aaf 100644 |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 14 | --- a/mt7915/regs.h |
| 15 | +++ b/mt7915/regs.h |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 16 | @@ -822,6 +822,7 @@ enum offs_rev { |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 17 | |
| 18 | /* ADIE */ |
| 19 | #define MT_ADIE_CHIP_ID 0x02c |
| 20 | +#define MT_ADIE_VERSION_MASK GENMASK(15, 0) |
| 21 | #define MT_ADIE_CHIP_ID_MASK GENMASK(31, 16) |
| 22 | #define MT_ADIE_IDX0 GENMASK(15, 0) |
| 23 | #define MT_ADIE_IDX1 GENMASK(31, 16) |
| 24 | diff --git a/mt7915/soc.c b/mt7915/soc.c |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 25 | index d465f8d8..a977f90a 100644 |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 26 | --- a/mt7915/soc.c |
| 27 | +++ b/mt7915/soc.c |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 28 | @@ -469,17 +469,32 @@ static int mt7986_wmac_adie_xtal_trim_7976(struct mt7915_dev *dev, u8 adie) |
| 29 | |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 30 | static int mt7986_wmac_adie_patch_7976(struct mt7915_dev *dev, u8 adie) |
| 31 | { |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 32 | + u32 id, version, rg_xo_01, rg_xo_03; |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 33 | int ret; |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 34 | |
| 35 | - ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_TOP_THADC, 0x4a563b00); |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 36 | + ret = mt76_wmac_spi_read(dev, adie, MT_ADIE_CHIP_ID, &id); |
| 37 | if (ret) |
| 38 | return ret; |
| 39 | |
| 40 | - ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_01, 0x1d59080f); |
| 41 | + version = FIELD_GET(MT_ADIE_VERSION_MASK, id); |
| 42 | + |
| 43 | + ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_TOP_THADC, 0x4a563b00); |
| 44 | if (ret) |
| 45 | return ret; |
| 46 | |
| 47 | - return mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_03, 0x34c00fe0); |
| 48 | + if (version == 0x8a00 || version == 0x8a10 || version == 0x8b00) { |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 49 | + rg_xo_01 = 0x1d59080f; |
| 50 | + rg_xo_03 = 0x34c00fe0; |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 51 | + } else { |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 52 | + rg_xo_01 = 0x1959f80f; |
| 53 | + rg_xo_03 = 0x34d00fe0; |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 54 | + } |
| 55 | + |
developer | e0b7dc2 | 2022-05-04 13:56:10 +0800 | [diff] [blame] | 56 | + ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_01, rg_xo_01); |
| 57 | + if (ret) |
| 58 | + return ret; |
| 59 | + |
| 60 | + return mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_03, rg_xo_03); |
developer | 1d1e456 | 2022-03-17 00:06:34 +0800 | [diff] [blame] | 61 | } |
| 62 | |
| 63 | static int |
| 64 | -- |
| 65 | 2.18.0 |
| 66 | |