summaryrefslogtreecommitdiffstats
path: root/drivers/clk
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@kernel.org>2018-06-04 12:27:40 -0700
committerStephen Boyd <sboyd@kernel.org>2018-06-04 12:27:40 -0700
commit7fa50aa559dd8b79178423d8bc0a64cf4ba922bc (patch)
tree60027bbc23210ef8bbf9d0f30dbcfd7a6c240351 /drivers/clk
parentb7c82cec0450b075e4eab79edb6b20305040e028 (diff)
parent80820a7bc8eb92bee8dab36668dfc567062b0ccf (diff)
parent329470f2d5447f76088250d7b7fbc1f9b175ccfc (diff)
parentbf61099a21f5a4da3b0551a88d7b3551fa4fff08 (diff)
parenta11ca689695118b367f59cc837f78c8fb414951d (diff)
parentf5a4670de96678be275c7dd7f469a9d98938d68a (diff)
downloadlinux-7fa50aa559dd8b79178423d8bc0a64cf4ba922bc.tar.bz2
Merge branches 'clk-hisi-usb', 'clk-silent-bulk', 'clk-mtk-hdmi', 'clk-mtk-mali' and 'clk-imx6ul-ccosr' into clk-next
* clk-hisi-usb: clk: hisilicon: add missing usb3 clocks for Hi3798CV200 SoC * clk-silent-bulk: clk: bulk: silently error out on EPROBE_DEFER * clk-mtk-hdmi: clk: mediatek: correct the clocks for MT2701 HDMI PHY module * clk-mtk-mali: clk: mediatek: add g3dsys support for MT2701 and MT7623 dt-bindings: reset: mediatek: add entry for Mali-450 node to refer dt-bindings: clock: mediatek: add entry for Mali-450 node to refer dt-bindings: clock: mediatek: add g3dsys bindings * clk-imx6ul-ccosr: clk: imx: Add new clo01 and clo2 controlled by CCOSR