mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-01 22:54:01 +00:00
nvmem: rockchip-otp: Add clks and reg_read to rockchip_data
In preparation to support new Rockchip OTP memory devices with different clock configurations and register layout, extend rockchip_data struct with the related members: clks, num_clks, reg_read. Additionally, to avoid managing redundant driver data, drop num_clks member from rockchip_otp struct and update all references to point to the equivalent member in rockchip_data. Signed-off-by: Cristian Ciocaltea <cristian.ciocaltea@collabora.com> Tested-by: Vincent Legoll <vincent.legoll@gmail.com> Reviewed-by: Heiko Stuebner <heiko@sntech.de> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> Message-ID: <20230611140330.154222-10-srinivas.kandagatla@linaro.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
parent
2d87a3b140
commit
8dc6136416
1 changed files with 49 additions and 30 deletions
|
@ -54,21 +54,19 @@
|
||||||
|
|
||||||
#define OTPC_TIMEOUT 10000
|
#define OTPC_TIMEOUT 10000
|
||||||
|
|
||||||
|
struct rockchip_data {
|
||||||
|
int size;
|
||||||
|
const char * const *clks;
|
||||||
|
int num_clks;
|
||||||
|
nvmem_reg_read_t reg_read;
|
||||||
|
};
|
||||||
|
|
||||||
struct rockchip_otp {
|
struct rockchip_otp {
|
||||||
struct device *dev;
|
struct device *dev;
|
||||||
void __iomem *base;
|
void __iomem *base;
|
||||||
struct clk_bulk_data *clks;
|
struct clk_bulk_data *clks;
|
||||||
int num_clks;
|
|
||||||
struct reset_control *rst;
|
struct reset_control *rst;
|
||||||
};
|
const struct rockchip_data *data;
|
||||||
|
|
||||||
/* list of required clocks */
|
|
||||||
static const char * const rockchip_otp_clocks[] = {
|
|
||||||
"otp", "apb_pclk", "phy",
|
|
||||||
};
|
|
||||||
|
|
||||||
struct rockchip_data {
|
|
||||||
int size;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
static int rockchip_otp_reset(struct rockchip_otp *otp)
|
static int rockchip_otp_reset(struct rockchip_otp *otp)
|
||||||
|
@ -132,29 +130,23 @@ static int rockchip_otp_ecc_enable(struct rockchip_otp *otp, bool enable)
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static int rockchip_otp_read(void *context, unsigned int offset,
|
static int px30_otp_read(void *context, unsigned int offset,
|
||||||
void *val, size_t bytes)
|
void *val, size_t bytes)
|
||||||
{
|
{
|
||||||
struct rockchip_otp *otp = context;
|
struct rockchip_otp *otp = context;
|
||||||
u8 *buf = val;
|
u8 *buf = val;
|
||||||
int ret = 0;
|
int ret;
|
||||||
|
|
||||||
ret = clk_bulk_prepare_enable(otp->num_clks, otp->clks);
|
|
||||||
if (ret < 0) {
|
|
||||||
dev_err(otp->dev, "failed to prepare/enable clks\n");
|
|
||||||
return ret;
|
|
||||||
}
|
|
||||||
|
|
||||||
ret = rockchip_otp_reset(otp);
|
ret = rockchip_otp_reset(otp);
|
||||||
if (ret) {
|
if (ret) {
|
||||||
dev_err(otp->dev, "failed to reset otp phy\n");
|
dev_err(otp->dev, "failed to reset otp phy\n");
|
||||||
goto disable_clks;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
ret = rockchip_otp_ecc_enable(otp, false);
|
ret = rockchip_otp_ecc_enable(otp, false);
|
||||||
if (ret < 0) {
|
if (ret < 0) {
|
||||||
dev_err(otp->dev, "rockchip_otp_ecc_enable err\n");
|
dev_err(otp->dev, "rockchip_otp_ecc_enable err\n");
|
||||||
goto disable_clks;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
writel(OTPC_USE_USER | OTPC_USE_USER_MASK, otp->base + OTPC_USER_CTRL);
|
writel(OTPC_USE_USER | OTPC_USE_USER_MASK, otp->base + OTPC_USER_CTRL);
|
||||||
|
@ -174,8 +166,28 @@ static int rockchip_otp_read(void *context, unsigned int offset,
|
||||||
|
|
||||||
read_end:
|
read_end:
|
||||||
writel(0x0 | OTPC_USE_USER_MASK, otp->base + OTPC_USER_CTRL);
|
writel(0x0 | OTPC_USE_USER_MASK, otp->base + OTPC_USER_CTRL);
|
||||||
disable_clks:
|
|
||||||
clk_bulk_disable_unprepare(otp->num_clks, otp->clks);
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
static int rockchip_otp_read(void *context, unsigned int offset,
|
||||||
|
void *val, size_t bytes)
|
||||||
|
{
|
||||||
|
struct rockchip_otp *otp = context;
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
if (!otp->data || !otp->data->reg_read)
|
||||||
|
return -EINVAL;
|
||||||
|
|
||||||
|
ret = clk_bulk_prepare_enable(otp->data->num_clks, otp->clks);
|
||||||
|
if (ret < 0) {
|
||||||
|
dev_err(otp->dev, "failed to prepare/enable clks\n");
|
||||||
|
return ret;
|
||||||
|
}
|
||||||
|
|
||||||
|
ret = otp->data->reg_read(context, offset, val, bytes);
|
||||||
|
|
||||||
|
clk_bulk_disable_unprepare(otp->data->num_clks, otp->clks);
|
||||||
|
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
@ -189,8 +201,15 @@ static struct nvmem_config otp_config = {
|
||||||
.reg_read = rockchip_otp_read,
|
.reg_read = rockchip_otp_read,
|
||||||
};
|
};
|
||||||
|
|
||||||
|
static const char * const px30_otp_clocks[] = {
|
||||||
|
"otp", "apb_pclk", "phy",
|
||||||
|
};
|
||||||
|
|
||||||
static const struct rockchip_data px30_data = {
|
static const struct rockchip_data px30_data = {
|
||||||
.size = 0x40,
|
.size = 0x40,
|
||||||
|
.clks = px30_otp_clocks,
|
||||||
|
.num_clks = ARRAY_SIZE(px30_otp_clocks),
|
||||||
|
.reg_read = px30_otp_read,
|
||||||
};
|
};
|
||||||
|
|
||||||
static const struct of_device_id rockchip_otp_match[] = {
|
static const struct of_device_id rockchip_otp_match[] = {
|
||||||
|
@ -225,21 +244,21 @@ static int rockchip_otp_probe(struct platform_device *pdev)
|
||||||
if (!otp)
|
if (!otp)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
|
otp->data = data;
|
||||||
otp->dev = dev;
|
otp->dev = dev;
|
||||||
otp->base = devm_platform_ioremap_resource(pdev, 0);
|
otp->base = devm_platform_ioremap_resource(pdev, 0);
|
||||||
if (IS_ERR(otp->base))
|
if (IS_ERR(otp->base))
|
||||||
return PTR_ERR(otp->base);
|
return PTR_ERR(otp->base);
|
||||||
|
|
||||||
otp->num_clks = ARRAY_SIZE(rockchip_otp_clocks);
|
otp->clks = devm_kcalloc(dev, data->num_clks, sizeof(*otp->clks),
|
||||||
otp->clks = devm_kcalloc(dev, otp->num_clks,
|
GFP_KERNEL);
|
||||||
sizeof(*otp->clks), GFP_KERNEL);
|
|
||||||
if (!otp->clks)
|
if (!otp->clks)
|
||||||
return -ENOMEM;
|
return -ENOMEM;
|
||||||
|
|
||||||
for (i = 0; i < otp->num_clks; ++i)
|
for (i = 0; i < data->num_clks; ++i)
|
||||||
otp->clks[i].id = rockchip_otp_clocks[i];
|
otp->clks[i].id = data->clks[i];
|
||||||
|
|
||||||
ret = devm_clk_bulk_get(dev, otp->num_clks, otp->clks);
|
ret = devm_clk_bulk_get(dev, data->num_clks, otp->clks);
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue