From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 83696BA45 for ; Tue, 7 Mar 2023 18:00:27 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6CADCC4339B; Tue, 7 Mar 2023 18:00:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678212027; bh=wZWe1jOZeErmH1UTx09zfyqg1fmC4QstP/qA8sk0rBY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Q0w58+Cynm90kPBiYQRL9yeoeKM5DOr45kapLTs9XOQ86PhyOh5vwWzg9T02vBpjz 4xugEOXl4chgHf+r8NPY3GTt2W6kvPZ6cUXQTwV0FN0fvzXNucIlVVIpSzF48g669s kx1DUq/H74NjEONv3sDRzEybc0qFx1gThc7OAdnI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Neil Armstrong , Sasha Levin Subject: [PATCH 6.1 054/885] arm64: dts: amlogic: meson-gx: add missing SCPI sensors compatible Date: Tue, 7 Mar 2023 17:49:48 +0100 Message-Id: <20230307170004.080213291@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170001.594919529@linuxfoundation.org> References: <20230307170001.594919529@linuxfoundation.org> User-Agent: quilt/0.67 Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit From: Neil Armstrong [ 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 Signed-off-by: Sasha Levin --- arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi index 3885eccf6da42..6cc685f91fc94 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -161,7 +161,7 @@ scpi_dvfs: clocks-0 { }; scpi_sensors: sensors { - compatible = "amlogic,meson-gxbb-scpi-sensors"; + compatible = "amlogic,meson-gxbb-scpi-sensors", "arm,scpi-sensors"; #thermal-sensor-cells = <1>; }; }; -- 2.39.2