UPSTREAM: ARM: dts: rockchip: swap i2s clock ordering on rk3036
authorHeiko Stuebner <heiko@sntech.de>
Sat, 9 Jan 2016 02:18:51 +0000 (03:18 +0100)
committerCaesar Wang <wxt@rock-chips.com>
Tue, 31 May 2016 08:43:20 +0000 (16:43 +0800)
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.

Change-Id: Ie3db65056547acefb9b2bb7b8c2459eb59f51e56
Reported-by: Caesar Wang <wxt@rock-chips.com>
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Caesar Wang <wxt@rock-chips.com>
(cherry picked from git.kernel.org next/linux-next.git master
 commit 3860aa1ccfe01adb6c3fd09e880d812ceb408e5c)

arch/arm/boot/dts/rk3036.dtsi

index 8f1bb0fbf768df2bb562f62beb7236f255c440cc..ee457a2e997e5e3f7f948950e598a6afd2ffc0c9 100644 (file)
                interrupts = <GIC_SPI 51 IRQ_TYPE_LEVEL_HIGH>;
                #address-cells = <1>;
                #size-cells = <0>;
-               clock-names = "i2s_hclk", "i2s_clk";
-               clocks = <&cru HCLK_I2S>, <&cru SCLK_I2S>;
+               clock-names = "i2s_clk", "i2s_hclk";
+               clocks = <&cru SCLK_I2S>, <&cru HCLK_I2S>;
                dmas = <&pdma 0>, <&pdma 1>;
                dma-names = "tx", "rx";
                pinctrl-names = "default";