Skip to content

Commit 204637e

Browse files
committed
Merge tag 'v5.18-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux into arm/dt
Delete no longer needed properties of MediaTek Larbs for MT2701. * tag 'v5.18-next-dts32' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux: arm: dts: mediatek: Get rid of mediatek, larb for MM nodes Link: https://lore.kernel.org/r/[email protected] This concludes a cleanup that was started back in 2019, with an incompatible DT binding change. Kernels before 5.18 can no longer use the updated dtb from 5.19, and the drivers no longer parse the old properties, which breaks compatibility with older dtb files. Link: https://lore.kernel.org/lkml/[email protected]/ Signed-off-by: Arnd Bergmann <[email protected]>
2 parents 8f311c0 + a044e6a commit 204637e

File tree

2 files changed

+0
-7
lines changed

2 files changed

+0
-7
lines changed

arch/arm/boot/dts/mt2701.dtsi

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -564,7 +564,6 @@
564564
clock-names = "jpgdec-smi",
565565
"jpgdec";
566566
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
567-
mediatek,larb = <&larb2>;
568567
iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,
569568
<&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;
570569
};
@@ -577,7 +576,6 @@
577576
clocks = <&imgsys CLK_IMG_VENC>;
578577
clock-names = "jpgenc";
579578
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
580-
mediatek,larb = <&larb2>;
581579
iommus = <&iommu MT2701_M4U_PORT_JPGENC_RDMA>,
582580
<&iommu MT2701_M4U_PORT_JPGENC_BSDMA>;
583581
};

arch/arm/boot/dts/mt7623n.dtsi

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@
121121
clock-names = "jpgdec-smi",
122122
"jpgdec";
123123
power-domains = <&scpsys MT2701_POWER_DOMAIN_ISP>;
124-
mediatek,larb = <&larb2>;
125124
iommus = <&iommu MT2701_M4U_PORT_JPGDEC_WDMA>,
126125
<&iommu MT2701_M4U_PORT_JPGDEC_BSDMA>;
127126
};
@@ -144,7 +143,6 @@
144143
interrupts = <GIC_SPI 153 IRQ_TYPE_LEVEL_LOW>;
145144
clocks = <&mmsys CLK_MM_DISP_OVL>;
146145
iommus = <&iommu MT2701_M4U_PORT_DISP_OVL_0>;
147-
mediatek,larb = <&larb0>;
148146
};
149147

150148
rdma0: rdma@14008000 {
@@ -154,7 +152,6 @@
154152
interrupts = <GIC_SPI 152 IRQ_TYPE_LEVEL_LOW>;
155153
clocks = <&mmsys CLK_MM_DISP_RDMA>;
156154
iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA>;
157-
mediatek,larb = <&larb0>;
158155
};
159156

160157
wdma@14009000 {
@@ -164,7 +161,6 @@
164161
interrupts = <GIC_SPI 154 IRQ_TYPE_LEVEL_LOW>;
165162
clocks = <&mmsys CLK_MM_DISP_WDMA>;
166163
iommus = <&iommu MT2701_M4U_PORT_DISP_WDMA>;
167-
mediatek,larb = <&larb0>;
168164
};
169165

170166
bls: pwm@1400a000 {
@@ -215,7 +211,6 @@
215211
interrupts = <GIC_SPI 164 IRQ_TYPE_LEVEL_LOW>;
216212
clocks = <&mmsys CLK_MM_DISP_RDMA1>;
217213
iommus = <&iommu MT2701_M4U_PORT_DISP_RDMA1>;
218-
mediatek,larb = <&larb0>;
219214
};
220215

221216
dpi0: dpi@14014000 {

0 commit comments

Comments
 (0)