From 826d399c448b4e08d73731448d0400c449e9fc58 Mon Sep 17 00:00:00 2001 From: Sascha Hauer Date: Mon, 20 Oct 2014 07:20:59 +0200 Subject: dts: update to v3.17-rc6 Signed-off-by: Sascha Hauer --- dts/Bindings/input/atmel,maxtouch.txt | 4 ---- dts/Bindings/sound/rockchip-i2s.txt | 2 +- dts/Bindings/spi/spi-rockchip.txt | 8 ++++++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dts/Bindings/input/atmel,maxtouch.txt b/dts/Bindings/input/atmel,maxtouch.txt index 0ac23f2ed1..1852906517 100644 --- a/dts/Bindings/input/atmel,maxtouch.txt +++ b/dts/Bindings/input/atmel,maxtouch.txt @@ -11,10 +11,6 @@ Required properties: Optional properties for main touchpad device: -- linux,gpio-keymap: An array of up to 4 entries indicating the Linux - keycode generated by each GPIO. Linux keycodes are defined in - . - - linux,gpio-keymap: When enabled, the SPT_GPIOPWN_T19 object sends messages on GPIO bit changes. An array of up to 8 entries can be provided indicating the Linux keycode mapped to each bit of the status byte, diff --git a/dts/Bindings/sound/rockchip-i2s.txt b/dts/Bindings/sound/rockchip-i2s.txt index 6c55fcfe5e..9b82c20b30 100644 --- a/dts/Bindings/sound/rockchip-i2s.txt +++ b/dts/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>; }; diff --git a/dts/Bindings/spi/spi-rockchip.txt b/dts/Bindings/spi/spi-rockchip.txt index 7bab355758..467dec441c 100644 --- a/dts/Bindings/spi/spi-rockchip.txt +++ b/dts/Bindings/spi/spi-rockchip.txt @@ -16,11 +16,15 @@ Required Properties: - clocks: Must contain an entry for each entry in clock-names. - clock-names: Shall be "spiclk" for the transfer-clock, and "apb_pclk" for the peripheral clock. +- #address-cells: should be 1. +- #size-cells: should be 0. + +Optional Properties: + - dmas: DMA specifiers for tx and rx dma. See the DMA client binding, Documentation/devicetree/bindings/dma/dma.txt - dma-names: DMA request names should include "tx" and "rx" if present. -- #address-cells: should be 1. -- #size-cells: should be 0. + Example: -- cgit v1.2.3