diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 12:32:28 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 12:32:28 -0700 |
commit | ef1ae47094b506b0194b251888166809e9258cf8 (patch) | |
tree | 76ddbea13118529c8b9bdcdedaac34a9fe05dee5 /include/soc | |
parent | fff2e33717607dcfd9b7c36b244471e3cb271e4b (diff) | |
parent | b4f5e1ffcc47bf894bfb66294a6c0497ccd57aac (diff) | |
parent | 7b873e4b5a9358f9da3f101da8273314dd6e27e1 (diff) | |
parent | 00c5a926af12a9f0236928dab3dc9faf621406a1 (diff) | |
parent | b1569380a60ff4145898721e4f17b045a7cacc34 (diff) | |
parent | d75d50c016a4eff96e004921402128dc2bc3d65b (diff) |
Merge branches 'clk-imx7d', 'clk-hisi-stub', 'clk-mvebu', 'clk-imx6-epit' and 'clk-debugfs-simple' into clk-next
* clk-imx7d:
clk: imx7d: reset parent for mipi csi root
clk: imx7d: fix mipi dphy div parent
* clk-hisi-stub:
clk/driver/hisi: Consolidate the Kconfig for the CLOCK_STUB
* clk-mvebu:
clk: mvebu: use correct bit for 98DX3236 NAND
* clk-imx6-epit:
clk: imx6: add EPIT clock support
* clk-debugfs-simple:
clk: Return void from debug_init op
clk: remove clk_debugfs_add_file()
clk: tegra: no need to check return value of debugfs_create functions
clk: davinci: no need to check return value of debugfs_create functions
clk: bcm2835: no need to check return value of debugfs_create functions
clk: no need to check return value of debugfs_create functions