kernel: Update to version 5.15.177
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
This commit is contained in:
committed by
Lucas Asvio
parent
46d8cb1028
commit
7d75fb67df
@@ -29,7 +29,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
unsigned int reg, unsigned int val);
|
||||
--- a/drivers/base/regmap/regmap.c
|
||||
+++ b/drivers/base/regmap/regmap.c
|
||||
@@ -834,6 +834,7 @@ struct regmap *__regmap_init(struct devi
|
||||
@@ -823,6 +823,7 @@ struct regmap *__regmap_init(struct devi
|
||||
|
||||
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
|
||||
map->format.pad_bytes = config->pad_bits / 8;
|
||||
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
map->format.val_bytes = DIV_ROUND_UP(config->val_bits, 8);
|
||||
map->format.buf_size = DIV_ROUND_UP(config->reg_bits +
|
||||
config->val_bits + config->pad_bits, 8);
|
||||
@@ -1762,6 +1763,7 @@ static int _regmap_raw_write_impl(struct
|
||||
@@ -1750,6 +1751,7 @@ static int _regmap_raw_write_impl(struct
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -45,7 +45,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
||||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
||||
map->write_flag_mask);
|
||||
@@ -1932,6 +1934,7 @@ static int _regmap_bus_formatted_write(v
|
||||
@@ -1920,6 +1922,7 @@ static int _regmap_bus_formatted_write(v
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -53,7 +53,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
map->format.format_write(map, reg, val);
|
||||
|
||||
trace_regmap_hw_write_start(map, reg, 1);
|
||||
@@ -2372,6 +2375,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||
@@ -2360,6 +2363,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||
unsigned int reg = regs[i].reg;
|
||||
unsigned int val = regs[i].def;
|
||||
trace_regmap_hw_write_start(map, reg, 1);
|
||||
@@ -61,7 +61,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
map->format.format_reg(u8, reg, map->reg_shift);
|
||||
u8 += reg_bytes + pad_bytes;
|
||||
map->format.format_val(u8, val, 0);
|
||||
@@ -2697,6 +2701,7 @@ static int _regmap_raw_read(struct regma
|
||||
@@ -2685,6 +2689,7 @@ static int _regmap_raw_read(struct regma
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -33,7 +33,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
void *work_buf; /* Scratch buffer used to format I/O */
|
||||
--- a/drivers/base/regmap/regmap.c
|
||||
+++ b/drivers/base/regmap/regmap.c
|
||||
@@ -832,6 +832,8 @@ struct regmap *__regmap_init(struct devi
|
||||
@@ -821,6 +821,8 @@ struct regmap *__regmap_init(struct devi
|
||||
else
|
||||
map->alloc_flags = GFP_KERNEL;
|
||||
|
||||
@@ -42,7 +42,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
map->format.reg_bytes = DIV_ROUND_UP(config->reg_bits, 8);
|
||||
map->format.pad_bytes = config->pad_bits / 8;
|
||||
map->format.reg_downshift = config->reg_downshift;
|
||||
@@ -1763,6 +1765,7 @@ static int _regmap_raw_write_impl(struct
|
||||
@@ -1751,6 +1753,7 @@ static int _regmap_raw_write_impl(struct
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -50,7 +50,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
reg >>= map->format.reg_downshift;
|
||||
map->format.format_reg(map->work_buf, reg, map->reg_shift);
|
||||
regmap_set_work_buf_flag_mask(map, map->format.reg_bytes,
|
||||
@@ -1934,6 +1937,7 @@ static int _regmap_bus_formatted_write(v
|
||||
@@ -1922,6 +1925,7 @@ static int _regmap_bus_formatted_write(v
|
||||
return ret;
|
||||
}
|
||||
|
||||
@@ -58,7 +58,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
reg >>= map->format.reg_downshift;
|
||||
map->format.format_write(map, reg, val);
|
||||
|
||||
@@ -2375,6 +2379,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||
@@ -2363,6 +2367,7 @@ static int _regmap_raw_multi_reg_write(s
|
||||
unsigned int reg = regs[i].reg;
|
||||
unsigned int val = regs[i].def;
|
||||
trace_regmap_hw_write_start(map, reg, 1);
|
||||
@@ -66,7 +66,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
reg >>= map->format.reg_downshift;
|
||||
map->format.format_reg(u8, reg, map->reg_shift);
|
||||
u8 += reg_bytes + pad_bytes;
|
||||
@@ -2701,6 +2706,7 @@ static int _regmap_raw_read(struct regma
|
||||
@@ -2689,6 +2694,7 @@ static int _regmap_raw_read(struct regma
|
||||
return ret;
|
||||
}
|
||||
|
||||
|
||||
@@ -28,7 +28,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
|
||||
--- a/drivers/base/regmap/regmap.c
|
||||
+++ b/drivers/base/regmap/regmap.c
|
||||
@@ -1955,6 +1955,8 @@ static int _regmap_bus_reg_write(void *c
|
||||
@@ -1943,6 +1943,8 @@ static int _regmap_bus_reg_write(void *c
|
||||
{
|
||||
struct regmap *map = context;
|
||||
|
||||
@@ -37,7 +37,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
return map->bus->reg_write(map->bus_context, reg, val);
|
||||
}
|
||||
|
||||
@@ -2727,6 +2729,8 @@ static int _regmap_bus_reg_read(void *co
|
||||
@@ -2715,6 +2717,8 @@ static int _regmap_bus_reg_read(void *co
|
||||
{
|
||||
struct regmap *map = context;
|
||||
|
||||
@@ -46,7 +46,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
|
||||
return map->bus->reg_read(map->bus_context, reg, val);
|
||||
}
|
||||
|
||||
@@ -3096,6 +3100,8 @@ static int _regmap_update_bits(struct re
|
||||
@@ -3084,6 +3088,8 @@ static int _regmap_update_bits(struct re
|
||||
*change = false;
|
||||
|
||||
if (regmap_volatile(map, reg) && map->reg_update_bits) {
|
||||
|
||||
@@ -877,7 +877,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
ethtool_link_ksettings_add_link_mode(ks, supported, FEC_RS);
|
||||
--- a/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
||||
+++ b/drivers/net/ethernet/xilinx/xilinx_axienet_main.c
|
||||
@@ -1661,7 +1661,7 @@ static void axienet_validate(struct phyl
|
||||
@@ -1667,7 +1667,7 @@ static void axienet_validate(struct phyl
|
||||
netdev_warn(ndev, "Cannot use PHY mode %s, supported: %s\n",
|
||||
phy_modes(state->interface),
|
||||
phy_modes(lp->phy_mode));
|
||||
@@ -886,7 +886,7 @@ Signed-off-by: David S. Miller <davem@davemloft.net>
|
||||
return;
|
||||
}
|
||||
}
|
||||
@@ -1694,10 +1694,8 @@ static void axienet_validate(struct phyl
|
||||
@@ -1700,10 +1700,8 @@ static void axienet_validate(struct phyl
|
||||
break;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user