diff options
author | John Audia <therealgraysky@proton.me> | 2023-01-12 07:19:14 -0500 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2023-01-13 22:04:22 +0100 |
commit | 843e3dace75ccd0af1b0c82433f306f4df253082 (patch) | |
tree | 01a42525387b2121ba071ed1be083fc48e6f76a8 /target/linux/ipq806x | |
parent | c051693ef4873162801ebcaff17c55628e6a8482 (diff) | |
download | upstream-843e3dace75ccd0af1b0c82433f306f4df253082.tar.gz upstream-843e3dace75ccd0af1b0c82433f306f4df253082.tar.bz2 upstream-843e3dace75ccd0af1b0c82433f306f4df253082.zip |
kernel: bump 5.15 to 5.15.87
Removed upstreamed:
generic/hack-5.15/290-net-dsa-mv88e6xxx-depend-on-PTP-conditionally.patch[1]
Build system: x86_64
Build-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
Run-tested: bcm2711/RPi4B, filogic/xiaomi_redmi-router-ax6000-ubootmod
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.15.87&id=945e58bdaf6faf6e3f957d182244fa830acddab4
Signed-off-by: John Audia <therealgraysky@proton.me>
Diffstat (limited to 'target/linux/ipq806x')
6 files changed, 20 insertions, 20 deletions
diff --git a/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch b/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch index 0442105d87..6b7a68952e 100644 --- a/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch +++ b/target/linux/ipq806x/patches-5.15/111-v5.19-01-PM-devfreq-Export-devfreq_get_freq_range-symbol-with.patch @@ -56,7 +56,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> if (freq < min_freq) { freq = min_freq; -@@ -785,6 +786,7 @@ struct devfreq *devfreq_add_device(struc +@@ -784,6 +785,7 @@ struct devfreq *devfreq_add_device(struc { struct devfreq *devfreq; struct devfreq_governor *governor; @@ -64,7 +64,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> int err = 0; if (!dev || !profile || !governor_name) { -@@ -849,6 +851,8 @@ struct devfreq *devfreq_add_device(struc +@@ -848,6 +850,8 @@ struct devfreq *devfreq_add_device(struc goto err_dev; } @@ -73,7 +73,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> devfreq->suspend_freq = dev_pm_opp_get_suspend_opp_freq(dev); devfreq->opp_table = dev_pm_opp_get_opp_table(dev); if (IS_ERR(devfreq->opp_table)) -@@ -1561,7 +1565,7 @@ static ssize_t min_freq_show(struct devi +@@ -1559,7 +1563,7 @@ static ssize_t min_freq_show(struct devi unsigned long min_freq, max_freq; mutex_lock(&df->lock); @@ -82,7 +82,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> mutex_unlock(&df->lock); return sprintf(buf, "%lu\n", min_freq); -@@ -1615,7 +1619,7 @@ static ssize_t max_freq_show(struct devi +@@ -1613,7 +1617,7 @@ static ssize_t max_freq_show(struct devi unsigned long min_freq, max_freq; mutex_lock(&df->lock); @@ -91,7 +91,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> mutex_unlock(&df->lock); return sprintf(buf, "%lu\n", max_freq); -@@ -1929,7 +1933,7 @@ static int devfreq_summary_show(struct s +@@ -1927,7 +1931,7 @@ static int devfreq_summary_show(struct s mutex_lock(&devfreq->lock); cur_freq = devfreq->previous_freq; diff --git a/target/linux/ipq806x/patches-5.15/111-v5.19-02-PM-devfreq-Add-cpu-based-scaling-support-to-passive-.patch b/target/linux/ipq806x/patches-5.15/111-v5.19-02-PM-devfreq-Add-cpu-based-scaling-support-to-passive-.patch index 52f1200c31..3dd61985b2 100644 --- a/target/linux/ipq806x/patches-5.15/111-v5.19-02-PM-devfreq-Add-cpu-based-scaling-support-to-passive-.patch +++ b/target/linux/ipq806x/patches-5.15/111-v5.19-02-PM-devfreq-Add-cpu-based-scaling-support-to-passive-.patch @@ -419,7 +419,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> struct thermal_cooling_device; /** -@@ -288,6 +289,11 @@ struct devfreq_simple_ondemand_data { +@@ -289,6 +290,11 @@ struct devfreq_simple_ondemand_data { #endif #if IS_ENABLED(CONFIG_DEVFREQ_GOV_PASSIVE) @@ -431,7 +431,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> /** * struct devfreq_passive_data - ``void *data`` fed to struct devfreq * and devfreq_add_device -@@ -299,8 +305,11 @@ struct devfreq_simple_ondemand_data { +@@ -300,8 +306,11 @@ struct devfreq_simple_ondemand_data { * using governors except for passive governor. * If the devfreq device has the specific method to decide * the next frequency, should use this callback. @@ -445,7 +445,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> * * The devfreq_passive_data have to set the devfreq instance of parent * device with governors except for the passive governor. But, don't need to -@@ -314,9 +323,13 @@ struct devfreq_passive_data { +@@ -315,9 +324,13 @@ struct devfreq_passive_data { /* Optional callback to decide the next frequency of passvice device */ int (*get_target_freq)(struct devfreq *this, unsigned long *freq); diff --git a/target/linux/ipq806x/patches-5.15/111-v5.19-04-PM-devfreq-passive-Keep-cpufreq_policy-for-possible-.patch b/target/linux/ipq806x/patches-5.15/111-v5.19-04-PM-devfreq-passive-Keep-cpufreq_policy-for-possible-.patch index 12de8af22e..9ef02d0ea3 100644 --- a/target/linux/ipq806x/patches-5.15/111-v5.19-04-PM-devfreq-passive-Keep-cpufreq_policy-for-possible-.patch +++ b/target/linux/ipq806x/patches-5.15/111-v5.19-04-PM-devfreq-passive-Keep-cpufreq_policy-for-possible-.patch @@ -212,7 +212,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> --- a/include/linux/devfreq.h +++ b/include/linux/devfreq.h -@@ -309,7 +309,7 @@ enum devfreq_parent_dev_type { +@@ -310,7 +310,7 @@ enum devfreq_parent_dev_type { * @this: the devfreq instance of own device. * @nb: the notifier block for DEVFREQ_TRANSITION_NOTIFIER or * CPUFREQ_TRANSITION_NOTIFIER list. @@ -221,7 +221,7 @@ Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com> * * The devfreq_passive_data have to set the devfreq instance of parent * device with governors except for the passive governor. But, don't need to -@@ -329,7 +329,7 @@ struct devfreq_passive_data { +@@ -330,7 +330,7 @@ struct devfreq_passive_data { /* For passive governor's internal use. Don't need to set them */ struct devfreq *this; struct notifier_block nb; diff --git a/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch b/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch index 0813140eca..210f57bd7e 100644 --- a/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch +++ b/target/linux/ipq806x/patches-5.15/113-v5.19-03-PM-devfreq-Rework-freq_table-to-be-local-to-devfr.patch @@ -126,7 +126,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> devfreq->stats.total_trans++; } -@@ -835,6 +831,9 @@ struct devfreq *devfreq_add_device(struc +@@ -834,6 +830,9 @@ struct devfreq *devfreq_add_device(struc if (err < 0) goto err_dev; mutex_lock(&devfreq->lock); @@ -136,7 +136,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> } devfreq->scaling_min_freq = find_available_min_freq(devfreq); -@@ -870,8 +869,8 @@ struct devfreq *devfreq_add_device(struc +@@ -869,8 +868,8 @@ struct devfreq *devfreq_add_device(struc devfreq->stats.trans_table = devm_kzalloc(&devfreq->dev, array3_size(sizeof(unsigned int), @@ -147,7 +147,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> GFP_KERNEL); if (!devfreq->stats.trans_table) { mutex_unlock(&devfreq->lock); -@@ -880,7 +879,7 @@ struct devfreq *devfreq_add_device(struc +@@ -879,7 +878,7 @@ struct devfreq *devfreq_add_device(struc } devfreq->stats.time_in_state = devm_kcalloc(&devfreq->dev, @@ -156,7 +156,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> sizeof(*devfreq->stats.time_in_state), GFP_KERNEL); if (!devfreq->stats.time_in_state) { -@@ -1639,9 +1638,9 @@ static ssize_t available_frequencies_sho +@@ -1637,9 +1636,9 @@ static ssize_t available_frequencies_sho mutex_lock(&df->lock); @@ -168,7 +168,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> mutex_unlock(&df->lock); /* Truncate the trailing space */ -@@ -1664,7 +1663,7 @@ static ssize_t trans_stat_show(struct de +@@ -1662,7 +1661,7 @@ static ssize_t trans_stat_show(struct de if (!df->profile) return -EINVAL; @@ -177,7 +177,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> if (max_state == 0) return sprintf(buf, "Not Supported.\n"); -@@ -1681,19 +1680,17 @@ static ssize_t trans_stat_show(struct de +@@ -1679,19 +1678,17 @@ static ssize_t trans_stat_show(struct de len += sprintf(buf + len, " :"); for (i = 0; i < max_state; i++) len += sprintf(buf + len, "%10lu", @@ -202,7 +202,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> for (j = 0; j < max_state; j++) len += sprintf(buf + len, "%10u", df->stats.trans_table[(i * max_state) + j]); -@@ -1717,7 +1714,7 @@ static ssize_t trans_stat_store(struct d +@@ -1715,7 +1712,7 @@ static ssize_t trans_stat_store(struct d if (!df->profile) return -EINVAL; @@ -211,7 +211,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> return count; err = kstrtoint(buf, 10, &value); -@@ -1725,11 +1722,11 @@ static ssize_t trans_stat_store(struct d +@@ -1723,11 +1720,11 @@ static ssize_t trans_stat_store(struct d return -EINVAL; mutex_lock(&df->lock); diff --git a/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch b/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch index cfdef8d6c5..591340c6f2 100644 --- a/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch +++ b/target/linux/ipq806x/patches-5.15/113-v5.19-04-PM-devfreq-Mute-warning-on-governor-PROBE_DEFER.patch @@ -14,7 +14,7 @@ Signed-off-by: Christian 'Ansuel' Marangi <ansuelsmth@gmail.com> --- a/drivers/devfreq/devfreq.c +++ b/drivers/devfreq/devfreq.c -@@ -931,8 +931,9 @@ struct devfreq *devfreq_add_device(struc +@@ -930,8 +930,9 @@ struct devfreq *devfreq_add_device(struc err = devfreq->governor->event_handler(devfreq, DEVFREQ_GOV_START, NULL); if (err) { diff --git a/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch b/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch index d433cb49b8..0d983410ec 100644 --- a/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch +++ b/target/linux/ipq806x/patches-5.15/850-soc-add-qualcomm-syscon.patch @@ -12,7 +12,7 @@ Subject: SoC: add qualcomm syscon obj-$(CONFIG_QCOM_RPMHPD) += rpmhpd.o --- a/drivers/soc/qcom/Kconfig +++ b/drivers/soc/qcom/Kconfig -@@ -191,6 +191,13 @@ config QCOM_SOCINFO +@@ -192,6 +192,13 @@ config QCOM_SOCINFO Say yes here to support the Qualcomm socinfo driver, providing information about the SoC to user space. |