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 649409990d2e93fac657be7c6960c28a2c601d65 Mon Sep 17 00:00:00 2001
|
|
From: Yang Li <yang.lee@linux.alibaba.com>
|
|
Date: Tue, 4 Apr 2023 18:21:39 +0100
|
|
Subject: [PATCH] nvmem: nintendo-otp: 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-32-srinivas.kandagatla@linaro.org
|
|
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
|
|
---
|
|
drivers/nvmem/nintendo-otp.c | 4 +---
|
|
1 file changed, 1 insertion(+), 3 deletions(-)
|
|
|
|
--- a/drivers/nvmem/nintendo-otp.c
|
|
+++ b/drivers/nvmem/nintendo-otp.c
|
|
@@ -76,7 +76,6 @@ static int nintendo_otp_probe(struct pla
|
|
struct device *dev = &pdev->dev;
|
|
const struct of_device_id *of_id =
|
|
of_match_device(nintendo_otp_of_table, dev);
|
|
- struct resource *res;
|
|
struct nvmem_device *nvmem;
|
|
struct nintendo_otp_priv *priv;
|
|
|
|
@@ -92,8 +91,7 @@ static int nintendo_otp_probe(struct pla
|
|
if (!priv)
|
|
return -ENOMEM;
|
|
|
|
- res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
|
- priv->regs = devm_ioremap_resource(dev, res);
|
|
+ priv->regs = devm_platform_ioremap_resource(pdev, 0);
|
|
if (IS_ERR(priv->regs))
|
|
return PTR_ERR(priv->regs);
|
|
|