projects
/
openwrt
/
staging
/
981213.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
generic: 6.6: refresh backport patches
[openwrt/staging/981213.git]
/
target
/
linux
/
generic
/
backport-6.6
/
816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
diff --git
a/target/linux/generic/backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
b/target/linux/generic/backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
index 35b15776fb7e66193fd0bce8bcab37f67e2badc8..80c9836010eb75418f182d99ef24f7187cdc8335 100644
(file)
--- a/
target/linux/generic/backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
+++ b/
target/linux/generic/backport-6.6/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
@@
-67,7
+67,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
--- a/drivers/mtd/mtdcore.c
+++ b/drivers/mtd/mtdcore.c
-@@ -5
23,6 +523
,7 @@ static int mtd_nvmem_add(struct mtd_info
+@@ -5
52,6 +552
,7 @@ static int mtd_nvmem_add(struct mtd_info
config.dev = &mtd->dev;
config.name = dev_name(&mtd->dev);
config.owner = THIS_MODULE;
config.dev = &mtd->dev;
config.name = dev_name(&mtd->dev);
config.owner = THIS_MODULE;
@@
-75,7
+75,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
config.reg_read = mtd_nvmem_reg_read;
config.size = mtd->size;
config.word_size = 1;
config.reg_read = mtd_nvmem_reg_read;
config.size = mtd->size;
config.word_size = 1;
-@@ -89
1,6 +892
,7 @@ static struct nvmem_device *mtd_otp_nvme
+@@ -89
8,6 +899
,7 @@ static struct nvmem_device *mtd_otp_nvme
config.name = compatible;
config.id = NVMEM_DEVID_AUTO;
config.owner = THIS_MODULE;
config.name = compatible;
config.id = NVMEM_DEVID_AUTO;
config.owner = THIS_MODULE;
@@
-95,7
+95,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.stride = sizeof(u32),
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
.stride = sizeof(u32),
--- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c
-@@ -
998,9 +998
,11 @@ struct nvmem_device *nvmem_register(cons
+@@ -
1003,9 +1003
,11 @@ struct nvmem_device *nvmem_register(cons
if (rval)
goto err_remove_cells;
if (rval)
goto err_remove_cells;
@@
-122,7
+122,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.stride = 1,
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
.stride = 1,
--- a/drivers/nvmem/imx-ocotp.c
+++ b/drivers/nvmem/imx-ocotp.c
-@@ -61
6,6 +616
,7 @@ static int imx_ocotp_probe(struct platfo
+@@ -61
5,6 +615
,7 @@ static int imx_ocotp_probe(struct platfo
return PTR_ERR(priv->clk);
priv->params = of_device_get_match_data(&pdev->dev);
return PTR_ERR(priv->clk);
priv->params = of_device_get_match_data(&pdev->dev);
@@
-142,7
+142,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
econfig->reg_read = meson_efuse_read;
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
econfig->reg_read = meson_efuse_read;
--- a/drivers/nvmem/meson-mx-efuse.c
+++ b/drivers/nvmem/meson-mx-efuse.c
-@@ -21
1,6 +211
,7 @@ static int meson_mx_efuse_probe(struct p
+@@ -21
0,6 +210
,7 @@ static int meson_mx_efuse_probe(struct p
efuse->config.owner = THIS_MODULE;
efuse->config.dev = &pdev->dev;
efuse->config.priv = efuse;
efuse->config.owner = THIS_MODULE;
efuse->config.dev = &pdev->dev;
efuse->config.priv = efuse;
@@
-212,7
+212,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.read_only = true,
--- a/drivers/nvmem/sc27xx-efuse.c
+++ b/drivers/nvmem/sc27xx-efuse.c
.read_only = true,
--- a/drivers/nvmem/sc27xx-efuse.c
+++ b/drivers/nvmem/sc27xx-efuse.c
-@@ -24
8,6 +248
,7 @@ static int sc27xx_efuse_probe(struct pla
+@@ -24
7,6 +247
,7 @@ static int sc27xx_efuse_probe(struct pla
econfig.reg_read = sc27xx_efuse_read;
econfig.priv = efuse;
econfig.dev = &pdev->dev;
econfig.reg_read = sc27xx_efuse_read;
econfig.priv = efuse;
econfig.dev = &pdev->dev;
@@
-262,7
+262,7
@@
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.size = QAC628_OTP_SIZE,
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
.size = QAC628_OTP_SIZE,
--- a/drivers/nvmem/sunxi_sid.c
+++ b/drivers/nvmem/sunxi_sid.c
-@@ -15
4,6 +154
,7 @@ static int sunxi_sid_probe(struct platfo
+@@ -15
3,6 +153
,7 @@ static int sunxi_sid_probe(struct platfo
nvmem_cfg->dev = dev;
nvmem_cfg->name = "sunxi-sid";
nvmem_cfg->type = NVMEM_TYPE_OTP;
nvmem_cfg->dev = dev;
nvmem_cfg->name = "sunxi-sid";
nvmem_cfg->type = NVMEM_TYPE_OTP;