summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2021-04-28 01:34:44 +0200
committerStephen Boyd <sboyd@kernel.org>2021-04-28 01:34:44 +0200
commitbbc3b403b096220850b82e245a1e5f09b8b216a2 (patch)
tree89737d0a72325071985b72f09b22d4f3d3319de5
parentMerge branches 'clk-cleanup', 'clk-renesas', 'clk-socfpga', 'clk-allwinner' a... (diff)
parentMerge tag 'clk-imx-5.13' of https://git.kernel.org/pub/scm/linux/kernel/git/a... (diff)
parentMerge tag 'clk-v5.13-samsung' of https://git.kernel.org/pub/scm/linux/kernel/... (diff)
parentclk: zynqmp: pll: add set_pll_mode to check condition in zynqmp_pll_enable (diff)
parentMerge tag 'v5.13-rockchip-clocks' of git://git.kernel.org/pub/scm/linux/kerne... (diff)
parentclk: uniphier: Fix potential infinite loop (diff)
downloadlinux-bbc3b403b096220850b82e245a1e5f09b8b216a2.tar.xz
linux-bbc3b403b096220850b82e245a1e5f09b8b216a2.zip
Merge branches 'clk-imx', 'clk-samsung', 'clk-zynq', 'clk-rockchip' and 'clk-uniphier' into clk-next
- Simplify Zynq Kconfig dependencies * clk-imx: clk: imx: Reference preceded by free clk: imx8mq: Correct the pcie1 sels clk: imx8mp: Remove the none exist pcie clocks clk: imx: Fix reparenting of UARTs not associated with stdout * clk-samsung: clk: samsung: Remove redundant dev_err calls clk: exynos7: Mark aclk_fsys1_200 as critical * clk-zynq: clk: zynqmp: pll: add set_pll_mode to check condition in zynqmp_pll_enable clk: zynqmp: move zynqmp_pll_set_mode out of round_rate callback clk: zynqmp: Drop dependency on ARCH_ZYNQMP clk: zynqmp: Enable the driver if ZYNQMP_FIRMWARE is selected * clk-rockchip: clk: rockchip: drop MODULE_ALIAS from rk3399 clock controller clk: rockchip: drop parenthesis from ARM || COMPILE_TEST depends clk: rockchip: add clock controller for rk3568 clk: rockchip: support more core div setting dt-binding: clock: Document rockchip, rk3568-cru bindings clk: rockchip: add dt-binding header for rk3568 * clk-uniphier: clk: uniphier: Fix potential infinite loop