8f9e91ad03
These patches were generated from: https://github.com/raspberrypi/linux/commits/rpi-6.12.y With the following command: git format-patch -N v6.12.27..HEAD (HEAD -> 8d3206ee456a5ecdf9ddbfd8e5e231e4f0cd716e) Exceptions: - (def)configs patches - github workflows patches - applied & reverted patches - readme patches - wireless patches Signed-off-by: Álvaro Fernández Rojas <noltari@gmail.com>
59 lines
1.7 KiB
Diff
59 lines
1.7 KiB
Diff
From 46a7177e800c6261617e0cdc88756d5e8c9cb957 Mon Sep 17 00:00:00 2001
|
|
From: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
Date: Tue, 14 Jan 2025 16:51:24 +0000
|
|
Subject: [PATCH] dts: bcm2712: Fixup HEVC decoder nodes for new driver.
|
|
|
|
Signed-off-by: Dave Stevenson <dave.stevenson@raspberrypi.com>
|
|
---
|
|
arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi | 5 ++---
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 4 ----
|
|
arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi | 4 ----
|
|
3 files changed, 2 insertions(+), 11 deletions(-)
|
|
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-ds.dtsi
|
|
@@ -552,8 +552,8 @@
|
|
status = "disabled";
|
|
};
|
|
|
|
- rpivid: codec@800000 {
|
|
- compatible = "raspberrypi,rpivid-vid-decoder";
|
|
+ hevc_dec: codec@800000 {
|
|
+ compatible = "brcm,bcm2712-hevc-dec", "raspberrypi,hevc-dec";
|
|
reg = <0x10 0x00800000 0x0 0x10000>, /* HEVC */
|
|
<0x10 0x00840000 0x0 0x1000>; /* INTC */
|
|
reg-names = "hevc",
|
|
@@ -564,7 +564,6 @@
|
|
clocks = <&firmware_clocks 11>;
|
|
clock-names = "hevc";
|
|
iommus = <&iommu2>;
|
|
- status = "disabled";
|
|
};
|
|
|
|
pisp_be: pisp_be@880000 {
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts
|
|
@@ -445,10 +445,6 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_g
|
|
};
|
|
};
|
|
|
|
-&rpivid {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&pinctrl {
|
|
spi10_gpio2: spi10_gpio2 {
|
|
function = "vc_spi0";
|
|
--- a/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
+++ b/arch/arm64/boot/dts/broadcom/bcm2712-rpi-cm5.dtsi
|
|
@@ -426,10 +426,6 @@ dpi_16bit_gpio2: &rp1_dpi_16bit_g
|
|
};
|
|
};
|
|
|
|
-&rpivid {
|
|
- status = "okay";
|
|
-};
|
|
-
|
|
&pinctrl {
|
|
spi10_gpio2: spi10_gpio2 {
|
|
function = "vc_spi0";
|