diff options
author | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-08 21:58:55 +0100 |
---|---|---|
committer | Adrian Schmutzler <freifunk@adrianschmutzler.de> | 2020-02-14 14:10:51 +0100 |
commit | 7d7aa2fd924c27829ec25f825481554dd81bce97 (patch) | |
tree | 658b87b89331670266163e522ea5fb52535633cb /target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch | |
parent | e7bfda2c243e66a75ff966ba04c28b1590b5d24c (diff) | |
download | upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.gz upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.tar.bz2 upstream-7d7aa2fd924c27829ec25f825481554dd81bce97.zip |
brcm2708: rename target to bcm27xx
This change makes the names of Broadcom targets consistent by using
the common notation based on SoC/CPU ID (which is used internally
anyway), bcmXXXX instead of brcmXXXX.
This is even used for target TITLE in make menuconfig already,
only the short target name used brcm so far.
Despite, since subtargets range from bcm2708 to bcm2711, it seems
appropriate to use bcm27xx instead of bcm2708 (again, as already done
for BOARDNAME).
This also renames the packages brcm2708-userland and brcm2708-gpu-fw.
Signed-off-by: Adrian Schmutzler <freifunk@adrianschmutzler.de>
Acked-by: Álvaro Fernández Rojas <noltari@gmail.com>
Diffstat (limited to 'target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch')
-rw-r--r-- | target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch | 99 |
1 files changed, 0 insertions, 99 deletions
diff --git a/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch b/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch deleted file mode 100644 index 56dd9429fa..0000000000 --- a/target/linux/brcm2708/patches-4.19/950-0009-irqchip-irq-bcm2835-Add-2836-FIQ-support.patch +++ /dev/null @@ -1,99 +0,0 @@ -From a2416a2926904e3a07bdb10b9cf3c7871e87583c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Noralf=20Tr=C3=B8nnes?= <noralf@tronnes.org> -Date: Fri, 23 Oct 2015 16:26:55 +0200 -Subject: [PATCH] irqchip: irq-bcm2835: Add 2836 FIQ support -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Noralf Trønnes <noralf@tronnes.org> ---- - drivers/irqchip/irq-bcm2835.c | 43 +++++++++++++++++++++++++++++++++-- - 1 file changed, 41 insertions(+), 2 deletions(-) - ---- a/drivers/irqchip/irq-bcm2835.c -+++ b/drivers/irqchip/irq-bcm2835.c -@@ -50,8 +50,11 @@ - #include <linux/of_irq.h> - #include <linux/irqchip.h> - #include <linux/irqdomain.h> -+#include <linux/mfd/syscon.h> -+#include <linux/regmap.h> - - #include <asm/exception.h> -+#include <asm/mach/irq.h> - - /* Put the bank and irq (32 bits) into the hwirq */ - #define MAKE_HWIRQ(b, n) (((b) << 5) | (n)) -@@ -69,6 +72,9 @@ - #define BANK0_VALID_MASK (BANK0_HWIRQ_MASK | BANK1_HWIRQ | BANK2_HWIRQ \ - | SHORTCUT1_MASK | SHORTCUT2_MASK) - -+#undef ARM_LOCAL_GPU_INT_ROUTING -+#define ARM_LOCAL_GPU_INT_ROUTING 0x0c -+ - #define REG_FIQ_CONTROL 0x0c - #define REG_FIQ_ENABLE 0x80 - #define REG_FIQ_DISABLE 0 -@@ -94,6 +100,7 @@ struct armctrl_ic { - void __iomem *enable[NR_BANKS]; - void __iomem *disable[NR_BANKS]; - struct irq_domain *domain; -+ struct regmap *local_regmap; - }; - - static struct armctrl_ic intc __read_mostly; -@@ -127,12 +134,35 @@ static void armctrl_mask_irq(struct irq_ - - static void armctrl_unmask_irq(struct irq_data *d) - { -- if (d->hwirq >= NUMBER_IRQS) -+ if (d->hwirq >= NUMBER_IRQS) { -+ if (num_online_cpus() > 1) { -+ unsigned int data; -+ int ret; -+ -+ if (!intc.local_regmap) { -+ pr_err("FIQ is disabled due to missing regmap\n"); -+ return; -+ } -+ -+ ret = regmap_read(intc.local_regmap, -+ ARM_LOCAL_GPU_INT_ROUTING, &data); -+ if (ret) { -+ pr_err("Failed to read int routing %d\n", ret); -+ return; -+ } -+ -+ data &= ~0xc; -+ data |= (1 << 2); -+ regmap_write(intc.local_regmap, -+ ARM_LOCAL_GPU_INT_ROUTING, data); -+ } -+ - writel_relaxed(REG_FIQ_ENABLE | hwirq_to_fiq(d->hwirq), - intc.base + REG_FIQ_CONTROL); -- else -+ } else { - writel_relaxed(HWIRQ_BIT(d->hwirq), - intc.enable[HWIRQ_BANK(d->hwirq)]); -+ } - } - - static struct irq_chip armctrl_chip = { -@@ -209,6 +239,15 @@ static int __init armctrl_of_init(struct - set_handle_irq(bcm2835_handle_irq); - } - -+ if (is_2836) { -+ intc.local_regmap = -+ syscon_regmap_lookup_by_compatible("brcm,bcm2836-arm-local"); -+ if (IS_ERR(intc.local_regmap)) { -+ pr_err("Failed to get local register map. FIQ is disabled for cpus > 1\n"); -+ intc.local_regmap = NULL; -+ } -+ } -+ - /* Make a duplicate irq range which is used to enable FIQ */ - for (b = 0; b < NR_BANKS; b++) { - for (i = 0; i < bank_irqs[b]; i++) { |