| Message ID | 20190503234814.230901-1-dianders@chromium.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | ARM: dts: rockchip: Remove bogus 'i2s_clk_out' from rk3288-veyron-mickey | expand |
On Fri, May 03, 2019 at 04:48:14PM -0700, Douglas Anderson wrote: > 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. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> > --- > > arch/arm/boot/dts/rk3288-veyron-mickey.dts | 2 -- > 1 file changed, 2 deletions(-) > > diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts > index e852594417b5..f9c4ece3c0d3 100644 > --- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts > +++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts > @@ -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. Reviewed-by: Matthias Kaehlcke <mka@chromium.org>
Am Samstag, 4. Mai 2019, 01:48:14 CEST schrieb 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. > > Signed-off-by: Douglas Anderson <dianders@chromium.org> applied for 5.3 with Matthias' rb. Thanks Heiko
diff --git a/arch/arm/boot/dts/rk3288-veyron-mickey.dts b/arch/arm/boot/dts/rk3288-veyron-mickey.dts index e852594417b5..f9c4ece3c0d3 100644 --- a/arch/arm/boot/dts/rk3288-veyron-mickey.dts +++ b/arch/arm/boot/dts/rk3288-veyron-mickey.dts @@ -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 {
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. Signed-off-by: Douglas Anderson <dianders@chromium.org> --- arch/arm/boot/dts/rk3288-veyron-mickey.dts | 2 -- 1 file changed, 2 deletions(-)