From c3d3a14f49c9caaa69a02aac09a4cd51432e47d7 Mon Sep 17 00:00:00 2001 From: Sugar Zhang Date: Tue, 21 Feb 2023 00:01:23 +0800 Subject: [PATCH] arm64: dts: rockchip: rk3588: Use mclkout_i2sx for devices replace.sh #!/bin/sh grep -lr "$1" | xargs sed -i "s/$1/$2/g" e.g. ./replace.sh "cru I2S1_8CH_MCLKOUT" "mclkout_i2s1" Signed-off-by: Sugar Zhang Change-Id: I742c35e23a54facb90cde8f9d0d2b935be69152b --- arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-h0.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi | 8 ++++---- arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi | 4 ++-- .../boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi | 2 +- arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi | 4 ++-- arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi | 4 ++-- 16 files changed, 32 insertions(+), 32 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi index 813a8e2f1fd1..431a5bbdb641 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb1-lp4.dtsi @@ -501,9 +501,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi index 37d7bdfe5706..1d0ef3c5178c 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb2-lp4.dtsi @@ -336,9 +336,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi index 3b08bb998fe9..4213e54ab0b7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb3-lp5.dtsi @@ -994,9 +994,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi index 4faf8ada7a43..69a328b2c8d7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-evb7-lp4.dtsi @@ -571,9 +571,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-h0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-h0.dtsi index bf8fd852d028..ecbc0b5718bc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-h0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-h0.dtsi @@ -648,9 +648,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi index 02c4202b3d52..5c345b2cde2d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-nvr-demo.dtsi @@ -355,9 +355,9 @@ adc-volume = <0xbf>; /* 0dB */ dac-volume = <0xbf>; /* 0dB */ aec-mode = "adc left, adc right"; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi index 9f8768cec79e..1dbb39cd381e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-edp-x0.dtsi @@ -527,9 +527,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi index ea8cab776e77..812f7b113cf5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-toybrick-x0.dtsi @@ -521,9 +521,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi index 7c5bc3ea7e05..166bcd049890 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588-vehicle-evb.dtsi @@ -375,9 +375,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi index 2396a91d06a1..68f17eec6956 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb1-lp4x.dtsi @@ -309,9 +309,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; @@ -322,9 +322,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8326"; reg = <0x18>; - clocks = <&cru I2S1_8CH_MCLKOUT>; + clocks = <&mclkout_i2s1>; clock-names = "mclk"; - assigned-clocks = <&cru I2S1_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s1>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s1m0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi index 263bdfe3bd70..d2a17c411b8d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb2-lp5.dtsi @@ -823,9 +823,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi index d61d365c80dc..ee707d4820fc 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb4-lp4x.dtsi @@ -465,7 +465,7 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi index a9e68fe49ee8..4e0cc72ff2ac 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-evb8-lp4x.dtsi @@ -353,9 +353,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi index 4357661eac4c..5799b980d15e 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-rk806-single.dtsi @@ -1205,7 +1205,7 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi index 71d24d238f81..b9a9ef526170 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet-single.dtsi @@ -528,9 +528,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>; diff --git a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi index 21c5e721d4cc..e8652e4f0639 100644 --- a/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3588s-tablet.dtsi @@ -460,9 +460,9 @@ #sound-dai-cells = <0>; compatible = "everest,es8388", "everest,es8323"; reg = <0x11>; - clocks = <&cru I2S0_8CH_MCLKOUT>; + clocks = <&mclkout_i2s0>; clock-names = "mclk"; - assigned-clocks = <&cru I2S0_8CH_MCLKOUT>; + assigned-clocks = <&mclkout_i2s0>; assigned-clock-rates = <12288000>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_mclk>;