298977887/lede
1
0
Fork 0
mirror of https://github.com/coolsnowwolf/lede.git synced 2025-04-16 04:13:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

kernel: bump 6.1 to 6.1.100 (#15973)

Browse Source 
All patches automatically rebased.

Signed-off-by: Zxl hhyccc <zxlhhy@gmail.com>
This commit is contained in:
Zxl hhyccc 2024-07-19 00:45:20 +08:00
parent 150b745250
commit f9f1a684ea
33 changed files with 77 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/kernel-6.1
View File

@ -1,2 +1,2 @@
LINUX_VERSION-6.1 = .98 LINUX_VERSION-6.1 = .100
LINUX_KERNEL_HASH-6.1.98 = 97cdc9127c7700556ea0891267a0c24cf372f4b81636fb8203a914f3a69f3406 LINUX_KERNEL_HASH-6.1.100 = b9aa6ec1a00f234d6c6f2d428fbb0a6bf459606c259263df978f86685b65a8b9

2
target/linux/generic/backport-6.1/809-v6.3-0001-nvmem-core-remove-spurious-white-space.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -764,7 +764,7 @@ struct nvmem_device *nvmem_register(cons @@ -763,7 +763,7 @@ struct nvmem_device *nvmem_register(cons
if (!nvmem) if (!nvmem)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);

18
target/linux/generic/backport-6.1/809-v6.3-0002-nvmem-core-add-an-index-parameter-to-the-cell.patch
View File

@ -47,7 +47,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
}; };
static DEFINE_MUTEX(nvmem_mutex); static DEFINE_MUTEX(nvmem_mutex);
@@ -1122,7 +1123,8 @@ struct nvmem_device *devm_nvmem_device_g @@ -1121,7 +1122,8 @@ struct nvmem_device *devm_nvmem_device_g
} }
EXPORT_SYMBOL_GPL(devm_nvmem_device_get); EXPORT_SYMBOL_GPL(devm_nvmem_device_get);
@ -57,7 +57,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{ {
struct nvmem_cell *cell; struct nvmem_cell *cell;
const char *name = NULL; const char *name = NULL;
@@ -1141,6 +1143,7 @@ static struct nvmem_cell *nvmem_create_c @@ -1140,6 +1142,7 @@ static struct nvmem_cell *nvmem_create_c
cell->id = name; cell->id = name;
cell->entry = entry; cell->entry = entry;
@ -65,7 +65,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return cell; return cell;
} }
@@ -1179,7 +1182,7 @@ nvmem_cell_get_from_lookup(struct device @@ -1178,7 +1181,7 @@ nvmem_cell_get_from_lookup(struct device
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
cell = ERR_PTR(-ENOENT); cell = ERR_PTR(-ENOENT);
} else { } else {
@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (IS_ERR(cell)) if (IS_ERR(cell))
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
} }
@@ -1227,15 +1230,27 @@ struct nvmem_cell *of_nvmem_cell_get(str @@ -1226,15 +1229,27 @@ struct nvmem_cell *of_nvmem_cell_get(str
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct nvmem_cell_entry *cell_entry; struct nvmem_cell_entry *cell_entry;
struct nvmem_cell *cell; struct nvmem_cell *cell;
@ -105,7 +105,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
nvmem_np = of_get_parent(cell_np); nvmem_np = of_get_parent(cell_np);
if (!nvmem_np) { if (!nvmem_np) {
@@ -1257,7 +1272,7 @@ struct nvmem_cell *of_nvmem_cell_get(str @@ -1256,7 +1271,7 @@ struct nvmem_cell *of_nvmem_cell_get(str
return ERR_PTR(-ENOENT); return ERR_PTR(-ENOENT);
} }
@ -114,7 +114,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (IS_ERR(cell)) if (IS_ERR(cell))
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
@@ -1410,8 +1425,8 @@ static void nvmem_shift_read_buffer_in_p @@ -1409,8 +1424,8 @@ static void nvmem_shift_read_buffer_in_p
} }
static int __nvmem_cell_read(struct nvmem_device *nvmem, static int __nvmem_cell_read(struct nvmem_device *nvmem,
@ -125,7 +125,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{ {
int rc; int rc;
@@ -1425,7 +1440,7 @@ static int __nvmem_cell_read(struct nvme @@ -1424,7 +1439,7 @@ static int __nvmem_cell_read(struct nvme
nvmem_shift_read_buffer_in_place(cell, buf); nvmem_shift_read_buffer_in_place(cell, buf);
if (nvmem->cell_post_process) { if (nvmem->cell_post_process) {
@ -134,7 +134,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cell->offset, buf, cell->bytes); cell->offset, buf, cell->bytes);
if (rc) if (rc)
return rc; return rc;
@@ -1460,7 +1475,7 @@ void *nvmem_cell_read(struct nvmem_cell @@ -1459,7 +1474,7 @@ void *nvmem_cell_read(struct nvmem_cell
if (!buf) if (!buf)
return ERR_PTR(-ENOMEM); return ERR_PTR(-ENOMEM);
@ -143,7 +143,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (rc) { if (rc) {
kfree(buf); kfree(buf);
return ERR_PTR(rc); return ERR_PTR(rc);
@@ -1773,7 +1788,7 @@ ssize_t nvmem_device_cell_read(struct nv @@ -1772,7 +1787,7 @@ ssize_t nvmem_device_cell_read(struct nv
if (rc) if (rc)
return rc; return rc;

4
target/linux/generic/backport-6.1/809-v6.3-0004-nvmem-core-drop-the-removal-of-the-cells-in-nvmem_ad.patch
View File

@ -22,7 +22,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -515,7 +515,7 @@ static int nvmem_add_cells(struct nvmem_ @@ -514,7 +514,7 @@ static int nvmem_add_cells(struct nvmem_
int ncells) int ncells)
{ {
struct nvmem_cell_entry **cells; struct nvmem_cell_entry **cells;
@ -31,7 +31,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL); cells = kcalloc(ncells, sizeof(*cells), GFP_KERNEL);
if (!cells) if (!cells)
@@ -525,28 +525,22 @@ static int nvmem_add_cells(struct nvmem_ @@ -524,28 +524,22 @@ static int nvmem_add_cells(struct nvmem_
cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL); cells[i] = kzalloc(sizeof(**cells), GFP_KERNEL);
if (!cells[i]) { if (!cells[i]) {
rval = -ENOMEM; rval = -ENOMEM;

4
target/linux/generic/backport-6.1/809-v6.3-0005-nvmem-core-add-nvmem_add_one_cell.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -502,6 +502,36 @@ static int nvmem_cell_info_to_nvmem_cell @@ -501,6 +501,36 @@ static int nvmem_cell_info_to_nvmem_cell
} }
/** /**
@ -56,7 +56,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
* nvmem_add_cells() - Add cell information to an nvmem device * nvmem_add_cells() - Add cell information to an nvmem device
* *
* @nvmem: nvmem device to add cells to. * @nvmem: nvmem device to add cells to.
@@ -514,34 +544,15 @@ static int nvmem_add_cells(struct nvmem_ @@ -513,34 +543,15 @@ static int nvmem_add_cells(struct nvmem_
const struct nvmem_cell_info *info, const struct nvmem_cell_info *info,
int ncells) int ncells)
{ {

4
target/linux/generic/backport-6.1/809-v6.3-0006-nvmem-core-use-nvmem_add_one_cell-in-nvmem_add_cells.patch
View File

@ -19,7 +19,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -688,15 +688,14 @@ static int nvmem_validate_keepouts(struc @@ -687,15 +687,14 @@ static int nvmem_validate_keepouts(struc
static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
{ {
@ -39,7 +39,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
addr = of_get_property(child, "reg", &len); addr = of_get_property(child, "reg", &len);
if (!addr) if (!addr)
continue; continue;
@@ -706,40 +705,24 @@ static int nvmem_add_cells_from_of(struc @@ -705,40 +704,24 @@ static int nvmem_add_cells_from_of(struc
return -EINVAL; return -EINVAL;
} }

10
target/linux/generic/backport-6.1/811-v6.4-0002-nvmem-core-introduce-NVMEM-layouts.patch
View File

@ -103,7 +103,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
void *val, size_t bytes) void *val, size_t bytes)
{ {
@@ -728,6 +732,101 @@ static int nvmem_add_cells_from_of(struc @@ -727,6 +731,101 @@ static int nvmem_add_cells_from_of(struc
return 0; return 0;
} }
@ -205,7 +205,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/** /**
* nvmem_register() - Register a nvmem device for given nvmem_config. * nvmem_register() - Register a nvmem device for given nvmem_config.
* Also creates a binary entry in /sys/bus/nvmem/devices/dev-name/nvmem * Also creates a binary entry in /sys/bus/nvmem/devices/dev-name/nvmem
@@ -834,6 +933,12 @@ struct nvmem_device *nvmem_register(cons @@ -833,6 +932,12 @@ struct nvmem_device *nvmem_register(cons
goto err_put_device; goto err_put_device;
} }
@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->cells) { if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
if (rval) if (rval)
@@ -854,12 +959,17 @@ struct nvmem_device *nvmem_register(cons @@ -853,12 +958,17 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@ -236,7 +236,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->compat) if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config); nvmem_sysfs_remove_compat(nvmem, config);
err_put_device: err_put_device:
@@ -881,6 +991,7 @@ static void nvmem_device_release(struct @@ -880,6 +990,7 @@ static void nvmem_device_release(struct
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
nvmem_device_remove_all_cells(nvmem); nvmem_device_remove_all_cells(nvmem);
@ -244,7 +244,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
device_unregister(&nvmem->dev); device_unregister(&nvmem->dev);
} }
@@ -1246,6 +1357,15 @@ struct nvmem_cell *of_nvmem_cell_get(str @@ -1245,6 +1356,15 @@ struct nvmem_cell *of_nvmem_cell_get(str
return ERR_PTR(-EINVAL); return ERR_PTR(-EINVAL);
} }

6
target/linux/generic/backport-6.1/811-v6.4-0003-nvmem-core-handle-the-absence-of-expected-layouts.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -755,7 +755,7 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregiste @@ -754,7 +754,7 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregiste
static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem) static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem)
{ {
struct device_node *layout_np, *np = nvmem->dev.of_node; struct device_node *layout_np, *np = nvmem->dev.of_node;
@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
layout_np = of_get_child_by_name(np, "nvmem-layout"); layout_np = of_get_child_by_name(np, "nvmem-layout");
if (!layout_np) if (!layout_np)
@@ -938,6 +938,13 @@ struct nvmem_device *nvmem_register(cons @@ -937,6 +937,13 @@ struct nvmem_device *nvmem_register(cons
* pointer will be NULL and nvmem_layout_put() will be a noop. * pointer will be NULL and nvmem_layout_put() will be a noop.
*/ */
nvmem->layout = config->layout ?: nvmem_layout_get(nvmem); nvmem->layout = config->layout ?: nvmem_layout_get(nvmem);
@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->cells) { if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
@@ -970,6 +977,7 @@ struct nvmem_device *nvmem_register(cons @@ -969,6 +976,7 @@ struct nvmem_device *nvmem_register(cons
err_remove_cells: err_remove_cells:
nvmem_device_remove_all_cells(nvmem); nvmem_device_remove_all_cells(nvmem);
nvmem_layout_put(nvmem->layout); nvmem_layout_put(nvmem->layout);

2
target/linux/generic/backport-6.1/811-v6.4-0004-nvmem-core-request-layout-modules-loading.patch
View File

@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#include <linux/slab.h> #include <linux/slab.h>
struct nvmem_device { struct nvmem_device {
@@ -761,6 +762,13 @@ static struct nvmem_layout *nvmem_layout @@ -760,6 +761,13 @@ static struct nvmem_layout *nvmem_layout
if (!layout_np) if (!layout_np)
return NULL; return NULL;

6
target/linux/generic/backport-6.1/811-v6.4-0005-nvmem-core-add-per-cell-post-processing.patch
View File

@ -28,7 +28,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct device_node *np; struct device_node *np;
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct list_head node; struct list_head node;
@@ -470,6 +471,7 @@ static int nvmem_cell_info_to_nvmem_cell @@ -469,6 +470,7 @@ static int nvmem_cell_info_to_nvmem_cell
cell->offset = info->offset; cell->offset = info->offset;
cell->bytes = info->bytes; cell->bytes = info->bytes;
cell->name = info->name; cell->name = info->name;
@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cell->bit_offset = info->bit_offset; cell->bit_offset = info->bit_offset;
cell->nbits = info->nbits; cell->nbits = info->nbits;
@@ -1563,6 +1565,13 @@ static int __nvmem_cell_read(struct nvme @@ -1562,6 +1564,13 @@ static int __nvmem_cell_read(struct nvme
if (cell->bit_offset || cell->nbits) if (cell->bit_offset || cell->nbits)
nvmem_shift_read_buffer_in_place(cell, buf); nvmem_shift_read_buffer_in_place(cell, buf);
@ -50,7 +50,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (nvmem->cell_post_process) { if (nvmem->cell_post_process) {
rc = nvmem->cell_post_process(nvmem->priv, id, index, rc = nvmem->cell_post_process(nvmem->priv, id, index,
cell->offset, buf, cell->bytes); cell->offset, buf, cell->bytes);
@@ -1671,6 +1680,14 @@ static int __nvmem_cell_entry_write(stru @@ -1670,6 +1679,14 @@ static int __nvmem_cell_entry_write(stru
(cell->bit_offset == 0 && len != cell->bytes)) (cell->bit_offset == 0 && len != cell->bytes))
return -EINVAL; return -EINVAL;

4
target/linux/generic/backport-6.1/811-v6.4-0006-nvmem-core-allow-to-modify-a-cell-before-adding-it.patch
View File

@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -695,6 +695,7 @@ static int nvmem_validate_keepouts(struc @@ -694,6 +694,7 @@ static int nvmem_validate_keepouts(struc
static int nvmem_add_cells_from_of(struct nvmem_device *nvmem) static int nvmem_add_cells_from_of(struct nvmem_device *nvmem)
{ {
@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
struct device_node *child; struct device_node *child;
const __be32 *addr; const __be32 *addr;
@@ -724,6 +725,9 @@ static int nvmem_add_cells_from_of(struc @@ -723,6 +724,9 @@ static int nvmem_add_cells_from_of(struc
info.np = of_node_get(child); info.np = of_node_get(child);

4
target/linux/generic/backport-6.1/811-v6.4-0008-nvmem-cell-drop-global-cell_post_process.patch
View File

@ -26,7 +26,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct gpio_desc *wp_gpio; struct gpio_desc *wp_gpio;
struct nvmem_layout *layout; struct nvmem_layout *layout;
void *priv; void *priv;
@@ -903,7 +902,6 @@ struct nvmem_device *nvmem_register(cons @@ -902,7 +901,6 @@ struct nvmem_device *nvmem_register(cons
nvmem->type = config->type; nvmem->type = config->type;
nvmem->reg_read = config->reg_read; nvmem->reg_read = config->reg_read;
nvmem->reg_write = config->reg_write; nvmem->reg_write = config->reg_write;
@ -34,7 +34,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
nvmem->keepout = config->keepout; nvmem->keepout = config->keepout;
nvmem->nkeepout = config->nkeepout; nvmem->nkeepout = config->nkeepout;
if (config->of_node) if (config->of_node)
@@ -1575,13 +1573,6 @@ static int __nvmem_cell_read(struct nvme @@ -1574,13 +1572,6 @@ static int __nvmem_cell_read(struct nvme
if (rc) if (rc)
return rc; return rc;
} }

4
target/linux/generic/backport-6.1/811-v6.4-0009-nvmem-core-provide-own-priv-pointer-in-post-process-.patch
View File

@ -29,7 +29,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct device_node *np; struct device_node *np;
struct nvmem_device *nvmem; struct nvmem_device *nvmem;
struct list_head node; struct list_head node;
@@ -471,6 +472,7 @@ static int nvmem_cell_info_to_nvmem_cell @@ -470,6 +471,7 @@ static int nvmem_cell_info_to_nvmem_cell
cell->bytes = info->bytes; cell->bytes = info->bytes;
cell->name = info->name; cell->name = info->name;
cell->read_post_process = info->read_post_process; cell->read_post_process = info->read_post_process;
@ -37,7 +37,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cell->bit_offset = info->bit_offset; cell->bit_offset = info->bit_offset;
cell->nbits = info->nbits; cell->nbits = info->nbits;
@@ -1568,7 +1570,7 @@ static int __nvmem_cell_read(struct nvme @@ -1567,7 +1569,7 @@ static int __nvmem_cell_read(struct nvme
nvmem_shift_read_buffer_in_place(cell, buf); nvmem_shift_read_buffer_in_place(cell, buf);
if (cell->read_post_process) { if (cell->read_post_process) {

8
target/linux/generic/backport-6.1/811-v6.4-0017-nvmem-core-support-specifying-both-cell-raw-data-pos.patch
View File

@ -51,7 +51,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
int bytes; int bytes;
int bit_offset; int bit_offset;
int nbits; int nbits;
@@ -469,6 +470,7 @@ static int nvmem_cell_info_to_nvmem_cell @@ -468,6 +469,7 @@ static int nvmem_cell_info_to_nvmem_cell
{ {
cell->nvmem = nvmem; cell->nvmem = nvmem;
cell->offset = info->offset; cell->offset = info->offset;
@ -59,7 +59,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
cell->bytes = info->bytes; cell->bytes = info->bytes;
cell->name = info->name; cell->name = info->name;
cell->read_post_process = info->read_post_process; cell->read_post_process = info->read_post_process;
@@ -1560,7 +1562,7 @@ static int __nvmem_cell_read(struct nvme @@ -1559,7 +1561,7 @@ static int __nvmem_cell_read(struct nvme
{ {
int rc; int rc;
@ -68,7 +68,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (rc) if (rc)
return rc; return rc;
@@ -1571,7 +1573,7 @@ static int __nvmem_cell_read(struct nvme @@ -1570,7 +1572,7 @@ static int __nvmem_cell_read(struct nvme
if (cell->read_post_process) { if (cell->read_post_process) {
rc = cell->read_post_process(cell->priv, id, index, rc = cell->read_post_process(cell->priv, id, index,
@ -77,7 +77,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (rc) if (rc)
return rc; return rc;
} }
@@ -1594,14 +1596,15 @@ static int __nvmem_cell_read(struct nvme @@ -1593,14 +1595,15 @@ static int __nvmem_cell_read(struct nvme
*/ */
void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len) void *nvmem_cell_read(struct nvmem_cell *cell, size_t *len)
{ {

10
target/linux/generic/backport-6.1/813-v6.5-0011-nvmem-core-add-support-for-fixed-cells-layout.patch
View File

@ -27,7 +27,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -696,7 +696,7 @@ static int nvmem_validate_keepouts(struc @@ -695,7 +695,7 @@ static int nvmem_validate_keepouts(struc
return 0; return 0;
} }
@ -36,7 +36,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
{ {
struct nvmem_layout *layout = nvmem->layout; struct nvmem_layout *layout = nvmem->layout;
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
@@ -704,7 +704,7 @@ static int nvmem_add_cells_from_of(struc @@ -703,7 +703,7 @@ static int nvmem_add_cells_from_of(struc
const __be32 *addr; const __be32 *addr;
int len, ret; int len, ret;
@ -45,7 +45,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct nvmem_cell_info info = {0}; struct nvmem_cell_info info = {0};
addr = of_get_property(child, "reg", &len); addr = of_get_property(child, "reg", &len);
@@ -742,6 +742,28 @@ static int nvmem_add_cells_from_of(struc @@ -741,6 +741,28 @@ static int nvmem_add_cells_from_of(struc
return 0; return 0;
} }
@ -74,7 +74,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
int __nvmem_layout_register(struct nvmem_layout *layout, struct module *owner) int __nvmem_layout_register(struct nvmem_layout *layout, struct module *owner)
{ {
layout->owner = owner; layout->owner = owner;
@@ -972,7 +994,7 @@ struct nvmem_device *nvmem_register(cons @@ -971,7 +993,7 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@ -83,7 +83,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@@ -982,6 +1004,10 @@ struct nvmem_device *nvmem_register(cons @@ -981,6 +1003,10 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;

2
target/linux/generic/backport-6.1/814-v6.6-0014-nvmem-core-Create-all-cells-before-adding-the-nvmem-.patch
View File

@ -15,7 +15,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -998,17 +998,17 @@ struct nvmem_device *nvmem_register(cons @@ -997,17 +997,17 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;

2
target/linux/generic/backport-6.1/814-v6.6-0016-nvmem-core-Do-not-open-code-existing-functions.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -786,10 +786,10 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregiste @@ -785,10 +785,10 @@ EXPORT_SYMBOL_GPL(nvmem_layout_unregiste
static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem) static struct nvmem_layout *nvmem_layout_get(struct nvmem_device *nvmem)
{ {

2
target/linux/generic/backport-6.1/814-v6.6-0017-nvmem-core-Notify-when-a-new-layout-is-registered.patch
View File

@ -14,7 +14,7 @@ Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -772,12 +772,16 @@ int __nvmem_layout_register(struct nvmem @@ -771,12 +771,16 @@ int __nvmem_layout_register(struct nvmem
list_add(&layout->node, &nvmem_layouts); list_add(&layout->node, &nvmem_layouts);
spin_unlock(&nvmem_layout_lock); spin_unlock(&nvmem_layout_lock);

4
target/linux/generic/backport-6.1/816-v6.7-0002-nvmem-add-explicit-config-option-to-read-old-syntax-.patch
View File

@ -95,7 +95,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
.stride = sizeof(u32), .stride = sizeof(u32),
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -998,9 +998,11 @@ struct nvmem_device *nvmem_register(cons @@ -997,9 +997,11 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@ -132,7 +132,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
imx_ocotp_nvmem_config.priv = priv; imx_ocotp_nvmem_config.priv = priv;
--- a/drivers/nvmem/meson-efuse.c --- a/drivers/nvmem/meson-efuse.c
+++ b/drivers/nvmem/meson-efuse.c +++ b/drivers/nvmem/meson-efuse.c
@@ -74,6 +74,7 @@ static int meson_efuse_probe(struct plat @@ -80,6 +80,7 @@ static int meson_efuse_probe(struct plat
econfig->dev = dev; econfig->dev = dev;
econfig->name = dev_name(dev); econfig->name = dev_name(dev);

2
target/linux/generic/backport-6.1/816-v6.7-0004-Revert-nvmem-add-new-config-option.patch
View File

@ -48,7 +48,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
mtd->nvmem = nvmem_register(&config); mtd->nvmem = nvmem_register(&config);
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -936,7 +936,7 @@ struct nvmem_device *nvmem_register(cons @@ -935,7 +935,7 @@ struct nvmem_device *nvmem_register(cons
nvmem->nkeepout = config->nkeepout; nvmem->nkeepout = config->nkeepout;
if (config->of_node) if (config->of_node)
nvmem->dev.of_node = config->of_node; nvmem->dev.of_node = config->of_node;

2
target/linux/generic/backport-6.1/816-v6.7-0005-nvmem-Do-not-expect-fixed-layouts-to-grab-a-layout-d.patch
View File

@ -30,7 +30,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -797,6 +797,12 @@ static struct nvmem_layout *nvmem_layout @@ -796,6 +796,12 @@ static struct nvmem_layout *nvmem_layout
if (!layout_np) if (!layout_np)
return NULL; return NULL;

2
target/linux/generic/backport-6.1/819-v6.8-0001-nvmem-Move-of_nvmem_layout_get_container-in-another-.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -848,14 +848,6 @@ static int nvmem_add_cells_from_layout(s @@ -847,14 +847,6 @@ static int nvmem_add_cells_from_layout(s
} }
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF)

2
target/linux/generic/backport-6.1/819-v6.8-0003-nvmem-Simplify-the-add_cells-hook.patch
View File

@ -20,7 +20,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -817,7 +817,7 @@ static int nvmem_add_cells_from_layout(s @@ -816,7 +816,7 @@ static int nvmem_add_cells_from_layout(s
int ret; int ret;
if (layout && layout->add_cells) { if (layout && layout->add_cells) {

6
target/linux/generic/backport-6.1/819-v6.8-0004-nvmem-Move-and-rename-fixup_cell_info.patch
View File

@ -25,7 +25,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -676,7 +676,6 @@ static int nvmem_validate_keepouts(struc @@ -675,7 +675,6 @@ static int nvmem_validate_keepouts(struc
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
{ {
@ -33,7 +33,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
struct device_node *child; struct device_node *child;
const __be32 *addr; const __be32 *addr;
@@ -706,8 +705,8 @@ static int nvmem_add_cells_from_dt(struc @@ -705,8 +704,8 @@ static int nvmem_add_cells_from_dt(struc
info.np = of_node_get(child); info.np = of_node_get(child);
@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
ret = nvmem_add_one_cell(nvmem, &info); ret = nvmem_add_one_cell(nvmem, &info);
kfree(info.name); kfree(info.name);
@@ -896,6 +895,7 @@ struct nvmem_device *nvmem_register(cons @@ -895,6 +894,7 @@ struct nvmem_device *nvmem_register(cons
kref_init(&nvmem->refcnt); kref_init(&nvmem->refcnt);
INIT_LIST_HEAD(&nvmem->cells); INIT_LIST_HEAD(&nvmem->cells);

20
target/linux/generic/backport-6.1/819-v6.8-0005-nvmem-core-Rework-layouts-to-become-regular-devices.patch
View File

@ -84,7 +84,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset, static int __nvmem_reg_read(struct nvmem_device *nvmem, unsigned int offset,
void *val, size_t bytes) void *val, size_t bytes)
{ {
@@ -741,97 +738,22 @@ static int nvmem_add_cells_from_fixed_la @@ -740,97 +737,22 @@ static int nvmem_add_cells_from_fixed_la
return err; return err;
} }
@ -189,7 +189,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem, const void *nvmem_layout_get_match_data(struct nvmem_device *nvmem,
struct nvmem_layout *layout) struct nvmem_layout *layout)
{ {
@@ -839,7 +761,7 @@ const void *nvmem_layout_get_match_data( @@ -838,7 +760,7 @@ const void *nvmem_layout_get_match_data(
const struct of_device_id *match; const struct of_device_id *match;
layout_np = of_nvmem_layout_get_container(nvmem); layout_np = of_nvmem_layout_get_container(nvmem);
@ -198,7 +198,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return match ? match->data : NULL; return match ? match->data : NULL;
} }
@@ -951,19 +873,6 @@ struct nvmem_device *nvmem_register(cons @@ -950,19 +872,6 @@ struct nvmem_device *nvmem_register(cons
goto err_put_device; goto err_put_device;
} }
@ -218,7 +218,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->cells) { if (config->cells) {
rval = nvmem_add_cells(nvmem, config->cells, config->ncells); rval = nvmem_add_cells(nvmem, config->cells, config->ncells);
if (rval) if (rval)
@@ -984,24 +893,24 @@ struct nvmem_device *nvmem_register(cons @@ -983,24 +892,24 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_cells; goto err_remove_cells;
@ -249,7 +249,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
if (config->compat) if (config->compat)
nvmem_sysfs_remove_compat(nvmem, config); nvmem_sysfs_remove_compat(nvmem, config);
err_put_device: err_put_device:
@@ -1023,7 +932,7 @@ static void nvmem_device_release(struct @@ -1022,7 +931,7 @@ static void nvmem_device_release(struct
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
nvmem_device_remove_all_cells(nvmem); nvmem_device_remove_all_cells(nvmem);
@ -258,7 +258,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
device_unregister(&nvmem->dev); device_unregister(&nvmem->dev);
} }
@@ -1325,6 +1234,12 @@ nvmem_cell_get_from_lookup(struct device @@ -1324,6 +1233,12 @@ nvmem_cell_get_from_lookup(struct device
return cell; return cell;
} }
@ -271,7 +271,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#if IS_ENABLED(CONFIG_OF) #if IS_ENABLED(CONFIG_OF)
static struct nvmem_cell_entry * static struct nvmem_cell_entry *
nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np) nvmem_find_cell_entry_by_node(struct nvmem_device *nvmem, struct device_node *np)
@@ -1343,6 +1258,18 @@ nvmem_find_cell_entry_by_node(struct nvm @@ -1342,6 +1257,18 @@ nvmem_find_cell_entry_by_node(struct nvm
return cell; return cell;
} }
@ -290,7 +290,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
/** /**
* of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id * of_nvmem_cell_get() - Get a nvmem cell from given device node and cell id
* *
@@ -1405,16 +1332,29 @@ struct nvmem_cell *of_nvmem_cell_get(str @@ -1404,16 +1331,29 @@ struct nvmem_cell *of_nvmem_cell_get(str
return ERR_CAST(nvmem); return ERR_CAST(nvmem);
} }
@ -322,7 +322,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
return cell; return cell;
} }
@@ -1528,6 +1468,7 @@ void nvmem_cell_put(struct nvmem_cell *c @@ -1527,6 +1467,7 @@ void nvmem_cell_put(struct nvmem_cell *c
kfree(cell); kfree(cell);
__nvmem_device_put(nvmem); __nvmem_device_put(nvmem);
@ -330,7 +330,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
} }
EXPORT_SYMBOL_GPL(nvmem_cell_put); EXPORT_SYMBOL_GPL(nvmem_cell_put);
@@ -2105,11 +2046,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name); @@ -2104,11 +2045,22 @@ EXPORT_SYMBOL_GPL(nvmem_dev_name);
static int __init nvmem_init(void) static int __init nvmem_init(void)
{ {

6
target/linux/generic/backport-6.1/819-v6.8-0006-nvmem-core-Expose-cells-through-sysfs.patch
View File

@ -111,7 +111,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
static struct bin_attribute bin_attr_nvmem_eeprom_compat = { static struct bin_attribute bin_attr_nvmem_eeprom_compat = {
.attr = { .attr = {
.name = "eeprom", .name = "eeprom",
@@ -381,6 +428,68 @@ static void nvmem_sysfs_remove_compat(st @@ -380,6 +427,68 @@ static void nvmem_sysfs_remove_compat(st
device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom); device_remove_bin_file(nvmem->base_dev, &nvmem->eeprom);
} }
@ -180,7 +180,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
#else /* CONFIG_NVMEM_SYSFS */ #else /* CONFIG_NVMEM_SYSFS */
static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem, static int nvmem_sysfs_setup_compat(struct nvmem_device *nvmem,
@@ -740,11 +849,25 @@ static int nvmem_add_cells_from_fixed_la @@ -739,11 +848,25 @@ static int nvmem_add_cells_from_fixed_la
int nvmem_layout_register(struct nvmem_layout *layout) int nvmem_layout_register(struct nvmem_layout *layout)
{ {
@ -207,7 +207,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
} }
EXPORT_SYMBOL_GPL(nvmem_layout_register); EXPORT_SYMBOL_GPL(nvmem_layout_register);
@@ -903,10 +1026,20 @@ struct nvmem_device *nvmem_register(cons @@ -902,10 +1025,20 @@ struct nvmem_device *nvmem_register(cons
if (rval) if (rval)
goto err_remove_dev; goto err_remove_dev;

2
target/linux/generic/backport-6.1/819-v6.8-0008-nvmem-layouts-refactor-.add_cells-callback-arguments.patch
View File

@ -44,7 +44,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -855,7 +855,7 @@ int nvmem_layout_register(struct nvmem_l @@ -854,7 +854,7 @@ int nvmem_layout_register(struct nvmem_l
return -EINVAL; return -EINVAL;
/* Populate the cells */ /* Populate the cells */

2
target/linux/generic/backport-6.1/819-v6.8-0009-nvmem-drop-nvmem_layout_get_match_data.patch
View File

@ -24,7 +24,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -877,19 +877,6 @@ void nvmem_layout_unregister(struct nvme @@ -876,19 +876,6 @@ void nvmem_layout_unregister(struct nvme
} }
EXPORT_SYMBOL_GPL(nvmem_layout_unregister); EXPORT_SYMBOL_GPL(nvmem_layout_unregister);

2
target/linux/generic/backport-6.1/819-v6.8-0010-nvmem-core-add-nvmem_dev_size-helper.patch
View File

@ -21,7 +21,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
--- a/drivers/nvmem/core.c --- a/drivers/nvmem/core.c
+++ b/drivers/nvmem/core.c +++ b/drivers/nvmem/core.c
@@ -2164,6 +2164,19 @@ const char *nvmem_dev_name(struct nvmem_ @@ -2163,6 +2163,19 @@ const char *nvmem_dev_name(struct nvmem_
} }
EXPORT_SYMBOL_GPL(nvmem_dev_name); EXPORT_SYMBOL_GPL(nvmem_dev_name);

2
target/linux/generic/hack-6.1/904-debloat_dma_buf.patch
View File

@ -73,7 +73,7 @@ Signed-off-by: Felix Fietkau <nbd@nbd.name>
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
--- a/kernel/sched/core.c --- a/kernel/sched/core.c
+++ b/kernel/sched/core.c +++ b/kernel/sched/core.c
@@ -4367,6 +4367,7 @@ int wake_up_state(struct task_struct *p, @@ -4366,6 +4366,7 @@ int wake_up_state(struct task_struct *p,
{ {
return try_to_wake_up(p, state, 0); return try_to_wake_up(p, state, 0);
} }

26
target/linux/generic/hack-6.1/931-usb-net-for-fm350.patch
View File

@ -1,26 +0,0 @@
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -646,6 +646,7 @@ static void option_instat_callback(struc
static const struct usb_device_id option_ids[] = {
+ { USB_DEVICE(MEDIATEK_VENDOR_ID, 0x7127) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA_LIGHT) },
@@ -2423,6 +2424,15 @@ static int option_probe(struct usb_seria
if (device_flags & NUMEP2 && iface_desc->bNumEndpoints != 2)
return -ENODEV;
+ if(id->idVendor == MEDIATEK_VENDOR_ID &&
+ (id->idProduct == cpu_to_le16(0x7127) &&
+ ((serial->interface->cur_altsetting->desc.bInterfaceNumber <= 5) ||
+ (serial->interface->cur_altsetting->desc.bInterfaceNumber >= 7))))
+ {
+ printk(KERN_INFO "Discovery the interface for Fibocom & MEDIATEK.");
+ return -ENODEV;
+ }
+
/* Store the device flags so we can use them during attach. */
usb_set_serial_data(serial, (void *)device_flags);

4
target/linux/generic/pending-6.1/804-nvmem-core-support-mac-base-fixed-layout-cells.patch
View File

@ -33,7 +33,7 @@ string.
#include <linux/init.h> #include <linux/init.h>
#include <linux/kref.h> #include <linux/kref.h>
#include <linux/module.h> #include <linux/module.h>
@@ -780,6 +783,62 @@ static int nvmem_validate_keepouts(struc @@ -779,6 +782,62 @@ static int nvmem_validate_keepouts(struc
return 0; return 0;
} }
@ -96,7 +96,7 @@ string.
static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np) static int nvmem_add_cells_from_dt(struct nvmem_device *nvmem, struct device_node *np)
{ {
struct device *dev = &nvmem->dev; struct device *dev = &nvmem->dev;
@@ -814,6 +873,25 @@ static int nvmem_add_cells_from_dt(struc @@ -813,6 +872,25 @@ static int nvmem_add_cells_from_dt(struc
if (nvmem->fixup_dt_cell_info) if (nvmem->fixup_dt_cell_info)
nvmem->fixup_dt_cell_info(nvmem, &info); nvmem->fixup_dt_cell_info(nvmem, &info);

2
target/linux/generic/pending-6.1/901-usb-add-more-modem-support.patch
View File

@ -12,7 +12,7 @@
{QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */ {QMI_GOBI1K_DEVICE(0x05c6, 0x9212)}, /* Acer Gobi Modem Device */
--- a/drivers/usb/serial/option.c --- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c
@@ -2310,9 +2310,13 @@ static const struct usb_device_id option @@ -2322,9 +2322,13 @@ static const struct usb_device_id option
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a06, 0xff) }, /* Fibocom FM650-CN (RNDIS mode) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a06, 0xff) }, /* Fibocom FM650-CN (RNDIS mode) */
{ USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a07, 0xff) }, /* Fibocom FM650-CN (MBIM mode) */ { USB_DEVICE_INTERFACE_CLASS(0x2cb7, 0x0a07, 0xff) }, /* Fibocom FM650-CN (MBIM mode) */
{ USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */ { USB_DEVICE_INTERFACE_CLASS(0x2df3, 0x9d03, 0xff) }, /* LongSung M5710 */