[PATCH 08/13] arm64: dts: amlogic: Unify the compatible property for clk-measure

[Chuan Liu via B4 Relay]

From: Chuan Liu <chuan.liu@xxxxxxxxxxx>

The clk-measure IPs across Amlogic SoCs have minimal differences, so
they can be managed with a unified compatible property.

Signed-off-by: Chuan Liu <chuan.liu@xxxxxxxxxxx>
---
 arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi       | 2 +-
 arch/arm64/boot/dts/amlogic/meson-axg.dtsi        | 2 +-
 arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 2 +-
 arch/arm64/boot/dts/amlogic/meson-gx.dtsi         | 2 +-
 arch/arm64/boot/dts/amlogic/meson-s4.dtsi         | 2 +-
 arch/arm64/boot/dts/amlogic/meson-sm1.dtsi        | 1 -
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
index ab9ebabce171..570cac451d63 100644
--- a/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
+++ b/arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi
@@ -761,7 +761,7 @@ internal_ephy: ethernet_phy@8 {
 			};
 
 			clk_msr: clock-measure@48000 {
-				compatible = "amlogic,c3-clk-measure";
+				compatible = "amlogic,clk-measure";
 				reg = <0x0 0x48000 0x0 0x1c>;
 				clkmsr-reg-v2;
 				clkmsr-indices = <0>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
index d4a4a037e0f6..e939ec6186c6 100644
--- a/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-axg.dtsi
@@ -1858,7 +1858,7 @@ spicc1: spi@15000 {
 			};
 
 			clk_msr: clock-measure@18000 {
-				compatible = "amlogic,meson-axg-clk-measure";
+				compatible = "amlogic,clk-measure";
 				reg = <0x0 0x18000 0x0 0x10>;
 				clkmsr-indices = <0>,
 						 <1>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
index dcc927a9da80..54220f105a4d 100644
--- a/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi
@@ -2385,7 +2385,7 @@ i2c0: i2c@1f000 {
 			};
 
 			clk_msr: clock-measure@18000 {
-				compatible = "amlogic,meson-g12a-clk-measure";
+				compatible = "amlogic,clk-measure";
 				reg = <0x0 0x18000 0x0 0x10>;
 			};
 
diff --git a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
index 4510e3403174..4330a6284873 100644
--- a/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-gx.dtsi
@@ -365,7 +365,7 @@ uart_C: serial@8700 {
 			};
 
 			clock-measure@8758 {
-				compatible = "amlogic,meson-gx-clk-measure";
+				compatible = "amlogic,clk-measure";
 				reg = <0x0 0x8758 0x0 0x10>;
 				clkmsr-indices = <0>,
 						 <1>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
index 21a9fb27ee3f..8df234ad78e8 100644
--- a/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-s4.dtsi
@@ -630,7 +630,7 @@ internal_ephy: ethernet-phy@8 {
 			};
 
 			clk_msr: clock-measure@48000 {
-				compatible = "amlogic,s4-clk-measure";
+				compatible = "amlogic,clk-measure";
 				reg = <0x0 0x48000 0x0 0x1c>;
 				clkmsr-reg-v2;
 				clkmsr-indices = <0>,
diff --git a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
index 8ecf876c73ee..2279237db793 100644
--- a/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
+++ b/arch/arm64/boot/dts/amlogic/meson-sm1.dtsi
@@ -478,7 +478,6 @@ &cecb_AO {
 };
 
 &clk_msr {
-	compatible = "amlogic,meson-sm1-clk-measure";
 	clkmsr-indices = <0>,
 			 <1>,
 			 <2>,

-- 
2.42.0