diff options
author | Rafał Miłecki <rafal@milecki.pl> | 2022-09-21 10:44:28 +0200 |
---|---|---|
committer | Rafał Miłecki <rafal@milecki.pl> | 2022-09-21 10:44:28 +0200 |
commit | 4c45c111e0bef4c991d38a2bb1a1c0032bebc8e8 (patch) | |
tree | f8628fd661391e0eee9ead415eaa9562bdda94de /target/linux | |
parent | deaad2c8758dcc164478c430696182367611bcbd (diff) | |
download | upstream-4c45c111e0bef4c991d38a2bb1a1c0032bebc8e8.tar.gz upstream-4c45c111e0bef4c991d38a2bb1a1c0032bebc8e8.tar.bz2 upstream-4c45c111e0bef4c991d38a2bb1a1c0032bebc8e8.zip |
kernel: update U-Boot NVMEM driver
1. Fix casting
2. Support DT-defined variables
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
(cherry picked from commit 5652f378c6c607f99a15e6472cdca46c9c4b6162)
Diffstat (limited to 'target/linux')
-rw-r--r-- | target/linux/generic/backport-5.4/801-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch (renamed from target/linux/generic/backport-5.4/802-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch) | 0 | ||||
-rw-r--r-- | target/linux/generic/backport-5.4/802-v6.1-0001-nvmem-add-driver-handling-U-Boot-environment-variabl.patch (renamed from target/linux/generic/backport-5.4/801-v6.1-nvmem-add-driver-handling-U-Boot-environment-variabl.patch) | 0 | ||||
-rw-r--r-- | target/linux/generic/backport-5.4/802-v6.1-0002-nvmem-u-boot-env-find-Device-Tree-nodes-for-NVMEM-ce.patch | 29 | ||||
-rw-r--r-- | target/linux/generic/backport-5.4/802-v6.1-0003-nvmem-u-boot-env-fix-crc32-casting-type.patch | 30 |
4 files changed, 59 insertions, 0 deletions
diff --git a/target/linux/generic/backport-5.4/802-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch b/target/linux/generic/backport-5.4/801-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch index c6da49ef88..c6da49ef88 100644 --- a/target/linux/generic/backport-5.4/802-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch +++ b/target/linux/generic/backport-5.4/801-v5.19-nvmem-core-support-passing-DT-node-in-cell-info.patch diff --git a/target/linux/generic/backport-5.4/801-v6.1-nvmem-add-driver-handling-U-Boot-environment-variabl.patch b/target/linux/generic/backport-5.4/802-v6.1-0001-nvmem-add-driver-handling-U-Boot-environment-variabl.patch index ef3c601753..ef3c601753 100644 --- a/target/linux/generic/backport-5.4/801-v6.1-nvmem-add-driver-handling-U-Boot-environment-variabl.patch +++ b/target/linux/generic/backport-5.4/802-v6.1-0001-nvmem-add-driver-handling-U-Boot-environment-variabl.patch diff --git a/target/linux/generic/backport-5.4/802-v6.1-0002-nvmem-u-boot-env-find-Device-Tree-nodes-for-NVMEM-ce.patch b/target/linux/generic/backport-5.4/802-v6.1-0002-nvmem-u-boot-env-find-Device-Tree-nodes-for-NVMEM-ce.patch new file mode 100644 index 0000000000..3a6b76a221 --- /dev/null +++ b/target/linux/generic/backport-5.4/802-v6.1-0002-nvmem-u-boot-env-find-Device-Tree-nodes-for-NVMEM-ce.patch @@ -0,0 +1,29 @@ +From d69efcf951df4dcc74a0e1554969c533aec8aa9b Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> +Date: Thu, 15 Sep 2022 22:06:29 +0200 +Subject: [PATCH] nvmem: u-boot-env: find Device Tree nodes for NVMEM cells +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +DT binding allows specifying NVMEM cells as NVMEM device (provider) +subnodes. Looks for such subnodes when building NVMEM cells. + +This allows NVMEM consumers to use U-Boot environment variables. + +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + drivers/nvmem/u-boot-env.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/nvmem/u-boot-env.c ++++ b/drivers/nvmem/u-boot-env.c +@@ -92,6 +92,7 @@ static int u_boot_env_add_cells(struct u + return -ENOMEM; + priv->cells[idx].offset = data_offset + value - data; + priv->cells[idx].bytes = strlen(value); ++ priv->cells[idx].np = of_get_child_by_name(dev->of_node, priv->cells[idx].name); + } + + if (WARN_ON(idx != priv->ncells)) diff --git a/target/linux/generic/backport-5.4/802-v6.1-0003-nvmem-u-boot-env-fix-crc32-casting-type.patch b/target/linux/generic/backport-5.4/802-v6.1-0003-nvmem-u-boot-env-fix-crc32-casting-type.patch new file mode 100644 index 0000000000..6b40557116 --- /dev/null +++ b/target/linux/generic/backport-5.4/802-v6.1-0003-nvmem-u-boot-env-fix-crc32-casting-type.patch @@ -0,0 +1,30 @@ +From 60bbaad38109684b156e21112322e0a922f92cde Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Rafa=C5=82=20Mi=C5=82ecki?= <rafal@milecki.pl> +Date: Thu, 18 Aug 2022 06:38:37 +0200 +Subject: [PATCH] nvmem: u-boot-env: fix crc32 casting type +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +This fixes: +drivers/nvmem/u-boot-env.c:141:17: sparse: sparse: cast to restricted __le32 + +Reported-by: kernel test robot <lkp@intel.com> +Fixes: f955dc1445069 ("nvmem: add driver handling U-Boot environment variables") +Signed-off-by: Rafał Miłecki <rafal@milecki.pl> +Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> +--- + drivers/nvmem/u-boot-env.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/drivers/nvmem/u-boot-env.c ++++ b/drivers/nvmem/u-boot-env.c +@@ -139,7 +139,7 @@ static int u_boot_env_parse(struct u_boo + data_offset = offsetof(struct u_boot_env_image_redundant, data); + break; + } +- crc32 = le32_to_cpu(*(uint32_t *)(buf + crc32_offset)); ++ crc32 = le32_to_cpu(*(__le32 *)(buf + crc32_offset)); + crc32_data_len = priv->mtd->size - crc32_data_offset; + data_len = priv->mtd->size - data_offset; + |