diff options
author | Olof Johansson <olof@lixom.net> | 2013-10-28 10:13:09 -0700 |
---|---|---|
committer | Olof Johansson <olof@lixom.net> | 2013-10-28 10:19:38 -0700 |
commit | e086df92e21ac83e6a45933a205b62ad79097db5 (patch) | |
tree | 3765f03cea0320aa2cb179c74d62b377d7c6e62f /Documentation/devicetree/bindings/clock/sunxi.txt | |
parent | 0fc869e8f22bc74a9971f9025f8608d6587c4fb7 (diff) | |
parent | fc42ef5121687d917bbdd96805fb70c28a2ad023 (diff) | |
download | op-kernel-dev-e086df92e21ac83e6a45933a205b62ad79097db5.zip op-kernel-dev-e086df92e21ac83e6a45933a205b62ad79097db5.tar.gz |
Merge tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux into next/soc
From Maxime Ripard:
Allwinner sunXi SoCs machine additions for 3.13
Nothing outstanding here, mostly some documentation cleanup, and the split of
the previous generic machine declaration into three different machines to
handle the sun4i/sun5i, sun6i and sun7i separately.
* tag 'sunxi-core-for-3.13' of https://github.com/mripard/linux:
Documentation: dt: Remove clock gates IDs list for Allwinner SoCs
Documentation: dt: Remove interrupt sources list for Allwinner SoCs
Documentation: sunxi: Update Allwinner SoC documentation
Documentation: sunxi: Update A13 user manual dead link
ARM: sunxi: Order Kconfig options alphabetically
ARM: sunxi: Simplify restart setup code
ARM: sunxi: Split out the DT machines for sun6i and sun7i
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'Documentation/devicetree/bindings/clock/sunxi.txt')
-rw-r--r-- | Documentation/devicetree/bindings/clock/sunxi.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/devicetree/bindings/clock/sunxi.txt b/Documentation/devicetree/bindings/clock/sunxi.txt index 00a5c264..91a748f 100644 --- a/Documentation/devicetree/bindings/clock/sunxi.txt +++ b/Documentation/devicetree/bindings/clock/sunxi.txt @@ -45,8 +45,8 @@ Additionally, "allwinner,*-gates-clk" clocks require: Clock consumers should specify the desired clocks they use with a "clocks" phandle cell. Consumers that are using a gated clock should -provide an additional ID in their clock property. The values of this -ID are documented in sunxi/<soc>-gates.txt. +provide an additional ID in their clock property. This ID is the +offset of the bit controlling this particular gate in the register. For example: |