diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:39:01 -0700 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-10-18 15:39:01 -0700 |
commit | 5d3a48fe2cee0d9fde91b6552362e86a8efca298 (patch) | |
tree | 48d3c700acdb2266a8b5400d6e5d159b3319a63d /drivers/clk | |
parent | faff3d8e852b1450e0e8e8f60c4e9af98549548a (diff) | |
parent | 78412c262004be21d1104ffad3232bb1c2e14a25 (diff) | |
parent | 1adb0a9faabb44cd76c668f12d8b51de869c38b5 (diff) |
Merge branches 'clk-qcom-sdm845-camcc' and 'clk-mtk-unused' into clk-next
- Qualcomm SDM845 camera clock controller
* clk-qcom-sdm845-camcc:
clk: qcom: Add camera clock controller driver for SDM845
dt-bindings: clock: Introduce QCOM Camera clock bindings
* clk-mtk-unused:
clk: mediatek: remove unused array audio_parents