Skip to contentSkip to conversation

ARM: dts: rockchip: Remove bogus 'i2s_clk_out' from rk3288-veyron-mickey

PATCH In review Douglas Anderson 3 participants 3 messages May 3, 2019 – May 7, 2019

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 ARM: dts: rockchip: Remove bogus 'i2s_clk_out' from rk3288-veyron-mickey

The rk3288-veyron-mickey device tree overrides the default "i2s" clock settings to add the clock for "i2s_clk_out".

That clock is only present in the bindings downstream Chrome OS 3.14 tree. Upstream the i2s port bindings doesn't specify that as a possible clock.

Let's remove it.

NOTE: for other rk3288-veyron devices this clock is consumed by 'maxim,max98090'. Presumably if this clock is needed for mickey it'll need to be consumed by something similar.

---

 arch/arm/boot/dts/rk3288-veyron-mickey.dts | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/rk3288-veyron-mickey.dts +0 -2
index e852594417b5..f9c4ece3c0d3 100644
@@ -142,8 +142,6 @@
 
 &i2s {
 	status = "okay";
-	clock-names = "i2s_hclk", "i2s_clk", "i2s_clk_out";
-	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
 };
 
 &rk808 {
Signature · 1 line
2.21.0.1020.gf2820cf01a-goog
Reviewed-by on v1 1/1
#1 lore raw
Quoted 24 lines · Douglas Anderson

The rk3288-veyron-mickey device tree overrides the default "i2s" clock settings to add the clock for "i2s_clk_out".

That clock is only present in the bindings downstream Chrome OS 3.14 tree. Upstream the i2s port bindings doesn't specify that as a possible clock.

Let's remove it.

NOTE: for other rk3288-veyron devices this clock is consumed by 'maxim,max98090'. Presumably if this clock is needed for mickey it'll need to be consumed by something similar.

---

 arch/arm/boot/dts/rk3288-veyron-mickey.dts | 2 --
 1 file changed, 2 deletions(-)
arch/arm/boot/dts/rk3288-veyron-mickey.dts +0 -0
index e852594417b5..f9c4ece3c0d3 100644

arch/arm/boot/dts/rk3288-veyron-mickey.dts line 147

Quoted 8 lines
arch/arm/boot/dts/rk3288-veyron-mickey.dts +0 -2
@@ -142,8 +142,6 @@
 
 &i2s {
 	status = "okay";
-	clock-names = "i2s_hclk", "i2s_clk", "i2s_clk_out";
-	clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>, <&cru SCLK_I2S0_OUT>;
 };
 
 &rk808 {

effectively, 'i2s_clk_out' is not use in the upstream kernel.

maintainer
#2 lore raw
In reply to Douglas Anderson

Am Samstag, 4. Mai 2019, 01:48:14 CEST schrieb Douglas Anderson:

Quoted 7 lines

The rk3288-veyron-mickey device tree overrides the default "i2s" clock settings to add the clock for "i2s_clk_out".

That clock is only present in the bindings downstream Chrome OS 3.14 tree. Upstream the i2s port bindings doesn't specify that as a possible clock.

Quoted 7 lines

Let's remove it.

NOTE: for other rk3288-veyron devices this clock is consumed by 'maxim,max98090'. Presumably if this clock is needed for mickey it'll need to be consumed by something similar.

applied for 5.3 with Matthias' rb.

Thanks
Heiko