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 CFFF0BA32 for ; Tue, 7 Mar 2023 17:09:35 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 33608C433EF; Tue, 7 Mar 2023 17:09:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1678208975; bh=TOCk5TqdSo3iu+xG25060p4XTUvLUuDhux4eA5lftIY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wFSBxi7rFJQPxfY1Wpap0EaDk9dU4CRwtSKmk8NYnHeeybUBZT0kx7KS1KEVieEmU qlusFnumU7S2WQIMcoWACqnf03nUOI6cqISX0hEsz6pDLEOClc2DkWILUc7+DgjZpT 7qHXwx5Kby7p4Hp+wtU6rmHBrOmEFwHXcSqirR60= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Neil Armstrong , Sasha Levin Subject: [PATCH 6.2 0071/1001] arm64: dts: amlogic: meson-gx: add missing SCPI sensors compatible Date: Tue, 7 Mar 2023 17:47:23 +0100 Message-Id: <20230307170025.157529660@linuxfoundation.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230307170022.094103862@linuxfoundation.org> References: <20230307170022.094103862@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 c87df0b2dfdea..ff2b33313e637 100644 --- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi +++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi @@ -162,7 +162,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