summaryrefslogtreecommitdiffstats
path: root/Documentation
diff options
context:
space:
mode:
authorAlexander Kurz <akurz@blala.de>2016-04-14 23:30:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2016-06-07 18:14:32 -0700
commit670664734da1f96f7d8525a91cd71a4c21db460f (patch)
tree697300e15150bdcdc5c17ee501ffe4bb593c118b /Documentation
parent59bc5bedbd712003945e6d6bbef0aba5bb4603dc (diff)
downloadlinux-stable-670664734da1f96f7d8525a91cd71a4c21db460f.tar.gz
linux-stable-670664734da1f96f7d8525a91cd71a4c21db460f.tar.bz2
linux-stable-670664734da1f96f7d8525a91cd71a4c21db460f.zip
ARM: dts: imx35: restore existing used clock enumeration
commit 3397c2c45b1b6f54834dfeae30a73046f33ca943 upstream. A new element got inserted into enum mx35_clks with commit 3713e3f5e927 ("clk: imx35: define two clocks for rtc"). This insertion shifted most nummerical clock assignments to a new nummerical value which in turn rendered most hardcoded nummeric values in imx35.dtsi incorrect. Restore the existing order by moving the newly introduced clock to the end of the enum. Update the dts documentation accordingly. Signed-off-by: Alexander Kurz <akurz@blala.de> Fixes: 3713e3f5e927 ("clk: imx35: define two clocks for rtc") Signed-off-by: Shawn Guo <shawnguo@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/devicetree/bindings/clock/imx35-clock.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/devicetree/bindings/clock/imx35-clock.txt b/Documentation/devicetree/bindings/clock/imx35-clock.txt
index a70356452a82..f49783213c56 100644
--- a/Documentation/devicetree/bindings/clock/imx35-clock.txt
+++ b/Documentation/devicetree/bindings/clock/imx35-clock.txt
@@ -94,6 +94,7 @@ clocks and IDs.
csi_sel 79
iim_gate 80
gpu2d_gate 81
+ ckli_gate 82
Examples: