diff options
author | Stephen Boyd <sboyd@codeaurora.org> | 2016-06-20 17:01:45 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@codeaurora.org> | 2016-06-20 17:01:45 -0700 |
commit | 086347705be7530feabb6274a3ad81dd545e7914 (patch) | |
tree | b678824dd4f7aecf7ab696f675f7d3c2ef1c2cff /drivers/clk/at91/clk-programmable.c | |
parent | a5e9b85a6540df6c4074d3a56674f6fb6c5fc830 (diff) | |
parent | 62d0e71df063101e4551327bd9fa9aaa3535c86b (diff) | |
download | linux-086347705be7530feabb6274a3ad81dd545e7914.tar.bz2 |
Merge tag 'v4.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into clk-fixes
A bunch of fixes. Some for the newly added rk3399 clock tree, some
concerning error handling and initialization and a revert of the
mmc-phase clock initialization, as this could conflict with the
bootloader setting of this clock and a real solution to initing
the phase correctly from dw_mmc went in as fix for 4.7 through
the mmc tree.
* tag 'v4.7-rockchip-clk-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
clk: rockchip: release io resource when failing to init clk on rk3399
clk: rockchip: fix cpuclk registration error handling
clk: rockchip: Revert "clk: rockchip: reset init state before mmc card initialization"
clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src
clk: rockchip: mark rk3399 GIC clocks as critical
clk: rockchip: initialize flags of clk_init_data in mmc-phase clock
Diffstat (limited to 'drivers/clk/at91/clk-programmable.c')
0 files changed, 0 insertions, 0 deletions