1 From 1612baf8148e9180f28d7afc93df3ec3cd3e5ce0 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.org>
3 Date: Sat, 3 Mar 2018 14:18:03 +0000
4 Subject: [PATCH 239/454] overlays: Add 'upstream' overlay
6 The 'upstream' overlay makes the necessary changes for a downstream
7 .dtb to be used with an upstream kernel. It is currently made up from
8 three other overlays - vc4-kms-v3d, dwc2 and upstream-aux-interrupt.
9 The VPU firmware will soon be made to automatically load this overlay
10 when an upstream kernel is detected (using the trailer supplied by the
13 See: https://github.com/raspberrypi/linux/pull/2393
15 Signed-off-by: Phil Elwell <phil@raspberrypi.org>
17 arch/arm/boot/dts/overlays/Makefile | 1 +
18 arch/arm/boot/dts/overlays/README | 10 +-
19 .../boot/dts/overlays/upstream-overlay.dts | 154 ++++++++++++++++++
20 3 files changed, 164 insertions(+), 1 deletion(-)
21 create mode 100644 arch/arm/boot/dts/overlays/upstream-overlay.dts
23 --- a/arch/arm/boot/dts/overlays/Makefile
24 +++ b/arch/arm/boot/dts/overlays/Makefile
25 @@ -123,6 +123,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
30 upstream-aux-interrupt.dtbo \
33 --- a/arch/arm/boot/dts/overlays/README
34 +++ b/arch/arm/boot/dts/overlays/README
35 @@ -1731,9 +1731,17 @@ Params: txd1_pin GPIO pin
36 rxd1_pin GPIO pin for RXD1 (15, 33 or 41 - default 15)
40 +Info: Allow usage of downstream .dtb with upstream kernel. Comprises
41 + vc4-kms-v3d, dwc2 and upstream-aux-interrupt overlays.
42 +Load: dtoverlay=upstream
46 Name: upstream-aux-interrupt
47 Info: Allow usage of downstream .dtb with upstream kernel by binding AUX
48 - devices directly to the shared AUX interrupt line.
49 + devices directly to the shared AUX interrupt line. One of the parts
50 + of the 'upstream' overlay
51 Load: dtoverlay=upstream-aux-interrupt
55 +++ b/arch/arm/boot/dts/overlays/upstream-overlay.dts
57 +// redo: ovmerge -c vc4-kms-v3d-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg upstream-aux-interrupt-overlay.dts,
62 +#include <dt-bindings/clock/bcm2835.h>
65 + compatible = "brcm,bcm2835", "brcm,bcm2708", "brcm,bcm2709";
67 + target-path = "/chosen";
69 + bootargs = "cma=256M";
73 + target-path = "/chosen";
75 + bootargs = "cma=192M";
79 + target-path = "/chosen";
81 + bootargs = "cma=128M";
85 + target-path = "/chosen";
87 + bootargs = "cma=96M";
91 + target-path = "/chosen";
93 + bootargs = "cma=64M";
105 + status = "disabled";
109 + target = <&pixelvalve0>;
111 + interrupts = <2 13>;
116 + target = <&pixelvalve1>;
118 + interrupts = <2 14>;
123 + target = <&pixelvalve2>;
125 + interrupts = <2 10>;
132 + interrupts = <2 1>;
139 + interrupts = <2 8>, <2 9>;
146 + interrupts = <1 10>;
157 + target-path = "/soc/dma";
159 + brcm,dma-channel-mask = <0x7f35>;
163 + target = <&clocks>;
165 + claim-clocks = <BCM2835_PLLD_DSI0 BCM2835_PLLD_DSI1 BCM2835_PLLH_AUX BCM2835_PLLH_PIX>;
176 + #address-cells = <1>;
178 + dwc2_usb: __overlay__ {
179 + compatible = "brcm,bcm2835-usb";
180 + reg = <0x7e980000 0x10000>;
181 + interrupts = <1 9>;
183 + g-np-tx-fifo-size = <32>;
184 + g-rx-fifo-size = <256>;
185 + g-tx-fifo-size = <512 512 512 512 512 768>;
192 + interrupt-parent = <&intc>;
193 + interrupts = <0x1 0x1d>;
199 + interrupt-parent = <&intc>;
200 + interrupts = <0x1 0x1d>;
206 + interrupt-parent = <&intc>;
207 + interrupts = <0x1 0x1d>;