diff options
| author | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-11 11:39:17 -0700 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-05-12 14:48:26 -0700 |
| commit | d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4 (patch) | |
| tree | 27494a2b82d6f2d7a019f67225f5640873163b5e /Documentation/devicetree/bindings/clock | |
| parent | 4afe2d1a6ed5cba794aeeaa816e7c97a45167b01 (diff) | |
| parent | 3397c2c45b1b6f54834dfeae30a73046f33ca943 (diff) | |
| download | linux-stable-d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4.tar.gz linux-stable-d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4.tar.bz2 linux-stable-d8609a3a2e4f6fb1fa5cf2468547eb30507e78c4.zip | |
Merge tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next
Pull some non-critical i.MX clk fixes from Shawn Guo:
* Fix the commit 3713e3f5e927 ("clk: imx35: define two clocks for rtc")
which messed up the clock enumeration when adding new clock.
* tag 'imx-clk-fixes-4.6-2' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
ARM: dts: imx35: restore existing used clock enumeration
clk: imx6q: fix typo in CAN clock definition
Diffstat (limited to 'Documentation/devicetree/bindings/clock')
| -rw-r--r-- | Documentation/devicetree/bindings/clock/imx35-clock.txt | 1 |
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: |