From: Sugar Zhang Date: Tue, 10 Nov 2015 07:32:08 +0000 (+0800) Subject: UPSTREAM: ASoC: rockchip: add playback property X-Git-Tag: firefly_0821_release~2845 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2386740ae5bfd173dd57f8bc77c667b06a59fc8c;p=firefly-linux-kernel-4.4.55.git UPSTREAM: ASoC: rockchip: add playback property rockchip,playback-channels: max playback channels, 8 channels default. Change-Id: I0db92ad3d3270e46bb98a2977163869251c32f2d Signed-off-by: Sugar Zhang Signed-off-by: Mark Brown (cherry picked from commit 7fd9093a7570f5d8bbdc8014c0a349da2afea97e) --- diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index ca9669ac6617..6e86d8aa29b4 100644 --- a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt +++ b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt @@ -20,6 +20,7 @@ Required properties: - clock-names: should contain followings: - "i2s_hclk": clock for I2S BUS - "i2s_clk" : clock for I2S controller +- rockchip,playback-channels: max playback channels, if not set, 8 channels default. - rockchip,capture-channels: max capture channels, if not set, 2 channels default. Example for rk3288 I2S controller: @@ -32,5 +33,6 @@ i2s@ff890000 { dma-names = "tx", "rx"; clock-names = "i2s_hclk", "i2s_clk"; clocks = <&cru HCLK_I2S0>, <&cru SCLK_I2S0>; + rockchip,playback-channels = <8>; rockchip,capture-channels = <2>; };