summaryrefslogtreecommitdiff
path: root/arch/arm64/boot/dts/freescale/imx8mn.dtsi
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-08 11:09:27 +0300
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2021-02-08 11:09:27 +0300
commitd8c849037d9398abe6a5f5d065eafc777eb3bdaf (patch)
tree2ebe56d73c84619214ee9e131c586ad98b817e81 /arch/arm64/boot/dts/freescale/imx8mn.dtsi
parent8cf9045b91382df9fb1eb420daa4d1c2697d2f44 (diff)
parent92bf22614b21a2706f4993b278017e437f7785b3 (diff)
downloadlinux-d8c849037d9398abe6a5f5d065eafc777eb3bdaf.tar.xz
Merge 5.11-rc7 into usb-next
We need the USB fixes in here as well. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm64/boot/dts/freescale/imx8mn.dtsi')
-rw-r--r--arch/arm64/boot/dts/freescale/imx8mn.dtsi2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm64/boot/dts/freescale/imx8mn.dtsi b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
index ee1790230490..2a79e89f821e 100644
--- a/arch/arm64/boot/dts/freescale/imx8mn.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mn.dtsi
@@ -253,7 +253,7 @@
#size-cells = <1>;
ranges;
- spba: bus@30000000 {
+ spba: spba-bus@30000000 {
compatible = "fsl,spba-bus", "simple-bus";
#address-cells = <1>;
#size-cells = <1>;