mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 07:22:33 +00:00
5e43dd1fa7
Had to update generic defconfig (make kernel_menuconfig CONFIG_TARGET=generic)
for this bump, but since that only modifies the target defined in .config,
and since that target also needed to be updated for unrelated reasons, manually
propagated the newly added symbol to the generic config.
Removed upstreamed:
pending-5.10/860-Revert-ASoC-mediatek-Check-for-error-clk-pointer.patch[1]
All other patches automatically rebased.
1. https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?h=v5.10.99&id=080f371d984e8039c66db87f3c54804b0d172329
Build system: x86_64
Build-tested: bcm2711/RPi4B, mt7622/RT3200
Run-tested: bcm2711/RPi4B, mt7622/RT3200
Signed-off-by: John Audia <graysky@archlinux.us>
32 lines
982 B
Diff
32 lines
982 B
Diff
From 9ab71458b5475c7d8d42896721e593f6ef1a5c7a Mon Sep 17 00:00:00 2001
|
|
From: Phil Elwell <phil@raspberrypi.com>
|
|
Date: Tue, 25 Feb 2020 17:38:20 +0000
|
|
Subject: [PATCH] pinctrl: bcm2835: Accept fewer than expected IRQs
|
|
|
|
The downstream .dts files only request two GPIO IRQs. Truncate the
|
|
array of parent IRQs when irq_of_parse_and_map returns 0.
|
|
|
|
Signed-off-by: Phil Elwell <phil@raspberrypi.com>
|
|
---
|
|
drivers/pinctrl/bcm/pinctrl-bcm2835.c | 8 ++++++--
|
|
1 file changed, 6 insertions(+), 2 deletions(-)
|
|
|
|
--- a/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
+++ b/drivers/pinctrl/bcm/pinctrl-bcm2835.c
|
|
@@ -1290,9 +1290,13 @@ static int bcm2835_pinctrl_probe(struct
|
|
char *name;
|
|
|
|
girq->parents[i] = irq_of_parse_and_map(np, i);
|
|
- if (!is_7211)
|
|
+ if (!is_7211) {
|
|
+ if (!girq->parents[i]) {
|
|
+ girq->num_parents = i;
|
|
+ break;
|
|
+ }
|
|
continue;
|
|
-
|
|
+ }
|
|
/* Skip over the all banks interrupts */
|
|
pc->wake_irq[i] = irq_of_parse_and_map(np, i +
|
|
BCM2835_NUM_IRQS + 1);
|