mips: dts: ingenic: Remove unnecessary AIC clocks

The "ext" and "pll half" clocks don't belong in the DT. They are
not consumed directly by the AIC and are only used as the parent
clocks of the "i2s" clock. An operating system should be able to
figure out that information itself because it presumably knows the
layout of the clock tree.

Removing these from the DT should be safe from a compatibility
point of view because the jz4740-i2s driver in Linux does not, and
never did depend on them.

Signed-off-by: Aidan MacDonald <aidanmacdonald.0x0@gmail.com>
Link: https://lore.kernel.org/all/20221028103418.17578-1-aidanmacdonald.0x0@gmail.com/
Reviewed-by: Paul Cercueil <paul@crapouillou.net>
Signed-off-by: Thomas Bogendoerfer <tsbogend@alpha.franken.de>

diff --git a/arch/mips/boot/dts/ingenic/jz4725b.dtsi b/arch/mips/boot/dts/ingenic/jz4725b.dtsi
index e9e48022f6316fcfec89307e36ad433a0b5a2414..acbbe8c4664c110e9f978c4555ab8c814e3482f7 100644 (file)
--- a/arch/mips/boot/dts/ingenic/jz4725b.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4725b.dtsi
@@ -198,11 +198,8 @@
 
                #sound-dai-cells = <0>;
 
-               clocks = <&cgu JZ4725B_CLK_AIC>,
-                        <&cgu JZ4725B_CLK_I2S>,
-                        <&cgu JZ4725B_CLK_EXT>,
-                        <&cgu JZ4725B_CLK_PLL_HALF>;
-               clock-names = "aic", "i2s", "ext", "pll half";
+               clocks = <&cgu JZ4725B_CLK_AIC>, <&cgu JZ4725B_CLK_I2S>;
+               clock-names = "aic", "i2s";
 
                interrupt-parent = <&intc>;
                interrupts = <10>;

diff --git a/arch/mips/boot/dts/ingenic/jz4740.dtsi b/arch/mips/boot/dts/ingenic/jz4740.dtsi
index 7f76cba03a089bcc7e241fa7a048f808d50042fc..bdd6f4d82ec93a855b5a6a059098783ec3fcfd7c 100644 (file)
--- a/arch/mips/boot/dts/ingenic/jz4740.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4740.dtsi
@@ -192,11 +192,8 @@
                interrupt-parent = <&intc>;
                interrupts = <18>;
 
-               clocks = <&cgu JZ4740_CLK_AIC>,
-                        <&cgu JZ4740_CLK_I2S>,
-                        <&cgu JZ4740_CLK_EXT>,
-                        <&cgu JZ4740_CLK_PLL_HALF>;
-               clock-names = "aic", "i2s", "ext", "pll half";
+               clocks = <&cgu JZ4740_CLK_AIC>, <&cgu JZ4740_CLK_I2S>;
+               clock-names = "aic", "i2s";
 
                dmas = <&dmac 25 0xffffffff>, <&dmac 24 0xffffffff>;
                dma-names = "rx", "tx";

diff --git a/arch/mips/boot/dts/ingenic/jz4770.dtsi b/arch/mips/boot/dts/ingenic/jz4770.dtsi
index bda0a3a86ed5f30ddfb414b973fc1a30517e4c2f..9c0099919db7aba9b231fcc6722a0c06df0091ce 100644 (file)
--- a/arch/mips/boot/dts/ingenic/jz4770.dtsi
+++ b/arch/mips/boot/dts/ingenic/jz4770.dtsi
@@ -238,9 +238,8 @@
 
                #sound-dai-cells = <0>;
 
-               clocks = <&cgu JZ4770_CLK_AIC>, <&cgu JZ4770_CLK_I2S>,
-                        <&cgu JZ4770_CLK_EXT>, <&cgu JZ4770_CLK_PLL0>;
-               clock-names = "aic", "i2s", "ext", "pll half";
+               clocks = <&cgu JZ4770_CLK_AIC>, <&cgu JZ4770_CLK_I2S>;
+               clock-names = "aic", "i2s";
 
                interrupt-parent = <&intc>;
                interrupts = <34>;