diff options
author | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
---|---|---|
committer | Chris Mason <clm@fb.com> | 2016-05-17 23:43:19 +0200 |
commit | c315ef8d9db7f1a0ebd023a395ebdfde1c68057e (patch) | |
tree | 501e1fc558de9e56b78e457aa928fa255e660486 /Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | |
parent | Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git... (diff) | |
parent | Btrfs: add semaphore to synchronize direct IO writes with fsync (diff) | |
download | linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.tar.xz linux-c315ef8d9db7f1a0ebd023a395ebdfde1c68057e.zip |
Merge branch 'for-chris-4.7' of git://git.kernel.org/pub/scm/linux/kernel/git/fdmanana/linux into for-linus-4.7
Signed-off-by: Chris Mason <clm@fb.com>
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/i2c-rk3x.txt')
-rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-rk3x.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-rk3x.txt b/Documentation/devicetree/bindings/i2c/i2c-rk3x.txt index f0d71bc52e64..0b4a85fe2d86 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-rk3x.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-rk3x.txt @@ -6,8 +6,8 @@ RK3xxx SoCs. Required properties : - reg : Offset and length of the register set for the device - - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c" or - "rockchip,rk3288-i2c". + - compatible : should be "rockchip,rk3066-i2c", "rockchip,rk3188-i2c", + "rockchip,rk3228-i2c" or "rockchip,rk3288-i2c". - interrupts : interrupt number - clocks : parent clock |