From 559b8b1524760ad8dc18d52c4415d40ee24d02fc Mon Sep 17 00:00:00 2001 From: Chen-Yu Tsai Date: Thu, 14 May 2026 18:12:52 +0800 Subject: [PATCH] arm64: dts: mediatek: mt8195-cherry: Sort top level nodes correctly The thermistor device nodes were added before the vbus regulator and reserved memory nodes, when they should be after them, based on alphabetical order of the device node _name_. Move them to the correct position. No functional changes intended. Signed-off-by: Chen-Yu Tsai Signed-off-by: AngeloGioacchino Del Regno --- .../boot/dts/mediatek/mt8195-cherry.dtsi | 94 +++++++++---------- 1 file changed, 47 insertions(+), 47 deletions(-) diff --git a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi index 538c46ada32b..ef7afc436aef 100644 --- a/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi +++ b/arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi @@ -149,6 +149,53 @@ ppvar_sys: regulator-ppvar-sys { regulator-boot-on; }; + usb_vbus: regulator-5v0-usb-vbus { + compatible = "regulator-fixed"; + regulator-name = "usb-vbus"; + enable-active-high; + regulator-always-on; + vin-supply = <&pp5000_s5>; + }; + + reserved_memory: reserved-memory { + #address-cells = <2>; + #size-cells = <2>; + ranges; + + scp_mem: memory@50000000 { + compatible = "shared-dma-pool"; + reg = <0 0x50000000 0 0x2900000>; + no-map; + }; + + adsp_mem: memory@60000000 { + compatible = "shared-dma-pool"; + reg = <0 0x60000000 0 0xd80000>; + no-map; + }; + + afe_mem: memory@60d80000 { + compatible = "shared-dma-pool"; + reg = <0 0x60d80000 0 0x100000>; + no-map; + }; + + adsp_device_mem: memory@60e80000 { + compatible = "shared-dma-pool"; + reg = <0 0x60e80000 0 0x280000>; + no-map; + }; + }; + + spk_amplifier: rt1019p { + compatible = "realtek,rt1019p"; + label = "rt1019p"; + #sound-dai-cells = <0>; + pinctrl-names = "default"; + pinctrl-0 = <&rt1019p_pins_default>; + sdb-gpios = <&pio 100 GPIO_ACTIVE_HIGH>; + }; + /* Murata NCP03WF104F05RL */ tboard_thermistor1: thermal-sensor-t1 { compatible = "generic-adc-thermal"; @@ -219,53 +266,6 @@ tboard_thermistor2: thermal-sensor-t2 { 120000 51 125000 44>; }; - - usb_vbus: regulator-5v0-usb-vbus { - compatible = "regulator-fixed"; - regulator-name = "usb-vbus"; - enable-active-high; - regulator-always-on; - vin-supply = <&pp5000_s5>; - }; - - reserved_memory: reserved-memory { - #address-cells = <2>; - #size-cells = <2>; - ranges; - - scp_mem: memory@50000000 { - compatible = "shared-dma-pool"; - reg = <0 0x50000000 0 0x2900000>; - no-map; - }; - - adsp_mem: memory@60000000 { - compatible = "shared-dma-pool"; - reg = <0 0x60000000 0 0xd80000>; - no-map; - }; - - afe_mem: memory@60d80000 { - compatible = "shared-dma-pool"; - reg = <0 0x60d80000 0 0x100000>; - no-map; - }; - - adsp_device_mem: memory@60e80000 { - compatible = "shared-dma-pool"; - reg = <0 0x60e80000 0 0x280000>; - no-map; - }; - }; - - spk_amplifier: rt1019p { - compatible = "realtek,rt1019p"; - label = "rt1019p"; - #sound-dai-cells = <0>; - pinctrl-names = "default"; - pinctrl-0 = <&rt1019p_pins_default>; - sdb-gpios = <&pio 100 GPIO_ACTIVE_HIGH>; - }; }; &adsp {