github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

nvmem: rockchip-efuse: Update driver to use clk_bulk array APIs

Browse Source 
Change-Id: I0489a992ed7edb3317b1b5a57522df3a5374cec2
Signed-off-by: Finley Xiao <finley.xiao@rock-chips.com>
This commit is contained in:
Finley Xiao 2020-05-09 09:04:27 +08:00
parent cb4ecc7dc3
commit bd2d7d615f
1 changed files with 24 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/nvmem/rockchip-efuse.c
View File

@ -96,8 +96,8 @@
struct rockchip_efuse_chip {
struct device *dev;
void __iomem *base;
struct clk *clk;
struct clk *sclk;
struct clk_bulk_data *clks;
int num_clks;
phys_addr_t phys;
};
@ -148,16 +148,9 @@ static int rockchip_rk1808_efuse_read(void *context, unsigned int offset,
u8 *buf;
int ret, i = 0;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse pclk\n");
return ret;
}
ret = clk_prepare_enable(efuse->sclk);
if (ret < 0) {
clk_disable_unprepare(efuse->clk);
dev_err(efuse->dev, "failed to prepare/enable efuse sclk\n");
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
}
@ -196,8 +189,7 @@ static int rockchip_rk1808_efuse_read(void *context, unsigned int offset,
kfree(buf);
nomem:
rk1808_efuse_timing_deinit(efuse->base);
clk_disable_unprepare(efuse->clk);
clk_disable_unprepare(efuse->sclk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return ret;
}
@ -209,7 +201,7 @@ static int rockchip_rk3128_efuse_read(void *context, unsigned int offset,
u8 *buf = val;
int ret;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -237,7 +229,7 @@ static int rockchip_rk3128_efuse_read(void *context, unsigned int offset,
/* Switch to standby mode */
writel(RK3288_PGENB | RK3288_CSB, efuse->base + REG_EFUSE_CTRL);
clk_disable_unprepare(efuse->clk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return 0;
}
@ -249,7 +241,7 @@ static int rockchip_rk3288_efuse_read(void *context, unsigned int offset,
u8 *buf = val;
int ret;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -277,7 +269,7 @@ static int rockchip_rk3288_efuse_read(void *context, unsigned int offset,
/* Switch to standby mode */
writel(RK3288_PGENB | RK3288_CSB, efuse->base + REG_EFUSE_CTRL);
clk_disable_unprepare(efuse->clk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return 0;
}
@ -291,7 +283,7 @@ static int rockchip_rk3288_efuse_secure_read(void *context,
u32 wr_val;
int ret;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -323,7 +315,7 @@ static int rockchip_rk3288_efuse_secure_read(void *context,
sip_smc_secure_reg_write(efuse->phys + REG_EFUSE_CTRL,
RK3288_PGENB | RK3288_CSB);
clk_disable_unprepare(efuse->clk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return 0;
}
@ -337,7 +329,7 @@ static int rockchip_rk3328_efuse_read(void *context, unsigned int offset,
u8 *buf;
int ret, i = 0;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -378,7 +370,7 @@ static int rockchip_rk3328_efuse_read(void *context, unsigned int offset,
err:
kfree(buf);
nomem:
clk_disable_unprepare(efuse->clk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return ret;
}
@ -391,7 +383,7 @@ static int rockchip_rk3368_efuse_read(void *context, unsigned int offset,
u32 wr_val;
int ret;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -423,7 +415,7 @@ static int rockchip_rk3368_efuse_read(void *context, unsigned int offset,
sip_smc_secure_reg_write(efuse->phys + REG_EFUSE_CTRL,
RK3288_PGENB | RK3288_CSB);
clk_disable_unprepare(efuse->clk);
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return 0;
}
@ -437,7 +429,7 @@ static int rockchip_rk3399_efuse_read(void *context, unsigned int offset,
u8 *buf;
int ret, i = 0;
ret = clk_prepare_enable(efuse->clk);
ret = clk_bulk_prepare_enable(efuse->num_clks, efuse->clks);
if (ret < 0) {
dev_err(efuse->dev, "failed to prepare/enable efuse clk\n");
return ret;
@ -451,8 +443,8 @@ static int rockchip_rk3399_efuse_read(void *context, unsigned int offset,
buf = kzalloc(array3_size(addr_len, RK3399_NBYTES, sizeof(*buf)),
GFP_KERNEL);
if (!buf) {
clk_disable_unprepare(efuse->clk);
return -ENOMEM;
ret = -ENOMEM;
goto disable_clks;
}
writel(RK3399_LOAD | RK3399_PGENB | RK3399_STROBSFTSEL | RK3399_RSB,
@ -479,9 +471,10 @@ static int rockchip_rk3399_efuse_read(void *context, unsigned int offset,
kfree(buf);
clk_disable_unprepare(efuse->clk);
disable_clks:
clk_bulk_disable_unprepare(efuse->num_clks, efuse->clks);
return 0;
return ret;
}
static struct nvmem_config econfig = {
@ -548,7 +541,6 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
struct rockchip_efuse_chip *efuse;
const void *data;
struct device *dev = &pdev->dev;
int count;
data = of_device_get_match_data(dev);
if (!data) {
@ -567,17 +559,9 @@ static int rockchip_efuse_probe(struct platform_device *pdev)
if (IS_ERR(efuse->base))
return PTR_ERR(efuse->base);
efuse->clk = devm_clk_get(dev, "pclk_efuse");
if (IS_ERR(efuse->clk))
return PTR_ERR(efuse->clk);
count = of_clk_get_parent_count(pdev->dev.of_node);
if (count == 2)
efuse->sclk = devm_clk_get(&pdev->dev, "sclk_efuse");
else
efuse->sclk = efuse->clk;
if (IS_ERR(efuse->sclk))
return PTR_ERR(efuse->sclk);
efuse->num_clks = devm_clk_bulk_get_all(dev, &efuse->clks);
if (efuse->num_clks < 1)
return -ENODEV;
efuse->dev = dev;
if (of_property_read_u32(dev->of_node, "rockchip,efuse-size",