diff options
| author | Rafał Miłecki <rafal@milecki.pl> | 2023-12-17 22:35:13 +0100 |
|---|---|---|
| committer | Rafał Miłecki <rafal@milecki.pl> | 2023-12-18 08:33:04 +0100 |
| commit | 493f7f5eeec4e97ff9da9cfb23c26d7c273b44c9 (patch) | |
| tree | 816b3f2fcd3a68bdbced19ae2aced7dd37d21c50 /target/linux/generic/pending-6.1 | |
| parent | facaa13a3fbd4cbe443e1428e96d5df407e53441 (diff) | |
| download | upstream-493f7f5eeec4e97ff9da9cfb23c26d7c273b44c9.tar.gz upstream-493f7f5eeec4e97ff9da9cfb23c26d7c273b44c9.tar.bz2 upstream-493f7f5eeec4e97ff9da9cfb23c26d7c273b44c9.zip | |
kernel: backport NVMEM changes queued for v6.8
Signed-off-by: Rafał Miłecki <rafal@milecki.pl>
Diffstat (limited to 'target/linux/generic/pending-6.1')
| -rw-r--r-- | target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch b/target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch index 95f29b1865d..9bb94a28b54 100644 --- a/target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch +++ b/target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch @@ -15,9 +15,9 @@ string. menuconfig NVMEM bool "NVMEM Support" + select GENERIC_NET_UTILS + imply NVMEM_LAYOUTS help Support for NVMEM(Non Volatile Memory) devices like EEPROM, EFUSES... - --- a/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c @@ -7,9 +7,12 @@ @@ -33,7 +33,7 @@ string. #include <linux/init.h> #include <linux/kref.h> #include <linux/module.h> -@@ -696,6 +699,62 @@ static int nvmem_validate_keepouts(struc +@@ -780,6 +783,62 @@ static int nvmem_validate_keepouts(struc return 0; } @@ -95,10 +95,10 @@ string. + static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) { - struct nvmem_layout *layout = nvmem->layout; -@@ -731,6 +790,25 @@ static int nvmem_add_cells_from_dt(struc - if (layout && layout->fixup_cell_info) - layout->fixup_cell_info(nvmem, layout, &info); + struct device *dev = &nvmem->dev; +@@ -814,6 +873,25 @@ static int nvmem_add_cells_from_dt(struc + if (nvmem->fixup_dt_cell_info) + nvmem->fixup_dt_cell_info(nvmem, &info); + if (of_device_is_compatible(np, "fixed-layout")) { + if (of_device_is_compatible(child, "mac-base")) { |