From: Xing Zheng Date: Wed, 30 Mar 2016 06:29:54 +0000 (+0800) Subject: ARM64: dts: rk3399: fix enable incorrect HCLK_I2Sx when startup X-Git-Tag: firefly_0821_release~2941 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=fb8302a25224cb12398b77c88100b9806a678a77;p=firefly-linux-kernel-4.4.55.git ARM64: dts: rk3399: fix enable incorrect HCLK_I2Sx when startup This patch like below: ---- commit 3860aa1ccfe01adb6c3fd09e880d812ceb408e5c Author: Heiko Stuebner Date: Sat Jan 9 03:18:51 2016 +0100 ARM: dts: rockchip: swap i2s clock ordering on rk3036 For sound setups using the simple-card mechanism, the main clock (sysclk) is expected to be the first element. For the i2s-driver itself it doesn't matter, as it uses named clocks, so we can just swap them. ---- If we set HCLK_I2Sx at first, rockchip_i2s_set_sysclk will set the HCLK_I2S freq (from example is 100MHz) to set the i2s_div, it is incorrect. Change-Id: I2b424ded3845b8ccd3ef233e43c5f9f915544547 Signed-off-by: Xing Zheng --- diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 6b9d4959d6f0..2defa2b7e490 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -917,8 +917,8 @@ interrupts = ; dmas = <&dmac_bus 7>; dma-names = "tx"; - clock-names = "hclk", "mclk"; - clocks = <&cru HCLK_SPDIF>, <&cru SCLK_SPDIF_8CH>; + clock-names = "mclk", "hclk"; + clocks = <&cru SCLK_SPDIF_8CH>, <&cru HCLK_SPDIF>; pinctrl-names = "default"; pinctrl-0 = <&spdif_bus>; status = "disabled"; @@ -932,8 +932,8 @@ #size-cells = <0>; dmas = <&dmac_bus 0>, <&dmac_bus 1>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S0_8CH>, <&cru SCLK_I2S0_8CH>; + clock-names = "i2s_clk", "i2s_hclk"; + clocks = <&cru SCLK_I2S0_8CH>, <&cru HCLK_I2S0_8CH>; pinctrl-names = "default"; pinctrl-0 = <&i2s0_8ch_bus>; status = "disabled"; @@ -947,8 +947,8 @@ #size-cells = <0>; dmas = <&dmac_bus 2>, <&dmac_bus 3>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S1_8CH>, <&cru SCLK_I2S1_8CH>; + clock-names = "i2s_clk", "i2s_hclk"; + clocks = <&cru SCLK_I2S1_8CH>, <&cru HCLK_I2S1_8CH>; pinctrl-names = "default"; pinctrl-0 = <&i2s1_2ch_bus>; status = "disabled"; @@ -962,8 +962,8 @@ #size-cells = <0>; dmas = <&dmac_bus 4>, <&dmac_bus 5>; dma-names = "tx", "rx"; - clock-names = "i2s_hclk", "i2s_clk"; - clocks = <&cru HCLK_I2S2_8CH>, <&cru SCLK_I2S2_8CH>; + clock-names = "i2s_clk", "i2s_hclk"; + clocks = <&cru SCLK_I2S2_8CH>, <&cru HCLK_I2S2_8CH>; status = "disabled"; };