1 From 2b584d25f295e07ef58efc2a60057be58015d693 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] overlays: Remove upstream-aux-interrupt overlay
6 We no longer have a downstream-specific auxilliary interrupt
7 driver, so the overlay to disable it is no longer needed.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
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
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) += \
24 - upstream-aux-interrupt.dtbo \
26 vc4-kms-kippah-7inch.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
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
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
48 +Info: This overlay has been deprecated and removed because it is no longer
54 --- a/arch/arm/boot/dts/overlays/upstream-aux-interrupt-overlay.dts
57 -// Overlay for missing AUX interrupt controller
58 -// Instead we bind all AUX devices to the generic AUX interrupt line
63 - compatible = "brcm,bcm2708";
68 - interrupt-parent = <&intc>;
69 - interrupts = <0x1 0x1d>;
76 - interrupt-parent = <&intc>;
77 - interrupts = <0x1 0x1d>;
84 - interrupt-parent = <&intc>;
85 - interrupts = <0x1 0x1d>;
90 --- a/arch/arm/boot/dts/overlays/upstream-overlay.dts
91 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
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