diff options
| author | Mark Brown <broonie@kernel.org> | 2026-10-01 15:00:16 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2026-10-01 15:00:16 +0100 |
| commit | d7ad64ac81f59eb769ee20eacbd8c3f514e44eac (patch) | |
| tree | 9d45e4ea9b0f9ee23cc93c0bf727101165c3c3e9 /arch/arm/boot | |
| parent | 437e651d5f641b8328ff72818b37b9bd00a29b8b (diff) | |
| parent | 1114bcf748db582a4ca7dcf4efb245b7eef224c7 (diff) | |
| download | linux-next-d7ad64ac81f59eb769ee20eacbd8c3f514e44eac.tar.gz linux-next-d7ad64ac81f59eb769ee20eacbd8c3f514e44eac.zip | |
Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git
# Conflicts:
# drivers/gpu/drm/nouveau/nouveau_connector.c
# drivers/gpu/drm/vc4/vc4_v3d.c
Diffstat (limited to 'arch/arm/boot')
| -rw-r--r-- | arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi index 1e76b290510d..39eea8ce1058 100644 --- a/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi +++ b/arch/arm/boot/dts/broadcom/bcm2835-common.dtsi @@ -139,6 +139,7 @@ compatible = "brcm,bcm2835-v3d"; reg = <0x7ec00000 0x1000>; interrupts = <1 10>; + resets = <&pm BCM2835_RESET_V3D>; }; }; |