Merge branch 'clk-fixes' into clk-kconfig
authorStephen Boyd <sboyd@kernel.org>
Mon, 3 Aug 2020 20:52:05 +0000 (13:52 -0700)
committerStephen Boyd <sboyd@kernel.org>
Mon, 3 Aug 2020 20:52:05 +0000 (13:52 -0700)
commitba857b212210df018adb5885656c9e890062f883
tree6f3b54e33004117b757dfa17d609d47cd9cce583
parentb545b9c393cb4486a7b70ef2fd8d0c8451872342
parent1e7468bd9d30a21e059af477106dc5588ae52dff
Merge branch 'clk-fixes' into clk-kconfig

Need to merge this up to get the IOMEM dependency patch on top that is
broken and fixed in the next commit.

* clk-fixes:
  clk: Specify IOMEM dependency for HSDK pll driver
  clk: AST2600: Add mux for EMMC clock
  clk: mvebu: ARMADA_AP_CPU_CLK needs to select ARMADA_AP_CP_HELPER
drivers/clk/Kconfig