]> git.baikalelectronics.ru Git - kernel.git/commitdiff
arm64: dts: amlogic: meson-gx: add missing SCPI sensors compatible
authorNeil Armstrong <neil.armstrong@linaro.org>
Tue, 24 Jan 2023 10:34:24 +0000 (11:34 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 11 Mar 2023 15:43:33 +0000 (16:43 +0100)
[ Upstream commit 2ff650051493d5bdb6dd09d4c2850bb37db6be31 ]

Fixes:
scpi: sensors:compatible: 'oneOf' conditional failed, one must be fixed:
['amlogic,meson-gxbb-scpi-sensors'] is too short
'arm,scpi-sensors' was expected

Link: https://lore.kernel.org/r/20230124-b4-amlogic-bindings-fixups-v1-3-44351528957e@linaro.org
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
arch/arm64/boot/dts/amlogic/meson-axg.dtsi

index 7b2be0942c3bb9563ddcea7b34f8b3b296165f7b..72255898081c87a555c953c67396d170b37202d8 100644 (file)
                };
 
                scpi_sensors: sensors {
-                       compatible = "amlogic,meson-gxbb-scpi-sensors";
+                       compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors";
                        #thermal-sensor-cells = <1>;
                };
        };