diff options
author | 2014-10-11 11:34:07 -0700 | |
---|---|---|
committer | 2014-10-11 11:34:07 -0700 | |
commit | 9d93551188069a0a21e664b4bfc89ed4a6df1903 (patch) | |
tree | bcf7334c0e57323a6844b8147ce1c92180fe8cef /Documentation/devicetree/bindings/sound/rockchip-i2s.txt | |
parent | Input: Add Microchip AR1021 i2c touchscreen (diff) | |
parent | Linux 3.17 (diff) | |
download | linux-dev-9d93551188069a0a21e664b4bfc89ed4a6df1903.tar.xz linux-dev-9d93551188069a0a21e664b4bfc89ed4a6df1903.zip |
Merge tag 'v3.17' into next
Synchronize with mainline to bring in changes to Synaptics and i8042
drivers.
Diffstat (limited to 'Documentation/devicetree/bindings/sound/rockchip-i2s.txt')
-rw-r--r-- | Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 6c55fcfe5e1d..9b82c20b306b 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -31,7 +31,7 @@ i2s@ff890000 { #address-cells = <1>; #size-cells = <0>; dmas = <&pdma1 0>, <&pdma1 1>; - dma-names = "rx", "tx"; + dma-names = "tx", "rx"; clock-names = "i2s_hclk", "i2s_clk"; clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; }; |