diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-08-15 08:58:35 +0300 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-08-15 08:58:35 +0300 |
commit | b183c6887af3bba1835bd4c9ef2de119afab737b (patch) | |
tree | 378622cc855c5e872709082de9a512ca826dbb32 | |
parent | 5ef7748ba37e0b1667ae973c1162fa60c0248f49 (diff) | |
parent | a7047564fef3ddf0092e64a229ddb17596717120 (diff) | |
parent | cfb8282e18e292a8efc4d13ea1e4547a47dfb2d0 (diff) | |
parent | 964e3717e4987b17c585d29ce366702dbc74bbf1 (diff) | |
parent | 51b9a379a843c288b07b501784a5cc52b2c5aa69 (diff) | |
parent | 96e4ea8c253d12079db4d7174990455b4bbf0c87 (diff) | |
download | linux-b183c6887af3bba1835bd4c9ef2de119afab737b.tar.xz |
Merge branches 'clk-imx6-video-parent', 'clk-qcom-sdm845-criticals', 'clk-renesas', 'clk-stratix10-fixes' and 'clk-atmel-i2s' into clk-next
* clk-imx6-video-parent:
: - Fix i.MX6QDL video clk parent
clk: imx6: fix video_27m parent for IMX6QDL_CLK_CKO1_SEL
* clk-qcom-sdm845-criticals:
: - critical clk markings for qcom SDM845
clk: qcom: Enable clocks which needs to be always on for SDM845
* clk-renesas:
clk: renesas: Renesas R9A06G032 clock driver
dt-bindings: clock: renesas,r9a06g032-sysctrl: documentation
dt-bindings: clock: Add the r9a06g032-sysctrl.h file
clk: renesas: r8a7795: Add CCREE clock
clk: renesas: r8a7795: Add CR clock
* clk-stratix10-fixes:
: - Fix Stratix10 mpu_free_clk and sdmmc_free_clk parents
clk: socfpga: stratix10: fix the sdmmc_free_clk mux
clk: socfpga: stratix10: fix the parents of mpu_free_clk
* clk-atmel-i2s:
: - Atmel at91 I2S audio clk support
clk: at91: add I2S clock mux driver
dt-bindings: clk: at91: add an I2S mux clock