1 From 0a65f76d99bce7685e57ae506eedc499c551ac83 Mon Sep 17 00:00:00 2001
2 From: Phil Elwell <phil@raspberrypi.com>
3 Date: Mon, 6 Apr 2020 09:47:42 +0100
4 Subject: [PATCH] Add upstream and upstream-pi4 to overlay_map
6 Because the upstream overlay applies vc4-kms-v3d, of which Pi 4 has its
7 own version, there also needs to be a Pi 4 version - vc4-kms-v3d-pi4.
9 Signed-off-by: Phil Elwell <phil@raspberrypi.com>
11 arch/arm/boot/dts/overlays/Makefile | 1 +
12 arch/arm/boot/dts/overlays/README | 7 +
13 arch/arm/boot/dts/overlays/overlay_map.dts | 9 +
14 .../dts/overlays/upstream-pi4-overlay.dts | 161 ++++++++++++++++++
15 4 files changed, 178 insertions(+)
16 create mode 100644 arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
18 --- a/arch/arm/boot/dts/overlays/Makefile
19 +++ b/arch/arm/boot/dts/overlays/Makefile
20 @@ -183,6 +183,7 @@ dtbo-$(CONFIG_ARCH_BCM2835) += \
26 vc4-kms-kippah-7inch.dtbo \
28 --- a/arch/arm/boot/dts/overlays/README
29 +++ b/arch/arm/boot/dts/overlays/README
30 @@ -2653,6 +2653,13 @@ Info: This overlay has been deprecated
35 +Info: Allow usage of downstream .dtb with upstream kernel on Pi 4. Comprises
36 + the vc4-kms-v3d-pi4 and dwc2 overlays.
37 +Load: dtoverlay=upstream-pi4
42 Info: Enable Eric Anholt's DRM VC4 V3D driver on top of the dispmanx
44 --- a/arch/arm/boot/dts/overlays/overlay_map.dts
45 +++ b/arch/arm/boot/dts/overlays/overlay_map.dts
52 + bcm2711 = "upstream-pi4";
55 upstream-aux-interrupt {
56 deprecated = "no longer necessary";
65 bcm2711 = "vc4-kms-v3d-pi4";
67 +++ b/arch/arm/boot/dts/overlays/upstream-pi4-overlay.dts
69 +// redo: ovmerge -c vc4-kms-v3d-pi4-overlay.dts,cma-96 dwc2-overlay.dts,dr_mode=otg
74 +#include <dt-bindings/clock/bcm2835.h>
77 + compatible = "brcm,bcm2835";
79 + target-path = "/chosen";
81 + bootargs = "cma=256M";
85 + target-path = "/chosen";
87 + bootargs = "cma=192M";
91 + target-path = "/chosen";
93 + bootargs = "cma=128M";
97 + target-path = "/chosen";
99 + bootargs = "cma=96M";
103 + target-path = "/chosen";
105 + bootargs = "cma=64M";
139 + target = <&pixelvalve0>;
145 + target = <&pixelvalve1>;
151 + target = <&pixelvalve2>;
157 + target = <&pixelvalve3>;
163 + target = <&pixelvalve4>;
189 + status = "disabled";
193 + target = <&firmwarekms>;
195 + status = "disabled";
201 + status = "disabled";
218 + #address-cells = <1>;
221 + compatible = "brcm,bcm2835-usb";
223 + g-np-tx-fifo-size = <32>;
224 + g-rx-fifo-size = <558>;
225 + g-tx-fifo-size = <512 512 512 512 512 256 256>;