diff options
| author | Caesar Wang <wxt@rock-chips.com> | 2016-01-15 21:49:49 +0800 |
|---|---|---|
| committer | Leo Wang <leozwang@google.com> | 2016-01-28 00:23:45 +0000 |
| commit | 19754990c409d2fb5e0d4c1fee59a84705d5dc08 (patch) | |
| tree | 05033a557e89d41918d34cba2a8a3eb0c58fb5aa | |
| parent | 830f6e2cb2c0d8318b86f992f396afe583c8b300 (diff) | |
| download | v4.1-19754990c409d2fb5e0d4c1fee59a84705d5dc08.tar.gz | |
FROMLIST: ARM: dts: rockchip: add i2s_clk_out to list of clocks used on rk3036 i2s
The I2S block that it needs to claim that output clock. This also
adds properties to model the relationship between the output clock and
the i2s clock itself, to ensure that the clock muxing is set correctly.
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Bug: 25923642
Patchset: rk3036 kylin bring up with codec device, audio can work.
Conflicts:
arch/arm/boot/dts/rk3036.dtsi
(Note: remove the perious hclk<->sclk,, sync to upstream)
(am from https://patchwork.kernel.org/patch/8040991/)
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
Change-Id: I4617df71b274748d5aa8b0461272ed46ec17400c
| -rw-r--r-- | arch/arm/boot/dts/rk3036-kylin.dts | 7 | ||||
| -rw-r--r-- | arch/arm/boot/dts/rk3036.dtsi | 4 |
2 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/boot/dts/rk3036-kylin.dts b/arch/arm/boot/dts/rk3036-kylin.dts index 0457b3c77ad..97a3444132d 100644 --- a/arch/arm/boot/dts/rk3036-kylin.dts +++ b/arch/arm/boot/dts/rk3036-kylin.dts @@ -335,13 +335,6 @@ }; &i2s0 { - /** - * We shoud override the clocks since sysclk from the first clock - * in simple card. - */ - clock-names = "i2s_clk", "i2s_hclk"; - clocks = <&cru SCLK_I2S>, <&cru HCLK_I2S>; - #sound-dai-cells = <0>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi index 791b22783a8..939d3c51bf8 100644 --- a/arch/arm/boot/dts/rk3036.dtsi +++ b/arch/arm/boot/dts/rk3036.dtsi @@ -337,8 +337,8 @@ #size-cells = <0>; dmas = <&pdma 0>, <&pdma 1>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S>, <&cru SCLK_I2S>; + clock-names = "i2s_clk", "i2s_hclk", "i2s_clk_out"; + clocks = <&cru SCLK_I2S>, <&cru HCLK_I2S>, <&cru SCLK_I2S_OUT>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_bus>; status = "disabled"; |