target/linux/brcm2708/patches-4.19/950-0507-overlays-Remove-upstream-aux-interrupt-overlay.patch

   1 From 1bb35a0debe9afff8113fe7727020e22a6160fd2 Mon Sep 17 00:00:00 2001
   2 From: Phil Elwell <phil@raspberrypi.org>
   3 Date: Tue, 7 May 2019 10:06:04 +0100
   4 Subject: [PATCH 507/703] overlays: Remove upstream-aux-interrupt overlay
   5
   6 We no longer have a downstream-specific auxilliary interrupt
   7 driver, so the overlay to disable it is no longer needed.
   8
   9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
  10 ---
  11  arch/arm/boot/dts/overlays/Makefile           |  1 -
  12  arch/arm/boot/dts/overlays/README             | 12 +++----
  13  .../upstream-aux-interrupt-overlay.dts        | 33 -------------------
  14  .../boot/dts/overlays/upstream-overlay.dts    |  2 +-
  15  4 files changed, 6 insertions(+), 42 deletions(-)
  16  delete mode 100644 arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
  17
  18 --- a/arch/arm/boot/dts/overlays/Makefile
  19 +++ b/arch/arm/boot/dts/overlays/Makefile
  20 @@ -151,7 +151,6 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
  21         uart1.dtbo \
  22         udrc.dtbo \
  23         upstream.dtbo \
  24 -       upstream-aux-interrupt.dtbo \
  25         vc4-fkms-v3d.dtbo \
  26         vc4-kms-kippah-7inch.dtbo \
  27         vc4-kms-v3d.dtbo \
  28 --- a/arch/arm/boot/dts/overlays/README
  29 +++ b/arch/arm/boot/dts/overlays/README
  30 @@ -2206,18 +2206,16 @@ Params: alsaname                Name of
  31
  32
  33  Name:   upstream
  34 -Info:   Allow usage of downstream .dtb with upstream kernel. Comprises
  35 -        vc4-kms-v3d, dwc2 and upstream-aux-interrupt overlays.
  36 +Info:   Allow usage of downstream .dtb with upstream kernel. Comprises the
  37 +        vc4-kms-v3d and dwc2 overlays.
  38  Load:   dtoverlay=upstream
  39  Params: <None>
  40
  41
  42  Name:   upstream-aux-interrupt
  43 -Info:   Allow usage of downstream .dtb with upstream kernel by binding AUX
  44 -        devices directly to the shared AUX interrupt line. One of the parts
  45 -        of the 'upstream' overlay
  46 -Load:   dtoverlay=upstream-aux-interrupt
  47 -Params: <None>
  48 +Info:   This overlay has been deprecated and removed because it is no longer
  49 +        necessary.
  50 +Load:   <Deprecated>
  51
  52
  53  Name:   vc4-fkms-v3d
  54 --- a/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
  55 +++ /dev/null
  56 @@ -1,33 +0,0 @@
  57 -// Overlay for missing AUX interrupt controller
  58 -// Instead we bind all AUX devices to the generic AUX interrupt line
  59 -/dts-v1/;
  60 -/plugin/;
  61 -
  62 -/ {
  63 -    compatible = "brcm,bcm2708";
  64 -
  65 -    fragment@0 {
  66 -        target = <&uart1>;
  67 -        __overlay__ {
  68 -            interrupt-parent = <&intc>;
  69 -            interrupts = <0x1 0x1d>;
  70 -        };
  71 -    };
  72 -
  73 -    fragment@1 {
  74 -        target = <&spi1>;
  75 -        __overlay__ {
  76 -            interrupt-parent = <&intc>;
  77 -            interrupts = <0x1 0x1d>;
  78 -        };
  79 -    };
  80 -
  81 -    fragment@2 {
  82 -        target = <&spi2>;
  83 -        __overlay__ {
  84 -            interrupt-parent = <&intc>;
  85 -            interrupts = <0x1 0x1d>;
  86 -        };
  87 -    };
  88 -};
  89 -
  90 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
  91 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
  92 @@ -1,4 +1,4 @@
  93 -// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg upstream-aux-interrupt-overlay.dts,
  94 +// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg
  95
  96  /dts-v1/;
  97  /plugin/;