summaryrefslogtreecommitdiffstats
path: root/drivers/clk/Makefile
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-04-06 22:22:12 +0200
committerStephen Boyd <sboyd@kernel.org>2018-04-06 22:22:12 +0200
commita339bdf64a7c41a6c88cc7da2eb432c876d5ce19 (patch)
treecf3d6ec6009075935d3aa5937084c237fbd67ae5 /drivers/clk/Makefile
parentMerge branches 'clk-davinci', 'clk-si544', 'clk-rockchip', 'clk-uniphier' and... (diff)
parentclk: socfpga: stratix10: add clock driver for Stratix10 platform (diff)
parentclk: imx7d: Move clks_init_on before any clock operations (diff)
parentclk: bcm2835: De-assert/assert PLL reset signal when appropriate (diff)
parentclk: cs2000: set pm_ops in hibernate-compatible way (diff)
parentclk: imx: add clock driver for imx6sll (diff)
downloadlinux-a339bdf64a7c41a6c88cc7da2eb432c876d5ce19.tar.xz
linux-a339bdf64a7c41a6c88cc7da2eb432c876d5ce19.zip
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