Lubancat2/kernel
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nvmem: rk628-efuse: Fix rk630 efuse clk enable/disable

Browse Source 
Signed-off-by: Algea Cao <algea.cao@rock-chips.com>
Change-Id: Ie876e46645d3c7fd843ecb78200c958859edb89d
This commit is contained in:
Algea Cao
2022-03-12 16:44:12 +08:00
committed by Tao Huang
parent 85bf366b25
commit a8ab15fdb1
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/nvmem/rk628-efuse.c
View File

@ -180,7 +180,7 @@ static int rk628_efuse_read(void *context, unsigned int offset,
return ret;
}
} else {
regmap_write(efuse->cru, CRU_GATE_CON0, PCLK_EFUSE_EN_MASK | PCLK_EFUSE_EN);
regmap_write(efuse->cru, CRU_GATE_CON0, PCLK_EFUSE_EN_MASK);
}
addr_start = rounddown(offset, RK628_NBYTES) / RK628_NBYTES;
@ -220,7 +220,7 @@ nomem:
if (efuse->clk)
clk_disable_unprepare(efuse->clk);
else
regmap_write(efuse->cru, CRU_GATE_CON0, PCLK_EFUSE_EN_MASK);
regmap_write(efuse->cru, CRU_GATE_CON0, PCLK_EFUSE_EN_MASK | PCLK_EFUSE_DISABLE);
return ret;
}

2
include/linux/mfd/rk630.h
View File

@ -161,7 +161,7 @@
#define CRU_CLKSEL_CON3 CRU_REG(0x003c)
#define CRU_GATE_CON0 CRU_REG(0x0040)
#define PCLK_EFUSE_EN_MASK BIT(14 + 16)
#define PCLK_EFUSE_EN BIT(14)
#define PCLK_EFUSE_DISABLE BIT(14)
#define DCLK_CVBS_1X_PLL_CLK_EN_MASK HIWORD_MASK(12, 12)
#define DCLK_CVBS_1X_PLL_CLK_EN(x) HIWORD_UPDATE(x, 12, 12)
#define DCLK_CVBS_4X_PLL_CLK_EN_MASK HIWORD_MASK(11, 11)