From 9de3ed044a1e60352e1b71889f80da4efa43e78c Mon Sep 17 00:00:00 2001
From: Dietmar Muscholik <dietmar.muscholik@seco.com>
Date: Wed, 30 Oct 2024 13:35:57 +0100
Subject: [PATCH] [E39] rename clocks

An attempt to introduce some kind of naming convention for clocks to
prevent name collisions and - idealy - identify them in the debugfs.
---
 arch/arm64/boot/dts/seco/csm-b79.dtsi |  2 +-
 arch/arm64/boot/dts/seco/maury.dtsi   | 18 +++++++++---------
 arch/arm64/boot/dts/seco/mv.dtsi      |  2 +-
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/arch/arm64/boot/dts/seco/csm-b79.dtsi b/arch/arm64/boot/dts/seco/csm-b79.dtsi
index 119ed0fd8665a..f08e3140da27c 100644
--- a/arch/arm64/boot/dts/seco/csm-b79.dtsi
+++ b/arch/arm64/boot/dts/seco/csm-b79.dtsi
@@ -91,7 +91,7 @@
 		reg = <0x18>;
 		#sound-dai-cells = <0>;
 		// pwm clock provided by stm32
-		clocks = <&clk_16m>;
+		clocks = <&clk_i2s_mclk>;
 		clock-names = "mclk";
 		iov-supply = <&reg_1v8_s>;
 		ldoin-supply = <&reg_3v3_aud>;
diff --git a/arch/arm64/boot/dts/seco/maury.dtsi b/arch/arm64/boot/dts/seco/maury.dtsi
index 1fb0b7af9293a..a2090ce5723b2 100644
--- a/arch/arm64/boot/dts/seco/maury.dtsi
+++ b/arch/arm64/boot/dts/seco/maury.dtsi
@@ -128,29 +128,29 @@
 		status = "disabled";
 	};
 
-	// reference clock for edp
-	clk_27m: clock {
+	// reference clock for edp (X1200)
+	clk_edp_ref: clock-osc-27m-edp-ref {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <27000000>;
-		clock-output-names = "clk-27m";
+		clock-output-names = "clk-edp-ref";
 	};
 
-	// clock for usb hub
-	clk_24m: clock {
+	// clock for usb hub (Y1100)
+	clk_usb_xtal: clock-osc-24m-usb-xtal {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
 		clock-frequency = <2400000>;
-		clock-output-names = "clk-24m";
+		clock-output-names = "clk-usb-xtal";
 	};
 
 	// audio mclk
-	clk_16m: clock {
+	clk_i2s_mclk: clock-pwm-16m-i2s-mclk {
 		compatible = "pwm-clock";
 		#clock-cells = <0>;
 		// clock-frequency is not used, but is mandatory
 		clock-frequency = <16000000>; // 16MHz is fixed
-		clock-output-name = "audio-mclk";
+		clock-output-names = "clk-i2s-mclk";
 		pwms = <I2S0_MCLK 63>; // 1 / 16Mhz = 62.5ns
 	};
 
@@ -712,7 +712,7 @@
 		vpll-supply = <&reg_1v8_run>;
 		vcca-supply = <&reg_1v2_run>;
 		vcc-supply = <&reg_1v2_run>;
-		clocks = <&clk_27m>;
+		clocks = <&clk_edp_ref>;
 		clock-names = "refclk";
 		enable-gpio = <EDP_BRG_EN GPIO_ACTIVE_HIGH>;
 		no-hpd;
diff --git a/arch/arm64/boot/dts/seco/mv.dtsi b/arch/arm64/boot/dts/seco/mv.dtsi
index 8ae0a4d38814c..5fc51131bdf72 100644
--- a/arch/arm64/boot/dts/seco/mv.dtsi
+++ b/arch/arm64/boot/dts/seco/mv.dtsi
@@ -180,7 +180,7 @@
 		compatible = "ti,tas2505";
 		reg = <0x18>;
 		#sound-dai-cells = <0>;
-		clocks = <&clk_16m>;
+		clocks = <&clk_i2s_mclk>;
 		clock-names = "mclk";
 		av-supply = <&reg_1p8>;
 		dv-supply = <&reg_1p8>;
-- 
GitLab