From ee0ebe1df55d0793d8f623e85d337c3e9d596fa6 Mon Sep 17 00:00:00 2001 From: Pablo Greco Date: Feb 15 2020 16:26:47 +0000 Subject: Update to 4.19.104 --- diff --git a/.kernel.metadata b/.kernel.metadata index c5b55d0..14dd55a 100644 --- a/.kernel.metadata +++ b/.kernel.metadata @@ -1,2 +1,2 @@ 40f3e72192d59c0b7a4638cebd0ea55d35a782bb SOURCES/linux-4.19.tar.xz -43fea642156c0f69f5f73ff0f05d6be2bd848b29 SOURCES/patch-4.19.94.xz +ecc8e5fe6de58ca200be6451c1237b3b61148d30 SOURCES/patch-4.19.104.xz diff --git a/SOURCES/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch b/SOURCES/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch index e845e00..582ee5d 100644 --- a/SOURCES/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch +++ b/SOURCES/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch @@ -18,7 +18,7 @@ index 6c3cfaa77f3d..e6d1627ec421 100644 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi @@ -35,6 +35,13 @@ - reg = <0x7e00b840 0xf>; + reg = <0x7e00b840 0x3c>; interrupts = <0 2>; }; + @@ -389,7 +389,7 @@ index 31b2964..2def068 100644 trips { - cpu-crit { + cpu_crit: cpu-crit { - temperature = <80000>; + temperature = <90000>; hysteresis = <0>; type = "critical"; -- diff --git a/SOURCES/cherrytrail-pwm-lpss-fixes.patch b/SOURCES/cherrytrail-pwm-lpss-fixes.patch index 036ff22..1da9331 100644 --- a/SOURCES/cherrytrail-pwm-lpss-fixes.patch +++ b/SOURCES/cherrytrail-pwm-lpss-fixes.patch @@ -207,49 +207,6 @@ index 8f029ed263af..1a2575d25bea 100644 -- 2.19.1 -From 0a2e85765305e9fc376d0153aa9747b5d58cc804 Mon Sep 17 00:00:00 2001 -From: Hans de Goede -Date: Mon, 24 Sep 2018 20:57:43 +0200 -Subject: [PATCH 4/7] pwm: lpss: Release runtime-pm reference from the driver's - remove callback - -For each pwm output which gets enabled through pwm_lpss_apply(), we do a -pm_runtime_get_sync(). - -This commit adds pm_runtime_put() calls to pwm_lpss_remove() to balance -these when the driver gets removed with some of the outputs still enabled. - -Fixes: f080be27d7d9 ("pwm: lpss: Add support for runtime PM") -Acked-by: Andy Shevchenko -Signed-off-by: Hans de Goede ---- -Changes in v2: --New patch in v2 of this patch-set replacing "pwm: lpss: Add - pwm_lpss_get_put_runtime_pm helper function" ---- - drivers/pwm/pwm-lpss.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/drivers/pwm/pwm-lpss.c b/drivers/pwm/pwm-lpss.c -index e602835fd6de..723ca9de8325 100644 ---- a/drivers/pwm/pwm-lpss.c -+++ b/drivers/pwm/pwm-lpss.c -@@ -205,6 +205,12 @@ EXPORT_SYMBOL_GPL(pwm_lpss_probe); - - int pwm_lpss_remove(struct pwm_lpss_chip *lpwm) - { -+ int i; -+ -+ for (i = 0; i < lpwm->info->npwm; i++) { -+ if (pwm_is_enabled(&lpwm->chip.pwms[i])) -+ pm_runtime_put(lpwm->chip.dev); -+ } - return pwmchip_remove(&lpwm->chip); - } - EXPORT_SYMBOL_GPL(pwm_lpss_remove); --- -2.19.1 - From c3ffc28eeb4f9974380c4a85abfbb387d6d1cd8d Mon Sep 17 00:00:00 2001 From: Hans de Goede Date: Fri, 25 Nov 2016 09:45:19 +0100 diff --git a/SPECS/kernel.spec b/SPECS/kernel.spec index 1bc377a..bdf1c63 100644 --- a/SPECS/kernel.spec +++ b/SPECS/kernel.spec @@ -54,7 +54,7 @@ Summary: The Linux kernel %if 0%{?released_kernel} # Do we have a -stable update to apply? -%define stable_update 94 +%define stable_update 104 # Set rpm version accordingly %if 0%{?stable_update} %define stablerev %{stable_update} @@ -2239,6 +2239,10 @@ fi # # %changelog +* Sat Feb 15 2020 Pablo Greco - 4.19.104-300 +- Linux v4.19.104 +- Remove upstreamed patches + * Thu Jan 9 2020 Pablo Greco - 4.19.94-300 - Linux v4.19.94 - Remove upstreamed patches