summaryrefslogtreecommitdiffstats
path: root/arch/arm/boot
diff options
context:
space:
mode:
authorHeiko Stuebner <heiko@sntech.de>2016-01-09 03:18:51 +0100
committerHeiko Stuebner <heiko@sntech.de>2016-01-24 23:28:23 +0100
commit3860aa1ccfe01adb6c3fd09e880d812ceb408e5c (patch)
tree0e34d1dae1c24899e6af8db55417741629aa1d70 /arch/arm/boot
parentARM: dts: rockchip: set the pinctrl default setting for rk3036 i2s (diff)
downloadlinux-3860aa1ccfe01adb6c3fd09e880d812ceb408e5c.tar.xz
linux-3860aa1ccfe01adb6c3fd09e880d812ceb408e5c.zip
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. Reported-by: Caesar Wang <wxt@rock-chips.com> Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Diffstat (limited to 'arch/arm/boot')
-rw-r--r--arch/arm/boot/dts/rk3036.dtsi4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/boot/dts/rk3036.dtsi b/arch/arm/boot/dts/rk3036.dtsi
index 8f1bb0fbf768..ee457a2e997e 100644
--- a/arch/arm/boot/dts/rk3036.dtsi
+++ b/arch/arm/boot/dts/rk3036.dtsi
@@ -241,8 +241,8 @@
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";