diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-04 09:36:29 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-03-04 09:36:29 -0800 |
commit | 37655fae0c579315624189a7708d0b688d473876 (patch) | |
tree | b171c2ea6ea1434893cbd0c4de5608486d9b1cc8 /drivers/clk/nxp | |
parent | 8626556f259331aac23c0e274aed24420f0e5403 (diff) | |
parent | 7af8a26ce7055dd74853ea7c2b9752961e3491da (diff) | |
download | linux-37655fae0c579315624189a7708d0b688d473876.tar.gz linux-37655fae0c579315624189a7708d0b688d473876.tar.bz2 linux-37655fae0c579315624189a7708d0b688d473876.zip |
Merge tag 'v4.6-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-next
Pull second batch of rockchip clk updates from Heiko Stuebner:
Inclusion of the rk3368 fractional dividers into our handling scheme,
fixes for missing error-handling in mmc-phase, inverters and cpu-clocks
and some more clock-ids.
* tag 'v4.6-rockchip-clk2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: include downstream muxes into fractional dividers on rk3368
clk: rockchip: set the clock ids for RK3228 HDMI
clk: rockchip: set the clock ids for RK3228 VOP
clk: rockchip: add the tsadc clocks found on rk3228 SoCs
clk: rockchip: add the new clock ids for RK3228 HDMI
clk: rockchip: add the new clock ids for RK3228 VOP
clk: rockchip: add id of the tsadc clock found on rk3228 SoCs
clk: rockchip: fix coding style for clk-cpu.c
clk: rockchip: don't return NULL when registering mmc branch fails
clk: rockchip: don't return NULL when registering inverter fails
clk: rockchip: check grf when waiting pll lock
clk: rockchip: disable alt_parent clk in err cases when registering cpuclk
Diffstat (limited to 'drivers/clk/nxp')
0 files changed, 0 insertions, 0 deletions