diff options
author | Stephen Boyd | 2018-04-06 13:22:12 -0700 |
---|---|---|
committer | Stephen Boyd | 2018-04-06 13:22:12 -0700 |
commit | a339bdf64a7c41a6c88cc7da2eb432c876d5ce19 (patch) | |
tree | cf3d6ec6009075935d3aa5937084c237fbd67ae5 /drivers/clk/Makefile | |
parent | a83fdfae5a25588cc6c4c086e98f03c7270fc37b (diff) | |
parent | 07afb8db7340f9b6051a26c5c28f2ce74148f6b5 (diff) | |
parent | 8d41e6538c1a4d034cd1f4cc5efec699dd83ca5d (diff) | |
parent | 753872373b599384ac7df809aa61ea12d1c4d5d1 (diff) | |
parent | eade4ccdb087ae6238bcce78e64587d543374ca4 (diff) | |
parent | 4a5f720b65422e168139826c0dae675336bdd706 (diff) |
Merge branches 'clk-stratix10', 'clk-imx', 'clk-bcm', 'clk-cs2000' and 'clk-imx6sll' into clk-next
* clk-stratix10:
clk: socfpga: stratix10: add clock driver for Stratix10 platform
dt-bindings: documentation: add clock bindings information for Stratix10
* clk-imx:
clk: imx7d: Move clks_init_on before any clock operations
clk: imx7d: Correct ahb clk parent select
clk: imx7d: Correct dram pll type
clk: imx7d: Add USB clock information
clk: imx: pllv2: avoid using uninitialized values
clk: imx6ull: Add epdc_podf instead of sim_podf
clk: imx: imx7d: correct video pll clock tree
clk: imx: imx7d: add the Keypad Port module clock
clk: imx7d: add CAAM clock
clk: imx: imx7d: add the snvs clock
clk: imx: imx6sx: update cko mux options
* clk-bcm:
clk: bcm2835: De-assert/assert PLL reset signal when appropriate
* clk-cs2000:
clk: cs2000: set pm_ops in hibernate-compatible way
* clk-imx6sll:
clk: imx: add clock driver for imx6sll
dt-bindings: imx: update clock doc for imx6sll
clk: imx: add new gate/gate2 wrapper funtion
clk: imx: Add CLK_IS_CRITICAL flag for busy divider and busy mux