diff options
author | 2015-02-04 07:53:17 +0100 | |
---|---|---|
committer | 2015-02-04 07:53:17 +0100 | |
commit | 2622e849a1d3d3ef531d1cc33308bb7fd00eee40 (patch) | |
tree | f2be9d9f08444cb93b3a8f87099fe4ff8ac3cd57 /Documentation/devicetree/bindings/i2c/i2c-st.txt | |
parent | futex: Fix argument handling in futex_lock_pi() calls (diff) | |
parent | Linux 3.19-rc7 (diff) | |
download | linux-dev-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.tar.xz linux-dev-2622e849a1d3d3ef531d1cc33308bb7fd00eee40.zip |
Merge tag 'v3.19-rc7' into locking/core, to refresh the branch before applying new changes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/i2c/i2c-st.txt')
-rw-r--r-- | Documentation/devicetree/bindings/i2c/i2c-st.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/devicetree/bindings/i2c/i2c-st.txt b/Documentation/devicetree/bindings/i2c/i2c-st.txt index 437e0db3823c..4c26fda3844a 100644 --- a/Documentation/devicetree/bindings/i2c/i2c-st.txt +++ b/Documentation/devicetree/bindings/i2c/i2c-st.txt @@ -31,7 +31,7 @@ i2c0: i2c@fed40000 { compatible = "st,comms-ssc4-i2c"; reg = <0xfed40000 0x110>; interrupts = <GIC_SPI 187 IRQ_TYPE_LEVEL_HIGH>; - clocks = <&CLK_S_ICN_REG_0>; + clocks = <&clk_s_a0_ls CLK_ICN_REG>; clock-names = "ssc"; clock-frequency = <400000>; pinctrl-names = "default"; |