Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e20d2b29 authored by Bryan O'Donoghue's avatar Bryan O'Donoghue Committed by Greg Kroah-Hartman
Browse files

nvmem: imx-ocotp: Pass parameters via a struct 



It will be useful in later patches to know the register access mode and
bit-shift to apply to a given input offset.

Fixes: 0642bac7 ("nvmem: imx-ocotp: add write support")

Signed-off-by: default avatarBryan O'Donoghue <pure.logic@nexus-software.ie>
Reviewed-by: default avatarPhilipp Zabel <p.zabel@pengutronix.de>
Signed-off-by: default avatarSrinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 9d6a8dab

drivers/nvmem/imx-ocotp.c

+34 −10
Original line number Diff line number Diff line
@@ -53,11 +53,15 @@ 


static DEFINE_MUTEX(ocotp_mutex);



struct ocotp_params {

	unsigned int nregs;

};



struct ocotp_priv {

	struct device *dev;

	struct clk *clk;

	void __iomem *base;

	unsigned int nregs;

	const struct ocotp_params *params;

	struct nvmem_config *config;

};
@@ -121,8 +125,8 @@ static int imx_ocotp_read(void *context, unsigned int offset, 
	index = offset >> 2;

	count = bytes >> 2;



	if (count > (priv->nregs - index))

		count = priv->nregs - index;

	if (count > (priv->params->nregs - index))

		count = priv->params->nregs - index;



	mutex_lock(&ocotp_mutex);
@@ -307,12 +311,32 @@ static struct nvmem_config imx_ocotp_nvmem_config = { 
	.reg_write = imx_ocotp_write,

};



static const struct ocotp_params imx6q_params = {

	.nregs = 128,

};



static const struct ocotp_params imx6sl_params = {

	.nregs = 64,

};



static const struct ocotp_params imx6sx_params = {

	.nregs = 128,

};



static const struct ocotp_params imx6ul_params = {

	.nregs = 128,

};



static const struct ocotp_params imx7d_params = {

	.nregs = 64,

};



static const struct of_device_id imx_ocotp_dt_ids[] = {

	{ .compatible = "fsl,imx6q-ocotp",  (void *)128 },

	{ .compatible = "fsl,imx6sl-ocotp", (void *)64 },

	{ .compatible = "fsl,imx6sx-ocotp", (void *)128 },

	{ .compatible = "fsl,imx6ul-ocotp", (void *)128 },

	{ .compatible = "fsl,imx7d-ocotp", (void *)64 },

	{ .compatible = "fsl,imx6q-ocotp",  .data = &imx6q_params },

	{ .compatible = "fsl,imx6sl-ocotp", .data = &imx6sl_params },

	{ .compatible = "fsl,imx6sx-ocotp", .data = &imx6sx_params },

	{ .compatible = "fsl,imx6ul-ocotp", .data = &imx6ul_params },

	{ .compatible = "fsl,imx7d-ocotp",  .data = &imx7d_params },

	{ },

};

MODULE_DEVICE_TABLE(of, imx_ocotp_dt_ids);
@@ -341,8 +365,8 @@ static int imx_ocotp_probe(struct platform_device *pdev) 
		return PTR_ERR(priv->clk);



	of_id = of_match_device(imx_ocotp_dt_ids, dev);

	priv->nregs = (unsigned long)of_id->data;

	imx_ocotp_nvmem_config.size = 4 * priv->nregs;

	priv->params = of_device_get_match_data(&pdev->dev);

	imx_ocotp_nvmem_config.size = 4 * priv->params->nregs;

	imx_ocotp_nvmem_config.dev = dev;

	imx_ocotp_nvmem_config.priv = priv;

	priv->config = &imx_ocotp_nvmem_config;