summary refs log tree commit diff
path: root/drivers/clk
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-12-14 13:24:47 -0800
committerStephen Boyd <sboyd@kernel.org>2018-12-14 13:24:47 -0800
commitd7d458cb29e1ec5857a7d73ca89846e4240bb5a4 (patch)
treea1ca74a84fbe58866989aad5cd7ea77d16419e5a /drivers/clk
parent819ed0ad91cdd091e34293bc81944abb167f100c (diff)
parent8b627f616ed63dcaf922369fc14a5daf8ad03038 (diff)
parentd42925189b416b1559f3d74d663fa16c29942d96 (diff)
downloadlinux-d7d458cb29e1ec5857a7d73ca89846e4240bb5a4.tar.gz
Merge branches 'clk-bcm-module-license', 'clk-boston-leak' and 'clk-mtk-mt7629' into clk-next
 - Mediatek MT7629 SoC clk controllers

* clk-bcm-module-license:
  clk: bcm2835: make license text and module license match

* clk-boston-leak:
  clk: boston: unregister clks on failure in clk_boston_setup()
  clk: boston: fix possible memory leak in clk_boston_setup()

* clk-mtk-mt7629:
  clk: mediatek: fix the PCIe MAC clock parent
  clk: mediatek: Drop more __init markings for driver probe
  clk: mediatek: Drop __init from mtk_clk_register_cpumuxes()
  dt-bindings: arm: mediatek: document clk bindings for MT7629
  clk: mediatek: add clock support for MT7629 SoC