323072f3a6
They add NVMEM layouts support. It allows handling NVMEM content independently of NVMEM device access. Skip U-Boot env data patch for now as it break our downstream MAC hacks. Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
40 lines
1.5 KiB
Diff
40 lines
1.5 KiB
Diff
From 1dc552fa33cf98af3e784dbc0500da93cae3b24a Mon Sep 17 00:00:00 2001
|
|
From: Yang Li <yang.lee@linux.alibaba.com>
|
|
Date: Tue, 4 Apr 2023 18:21:38 +0100
|
|
Subject: [PATCH] nvmem: bcm-ocotp: Use devm_platform_ioremap_resource()
|
|
|
|
According to commit 7945f929f1a7 ("drivers: provide
|
|
devm_platform_ioremap_resource()"), convert platform_get_resource(),
|
|
devm_ioremap_resource() to a single call to use
|
|
devm_platform_ioremap_resource(), as this is exactly what this function
|
|
does.
|
|
|
|
Signed-off-by: Yang Li <yang.lee@linux.alibaba.com>
|
|
Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
|
|
Link: https://lore.kernel.org/r/20230404172148.82422-31-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/bcm-ocotp.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/nvmem/bcm-ocotp.c
|
|
+++ b/drivers/nvmem/bcm-ocotp.c
|
|
@@ -254,7 +254,6 @@ MODULE_DEVICE_TABLE(acpi, bcm_otpc_acpi_
|
|
static int bcm_otpc_probe(struct platform_device *pdev)
|
|
{
|
|
struct device *dev = &pdev->dev;
|
|
- struct resource *res;
|
|
struct otpc_priv *priv;
|
|
struct nvmem_device *nvmem;
|
|
int err;
|
|
@@ -269,8 +268,7 @@ static int bcm_otpc_probe(struct platfor
|
|
return -ENODEV;
|
|
|
|
/* Get OTP base address register. */
|
|
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- priv->base = devm_ioremap_resource(dev, res);
|
|
+ priv->base = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(priv->base)) {
|
|
dev_err(dev, "unable to map I/O memory\n");
|
|
return PTR_ERR(priv->base);
|