|
@@ -17,15 +17,19 @@
|
|
|
#include <linux/nvmem-provider.h>
|
|
|
#include <linux/platform_device.h>
|
|
|
|
|
|
+struct qfprom_priv {
|
|
|
+ void __iomem *base;
|
|
|
+};
|
|
|
+
|
|
|
static int qfprom_reg_read(void *context,
|
|
|
unsigned int reg, void *_val, size_t bytes)
|
|
|
{
|
|
|
- void __iomem *base = context;
|
|
|
+ struct qfprom_priv *priv = context;
|
|
|
u8 *val = _val;
|
|
|
int i = 0, words = bytes;
|
|
|
|
|
|
while (words--)
|
|
|
- *val++ = readb(base + reg + i++);
|
|
|
+ *val++ = readb(priv->base + reg + i++);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -33,12 +37,12 @@ static int qfprom_reg_read(void *context,
|
|
|
static int qfprom_reg_write(void *context,
|
|
|
unsigned int reg, void *_val, size_t bytes)
|
|
|
{
|
|
|
- void __iomem *base = context;
|
|
|
+ struct qfprom_priv *priv = context;
|
|
|
u8 *val = _val;
|
|
|
int i = 0, words = bytes;
|
|
|
|
|
|
while (words--)
|
|
|
- writeb(*val++, base + reg + i++);
|
|
|
+ writeb(*val++, priv->base + reg + i++);
|
|
|
|
|
|
return 0;
|
|
|
}
|
|
@@ -64,16 +68,20 @@ static int qfprom_probe(struct platform_device *pdev)
|
|
|
struct device *dev = &pdev->dev;
|
|
|
struct resource *res;
|
|
|
struct nvmem_device *nvmem;
|
|
|
- void __iomem *base;
|
|
|
+ struct qfprom_priv *priv;
|
|
|
+
|
|
|
+ priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL);
|
|
|
+ if (!priv)
|
|
|
+ return -ENOMEM;
|
|
|
|
|
|
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
|
- base = devm_ioremap_resource(dev, res);
|
|
|
- if (IS_ERR(base))
|
|
|
- return PTR_ERR(base);
|
|
|
+ priv->base = devm_ioremap_resource(dev, res);
|
|
|
+ if (IS_ERR(priv->base))
|
|
|
+ return PTR_ERR(priv->base);
|
|
|
|
|
|
econfig.size = resource_size(res);
|
|
|
econfig.dev = dev;
|
|
|
- econfig.priv = base;
|
|
|
+ econfig.priv = priv;
|
|
|
|
|
|
nvmem = nvmem_register(&econfig);
|
|
|
if (IS_ERR(nvmem))
|