aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch
diff options
context:
space:
mode:
authorPetr Štetiar <ynezz@true.cz>2022-03-28 10:21:38 +0200
committerPetr Štetiar <ynezz@true.cz>2022-03-29 12:02:50 +0200
commit7ef75445c5745984fd27cfca6631599cfda77e6e (patch)
treedb3424e0074cf028f4ceaf51679b182045ee1c1a /target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch
parent972f2bff6add81e17728e3dd2c1f972ffa39600d (diff)
downloadupstream-7ef75445c5745984fd27cfca6631599cfda77e6e.tar.gz
upstream-7ef75445c5745984fd27cfca6631599cfda77e6e.tar.bz2
upstream-7ef75445c5745984fd27cfca6631599cfda77e6e.zip
x86: copy config and patches from 5.10 to 5.15
So the upcoming changes needed for 5.15 can be reviewed easily. Removing following patches backported from 5.15: * 101-v5.15-mfd-lpc_ich-Enable-GPIO-driver-for-DH89xxCC.patch * 102-v5.15-platform-x86-add-meraki-mx100-platform-driver.patch Removed upstreamed patch `300-pcengines_apu1_led.patch` in commit 1b40faf7e4ab ("leds: apu: extend support for PC Engines APU1 with newer firmware") Signed-off-by: Petr Štetiar <ynezz@true.cz>
Diffstat (limited to 'target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch')
-rw-r--r--target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch13
1 files changed, 13 insertions, 0 deletions
diff --git a/target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch b/target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch
new file mode 100644
index 0000000000..d4de2027ba
--- /dev/null
+++ b/target/linux/x86/patches-5.15/100-fix_cs5535_clockevt.patch
@@ -0,0 +1,13 @@
+--- a/drivers/clocksource/timer-cs5535.c
++++ b/drivers/clocksource/timer-cs5535.c
+@@ -127,7 +127,9 @@ static irqreturn_t mfgpt_tick(int irq, v
+ cs5535_mfgpt_write(cs5535_event_clock, MFGPT_REG_SETUP,
+ MFGPT_SETUP_CNTEN | MFGPT_SETUP_CMP2);
+
+- cs5535_clockevent.event_handler(&cs5535_clockevent);
++ if (cs5535_clockevent.event_handler)
++ cs5535_clockevent.event_handler(&cs5535_clockevent);
++
+ return IRQ_HANDLED;
+ }
+