diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-01 17:30:36 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-02 14:31:47 -0800 |
commit | 5788923b270c9e0a59ff6a2b3d6e45a4defa1017 (patch) | |
tree | 693550aa699a4f3b5967ecff69e3b1a941306d3f /include/sound/wm0010.h | |
parent | 06a9852747b72c8b3fb35a60cc0498784135b5d8 (diff) | |
parent | f6c3aec2f7a218abec9e5c00353abc02224be49e (diff) |
Merge tag 'imx-clk-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux into clk-next
Pull i.MX clk updates from Shawn Guo:
The i.MX clock update for 4.6:
- Add the clock driver support for the latest i.MX6 family SoCs
addition - i.MX6QP.
- Clean up the whitespace in i.MX6UL clock driver and add the missing
KPP clock.
- Correct pwm7 clock name in i.MX6UL clock driver.
* tag 'imx-clk-4.6' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux:
clk: imx: add kpp clock for i.MX6UL
clk: imx: whitespace cleanup; no functional change
clk: imx: correct pwm7 clock name in driver for i.MX6UL
clk: imx: Add clock support for imx6qp
Diffstat (limited to 'include/sound/wm0010.h')
0 files changed, 0 insertions, 0 deletions