git.openwrt.org Git - openwrt/staging/blocktrron.git/blob

   1 From abb92d68abc64c31e3389560e70ba4bf32683a1c Mon Sep 17 00:00:00 2001
   2 From: Jonathan Bell <jonathan@raspberrypi.org>
   3 Date: Wed, 24 Jul 2019 14:36:53 +0100
   4 Subject: [PATCH 720/782] dts: bcm2838: add missing properties for pmu and gic
   5  nodes
   6
   7 The GIC has a virtual interface maintenance interrupt and the PMU
   8 interrupts need affinity mappings as they are wired to generic SPIs.
   9
  10 Also, delete incorrect PMU compatible string.
  11
  12 Signed-off-by: Jonathan Bell <jonathan@raspberrypi.org>
  13 ---
  14  arch/arm/boot/dts/bcm2838.dtsi | 9 ++++-----
  15  1 file changed, 4 insertions(+), 5 deletions(-)
  16
  17 --- a/arch/arm/boot/dts/bcm2838.dtsi
  18 +++ b/arch/arm/boot/dts/bcm2838.dtsi
  19 @@ -35,6 +35,8 @@
  20                                 <0x40042000 0x2000>,
  21                                 <0x40044000 0x2000>,
  22                                 <0x40046000 0x2000>;
  23 +                       interrupts = <GIC_PPI 9 (GIC_CPU_MASK_SIMPLE(4) |
  24 +                                                IRQ_TYPE_LEVEL_HIGH)>;
  25                 };
  26
  27                 thermal: thermal@7d5d2200 {
  28 @@ -222,15 +224,12 @@
  29         };
  30
  31         arm-pmu {
  32 -               /*
  33 -                * N.B. the A72 PMU support only exists in arch/arm64, hence
  34 -                * the fallback to the A53 version.
  35 -                */
  36 -               compatible = "arm,cortex-a72-pmu", "arm,cortex-a53-pmu";
  37 +               compatible = "arm,cortex-a72-pmu";
  38                 interrupts = <GIC_SPI 16 IRQ_TYPE_LEVEL_HIGH>,
  39                         <GIC_SPI 17 IRQ_TYPE_LEVEL_HIGH>,
  40                         <GIC_SPI 18 IRQ_TYPE_LEVEL_HIGH>,
  41                         <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
  42 +               interrupt-affinity = <&cpu0>, <&cpu1>, <&cpu2>, <&cpu3>;
  43         };
  44
  45         timer {