Skip to content

dt updates, and kms using bcm2711-hvs for dma range #3927

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
pelwell merged 4 commits into from
Oct 26, 2020
Merged

dt updates, and kms using bcm2711-hvs for dma range #3927

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7a51406
overlays: Add option to disable composite to vc4-kms-v3d
6by9 Oct 23, 2020
91890cc
overlays: imx219: Correct link frequency to match the upstream driver
6by9 Mar 11, 2020
6e68894
dts: Add CM4 to arm64 dt files
6by9 Oct 23, 2020
cf6e066
drm/vc4: Add the 2711 HVS as a suitable DMA node
6by9 Oct 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions arch/arm/boot/dts/overlays/README
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2949,6 +2949,8 @@ Params: cma-512 CMA is 512MB (needs 1GB)
cma-default Use upstream's default value
audio Enable or disable audio over HDMI (default "on")
noaudio Disable all HDMI audio (default "off")
nocomposite Disable the composite video output (default
"off")


Name: vc4-kms-v3d-pi4
Expand Down
2 changes: 1 addition & 1 deletion arch/arm/boot/dts/overlays/imx219-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
data-lanes = <1 2>;
clock-noncontinuous;
link-frequencies =
/bits/ 64 <297000000>;
/bits/ 64 <456000000>;
};
};
};
Expand Down
1 change: 1 addition & 0 deletions arch/arm/boot/dts/overlays/vc4-kms-v3d-overlay.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,5 +118,6 @@
__overrides__ {
audio = <0>,"!13", <0>,"=14";
noaudio = <0>,"=13", <0>,"!14";
nocomposite = <0>, "!11";
};
};
3 changes: 2 additions & 1 deletion arch/arm64/boot/dts/broadcom/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-2-b.dtb
dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-3-b.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-2-b.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2711-rpi-4-b.dtb \
bcm2711-rpi-cm4.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-3-b-plus.dtb
dtb-$(CONFIG_ARCH_BCM2709) += bcm2710-rpi-cm3.dtb
dtb-$(CONFIG_ARCH_BCM2835) += bcm2710-rpi-cm3.dtb
Expand Down
1 change: 1 addition & 0 deletions arch/arm64/boot/dts/broadcom/bcm2711-rpi-cm4.dts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
#include "../../../../arm/boot/dts/bcm2711-rpi-cm4.dts"
1 change: 1 addition & 0 deletions drivers/gpu/drm/vc4/vc4_drv.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ static void vc4_match_add_drivers(struct device *dev,

const struct of_device_id vc4_dma_range_matches[] = {
{ .compatible = "brcm,bcm2835-hvs" },
{ .compatible = "brcm,bcm2711-hvs" },
{ .compatible = "raspberrypi,rpi-firmware-kms" },
{ .compatible = "brcm,bcm2835-v3d" },
{ .compatible = "brcm,cygnus-v3d" },
Expand Down