Merge tag 'v6.9-rockchip-dts64-2' of git://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-microblaze.git] / arch / arm64 / boot / dts / rockchip / rk356x.dtsi

diff --git a/arch/arm64/boot/dts/rockchip/rk356x.dtsi b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
index c19c0f1..92f96ec 100644 (file)
--- a/arch/arm64/boot/dts/rockchip/rk356x.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk356x.dtsi
@@ -597,6 +597,7 @@
                compatible = "rockchip,rk3568-vpu";
                reg = <0x0 0xfdea0000 0x0 0x800>;
                interrupts = <GIC_SPI 139 IRQ_TYPE_LEVEL_HIGH>;
+               interrupt-names = "vdpu";
                clocks = <&cru ACLK_VPU>, <&cru HCLK_VPU>;
                clock-names = "aclk", "hclk";
                iommus = <&vdpu_mmu>;
@@ -1123,7 +1124,7 @@
                dmas = <&dmac1 4>, <&dmac1 5>;
                dma-names = "tx", "rx";
                resets = <&cru SRST_M_I2S2_2CH>;
-               reset-names = "m";
+               reset-names = "tx-m";
                rockchip,grf = <&grf>;
                pinctrl-names = "default";
                pinctrl-0 = <&i2s2m0_sclktx