arm64: dts: mediatek: mt8173-elm: Fix bluetooth node name and reorder

Change the node name for Marvell SD8897 SDIO Bluetooth from
`btmrvl@2` to `bluetooth@2` to fix a dtbs_check warning.

While at it, also change the WiFi one from `mwifiex@1" to a
generic "wifi@1" and reorder the nodes so that wifi@1 comes
before bluetooth@2.

Reviewed-by: Chen-Yu Tsai <wenst@chromium.org>
Signed-off-by: AngeloGioacchino Del Regno <angelogioacchino.delregno@collabora.com>

diff --git a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
index 9ec930058b92ce4edb569aad81d97ddd341f67ac..59813fff7833d64e95473fb3ba7503341cd77e4d 100644 (file)
--- a/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
+++ b/arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi
@@ -432,20 +432,20 @@
        #address-cells = <1>;
        #size-cells = <0>;
 
-       btmrvl: btmrvl@2 {
+       mwifiex: wifi@1 {
+               compatible = "marvell,sd8897";
+               reg = <1>;
+               interrupts-extended = <&pio 38 IRQ_TYPE_LEVEL_LOW>;
+               marvell,wakeup-pin = <3>;
+       };
+
+       btmrvl: bluetooth@2 {
                compatible = "marvell,sd8897-bt";
                reg = <2>;
                interrupts-extended = <&pio 119 IRQ_TYPE_LEVEL_LOW>;
                marvell,wakeup-pin = /bits/ 16 <0x0d>;
                marvell,wakeup-gap-ms = /bits/ 16 <0x64>;
        };
-
-       mwifiex: mwifiex@1 {
-               compatible = "marvell,sd8897";
-               reg = <1>;
-               interrupts-extended = <&pio 38 IRQ_TYPE_LEVEL_LOW>;
-               marvell,wakeup-pin = <3>;
-       };
 };
 
 &nor_flash {