Merge branch 'for-4.15' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup

[sfrench/cifs-2.6.git] / Documentation / devicetree / bindings / i2c / i2c-aspeed.txt

diff --git a/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt b/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
index bd6480b19535fa611ad7f7c683523c1d473407c9..e7106bfc1f138dddd7ce6830a5a4b8d951fed7eb 100644 (file)
--- a/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
+++ b/Documentation/devicetree/bindings/i2c/i2c-aspeed.txt
@@ -7,7 +7,9 @@ Required Properties:
 - compatible           : should be "aspeed,ast2400-i2c-bus"
                          or "aspeed,ast2500-i2c-bus"
 - clocks               : root clock of bus, should reference the APB
-                         clock
+                         clock in the second cell
+- resets               : phandle to reset controller with the reset number in
+                         the second cell
 - interrupts           : interrupt number
 - interrupt-parent     : interrupt controller for bus, should reference a
                          aspeed,ast2400-i2c-ic or aspeed,ast2500-i2c-ic
@@ -40,7 +42,8 @@ i2c {
                #interrupt-cells = <1>;
                reg = <0x40 0x40>;
                compatible = "aspeed,ast2400-i2c-bus";
-               clocks = <&clk_apb>;
+               clocks = <&syscon ASPEED_CLK_APB>;
+               resets = <&syscon ASPEED_RESET_I2C>;
                bus-frequency = <100000>;
                interrupts = <0>;
                interrupt-parent = <&i2c_ic>;