developer | ec4ebe4 | 2022-04-12 11:17:45 +0800 | [diff] [blame^] | 1 | From 87efddcc9bb605802fdabe8bf3408a106bf5b997 Mon Sep 17 00:00:00 2001 |
| 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 + |
| 9 | mt7915/soc.c | 24 +++++++++++++++++++++--- |
| 10 | 2 files changed, 22 insertions(+), 3 deletions(-) |
| 11 | |
| 12 | diff --git a/mt7915/regs.h b/mt7915/regs.h |
| 13 | index e5f93c40..a69ba562 100644 |
| 14 | --- a/mt7915/regs.h |
| 15 | +++ b/mt7915/regs.h |
| 16 | @@ -794,6 +794,7 @@ enum offs_rev { |
| 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 |
| 25 | index 04df47fd..e1892368 100644 |
| 26 | --- a/mt7915/soc.c |
| 27 | +++ b/mt7915/soc.c |
| 28 | @@ -468,16 +468,34 @@ static int mt7986_wmac_adie_xtal_trim_7976(struct mt7915_dev *dev, u8 adie) |
| 29 | static int mt7986_wmac_adie_patch_7976(struct mt7915_dev *dev, u8 adie) |
| 30 | { |
| 31 | int ret; |
| 32 | + u32 id, version; |
| 33 | |
| 34 | - ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_TOP_THADC, 0x4a563b00); |
| 35 | + |
| 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) { |
| 49 | + ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_01, 0x1d59080f); |
| 50 | + if (ret) |
| 51 | + return ret; |
| 52 | + |
| 53 | + mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_03, 0x34c00fe0); |
| 54 | + } else { |
| 55 | + ret = mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_01, 0x1959c80f); |
| 56 | + if (ret) |
| 57 | + return ret; |
| 58 | + |
| 59 | + mt76_wmac_spi_write(dev, adie, MT_ADIE_RG_XO_03, 0x34d00fe0); |
| 60 | + } |
| 61 | + |
| 62 | + return ret; |
| 63 | } |
| 64 | |
| 65 | static int |
| 66 | -- |
| 67 | 2.18.0 |
| 68 | |