Message ID | 1410570281-23681-1-git-send-email-jay.xu@rock-chips.com (mailing list archive) |
---|---|
State | Accepted |
Commit | d67f660edbce696f3fc6bc8c25b869f5a72279bb |
Headers | show |
On Sat, Sep 13, 2014 at 09:04:41AM +0800, Jianqun wrote: > Reference to RK3288 TRM, fix an error channel id for i2s tx and rx > Table 10-1 DMAC_BUS Request Mapping Table > Req number Source Polarity > 0 I2S tx High level > 1 I2S rx High level Applied, thanks. The changelog should've just noted that this is an error in the example rather than the code or the binding, I was a bit confused about this.
? 09/14/2014 12:40 AM, Mark Brown ??: > On Sat, Sep 13, 2014 at 09:04:41AM +0800, Jianqun wrote: >> Reference to RK3288 TRM, fix an error channel id for i2s tx and rx >> Table 10-1 DMAC_BUS Request Mapping Table >> Req number Source Polarity >> 0 I2S tx High level >> 1 I2S rx High level > > Applied, thanks. The changelog should've just noted that this is an > error in the example rather than the code or the binding, I was a bit > confused about this. > ok, I will do it
diff --git a/Documentation/devicetree/bindings/sound/rockchip-i2s.txt b/Documentation/devicetree/bindings/sound/rockchip-i2s.txt index 6c55fcf..9b82c20 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>; };
Reference to RK3288 TRM, fix an error channel id for i2s tx and rx Table 10-1 DMAC_BUS Request Mapping Table Req number Source Polarity 0 I2S tx High level 1 I2S rx High level Tested on RK3288 board. Signed-off-by: Jianqun <jay.xu@rock-chips.com> --- Documentation/devicetree/bindings/sound/rockchip-i2s.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)