Merge tag 'block-5.14-2021-08-07' of git://git.kernel.dk/linux-block

[linux-2.6-microblaze.git] / arch / arm / boot / dts / dra72x.dtsi

diff --git a/arch/arm/boot/dts/dra72x.dtsi b/arch/arm/boot/dts/dra72x.dtsi
index d403acc..9061726 100644 (file)
--- a/arch/arm/boot/dts/dra72x.dtsi
+++ b/arch/arm/boot/dts/dra72x.dtsi
@@ -77,12 +77,12 @@
 };
 
 &mailbox5 {
-       mbox_ipu1_ipc3x: mbox_ipu1_ipc3x {
+       mbox_ipu1_ipc3x: mbox-ipu1-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";
        };
-       mbox_dsp1_ipc3x: mbox_dsp1_ipc3x {
+       mbox_dsp1_ipc3x: mbox-dsp1-ipc3x {
                ti,mbox-tx = <5 2 2>;
                ti,mbox-rx = <1 2 2>;
                status = "disabled";
@@ -90,7 +90,7 @@
 };
 
 &mailbox6 {
-       mbox_ipu2_ipc3x: mbox_ipu2_ipc3x {
+       mbox_ipu2_ipc3x: mbox-ipu2-ipc3x {
                ti,mbox-tx = <6 2 2>;
                ti,mbox-rx = <4 2 2>;
                status = "disabled";
@@ -108,7 +108,3 @@
 &pcie2_rc {
        compatible = "ti,dra726-pcie-rc", "ti,dra7-pcie";
 };
-
-&usb4_tm {
-       status = "disabled";
-};