Takashi Iwai aedbe0
From a8ab2e5e943c86c019ccd4ba3f56d4722c393b3e Mon Sep 17 00:00:00 2001
Takashi Iwai aedbe0
From: Vinod Koul <vkoul@kernel.org>
Takashi Iwai aedbe0
Date: Mon, 8 Mar 2021 11:38:16 +0530
Takashi Iwai aedbe0
Subject: [PATCH] arm64: dts: qcom: msm8994: don't use underscore in node name
Takashi Iwai aedbe0
Git-commit: 8c678beca7ed3fa8a2c6d86f6603bc23400f9ad8
Takashi Iwai aedbe0
Patch-mainline: v5.15-rc1
Takashi Iwai aedbe0
References: stable-5.14.6
Takashi Iwai aedbe0
Takashi Iwai aedbe0
[ Upstream commit 8c678beca7ed3fa8a2c6d86f6603bc23400f9ad8 ]
Takashi Iwai aedbe0
Takashi Iwai aedbe0
We have underscore (_) in node name leading to warning:
Takashi Iwai aedbe0
Arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dt.yaml: clocks: xo_board: {'type': 'object'} is not allowed for {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[19200000]], 'phandle': [[26]]}
Takashi Iwai aedbe0
Arch/arm64/boot/dts/qcom/msm8994-msft-lumia-octagon-cityman.dt.yaml: clocks: sleep_clk: {'type': 'object'} is not allowed for {'compatible': ['fixed-clock'], '#clock-cells': [[0]], 'clock-frequency': [[32768]]}
Takashi Iwai aedbe0
Takashi Iwai aedbe0
Fix this by changing node name to use dash (-)
Takashi Iwai aedbe0
Takashi Iwai aedbe0
Signed-off-by: Vinod Koul <vkoul@kernel.org>
Takashi Iwai aedbe0
Link: https://lore.kernel.org/r/20210308060826.3074234-9-vkoul@kernel.org
Takashi Iwai aedbe0
[bjorn: Added clock-output-names to satisfy parent_names]
Takashi Iwai aedbe0
Signed-off-by: Bjorn Andersson <bjorn.andersson@linaro.org>
Takashi Iwai aedbe0
Signed-off-by: Sasha Levin <sashal@kernel.org>
Takashi Iwai aedbe0
Acked-by: Takashi Iwai <tiwai@suse.de>
Takashi Iwai aedbe0
Takashi Iwai aedbe0
---
Takashi Iwai aedbe0
 arch/arm64/boot/dts/qcom/msm8994.dtsi | 6 ++++--
Takashi Iwai aedbe0
 1 file changed, 4 insertions(+), 2 deletions(-)
Takashi Iwai aedbe0
Takashi Iwai aedbe0
diff --git a/arch/arm64/boot/dts/qcom/msm8994.dtsi b/arch/arm64/boot/dts/qcom/msm8994.dtsi
Takashi Iwai aedbe0
index f9f0b5aa6a26..87a3217e88ef 100644
Takashi Iwai aedbe0
--- a/arch/arm64/boot/dts/qcom/msm8994.dtsi
Takashi Iwai aedbe0
+++ b/arch/arm64/boot/dts/qcom/msm8994.dtsi
Takashi Iwai aedbe0
@@ -15,16 +15,18 @@ / {
Takashi Iwai aedbe0
 	chosen { };
Takashi Iwai aedbe0
 
Takashi Iwai aedbe0
 	clocks {
Takashi Iwai aedbe0
-		xo_board: xo_board {
Takashi Iwai aedbe0
+		xo_board: xo-board {
Takashi Iwai aedbe0
 			compatible = "fixed-clock";
Takashi Iwai aedbe0
 			#clock-cells = <0>;
Takashi Iwai aedbe0
 			clock-frequency = <19200000>;
Takashi Iwai aedbe0
+			clock-output-names = "xo_board";
Takashi Iwai aedbe0
 		};
Takashi Iwai aedbe0
 
Takashi Iwai aedbe0
-		sleep_clk: sleep_clk {
Takashi Iwai aedbe0
+		sleep_clk: sleep-clk {
Takashi Iwai aedbe0
 			compatible = "fixed-clock";
Takashi Iwai aedbe0
 			#clock-cells = <0>;
Takashi Iwai aedbe0
 			clock-frequency = <32768>;
Takashi Iwai aedbe0
+			clock-output-names = "sleep_clk";
Takashi Iwai aedbe0
 		};
Takashi Iwai aedbe0
 	};
Takashi Iwai aedbe0
 
Takashi Iwai aedbe0
-- 
Takashi Iwai aedbe0
2.26.2
Takashi Iwai aedbe0