2
0
forked from Ivasoft/openwrt

kernel: bump 5.10 to 5.10.121

Manually rebased:
    oxnas/patches-5.10/100-oxnas-clk-plla-pllb.patch

All other patches automatically rebased.

Build system: x86_64
Build-tested: ipq806x/R7800

Signed-off-by: John Audia <therealgraysky@proton.me>
(cherry picked from commit 706a4ec40c)
This commit is contained in:
John Audia
2022-06-11 08:50:59 -04:00
committed by Hauke Mehrtens
parent d8d8b82c59
commit 81530d69ef
35 changed files with 64 additions and 64 deletions

View File

@@ -17,7 +17,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/sound/soc/codecs/Kconfig
+++ b/sound/soc/codecs/Kconfig
@@ -1008,7 +1008,7 @@ config SND_SOC_PCM3168A_SPI
@@ -1007,7 +1007,7 @@ config SND_SOC_PCM3168A_SPI
select REGMAP_SPI
config SND_SOC_PCM5102A

View File

@@ -20,7 +20,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2984,7 +2984,8 @@ static int _regulator_list_voltage(struc
@@ -2987,7 +2987,8 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV;
if (ops->list_voltage) {
@@ -30,7 +30,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL;
if (lock)
regulator_lock(rdev);
@@ -3135,7 +3136,8 @@ int regulator_list_hardware_vsel(struct
@@ -3138,7 +3139,8 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops;
@@ -40,7 +40,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
return -EINVAL;
if (ops->set_voltage_sel != regulator_set_voltage_sel_regmap)
return -EOPNOTSUPP;
@@ -4058,6 +4060,9 @@ int regulator_set_voltage_time(struct re
@@ -4061,6 +4063,9 @@ int regulator_set_voltage_time(struct re
for (i = 0; i < rdev->desc->n_voltages; i++) {
/* We only look for exact voltage matches here */

View File

@@ -14,7 +14,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -4063,6 +4063,9 @@ int regulator_set_voltage_time(struct re
@@ -4066,6 +4066,9 @@ int regulator_set_voltage_time(struct re
if (i < rdev->desc->linear_min_sel)
continue;

View File

@@ -21,7 +21,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
--- a/drivers/regulator/core.c
+++ b/drivers/regulator/core.c
@@ -2984,9 +2984,10 @@ static int _regulator_list_voltage(struc
@@ -2987,9 +2987,10 @@ static int _regulator_list_voltage(struc
return rdev->desc->fixed_uV;
if (ops->list_voltage) {
@@ -34,7 +34,7 @@ Signed-off-by: Mark Brown <broonie@kernel.org>
if (lock)
regulator_lock(rdev);
ret = ops->list_voltage(rdev, selector);
@@ -3136,9 +3137,10 @@ int regulator_list_hardware_vsel(struct
@@ -3139,9 +3140,10 @@ int regulator_list_hardware_vsel(struct
struct regulator_dev *rdev = regulator->rdev;
const struct regulator_ops *ops = rdev->desc->ops;