diff options
author | Stephen Boyd <sboyd@kernel.org> | 2020-12-20 17:17:25 -0800 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2020-12-20 17:17:25 -0800 |
commit | d240d4c20578d8b6dc8b3720534681aa8636fdad (patch) | |
tree | d038eee1a67945baa684535535e0520c56c9d7ac | |
parent | 23cae54f52690ea88b73d3f30d78ad40c01f9f89 (diff) | |
parent | cadd53122ae8b1fa08285ee1c61edd1341bfe2db (diff) | |
parent | f4ac0c5639b75ef25071affe746b1e70d6d23e09 (diff) | |
parent | 047b04201f628c038cdf4879ed51513215dd8780 (diff) | |
parent | fcf77be87eacb8f305528d24d892dfcf15cf0341 (diff) | |
parent | 975d25cbb505e92644de2e603965bb5e17215012 (diff) | |
download | linux-d240d4c20578d8b6dc8b3720534681aa8636fdad.tar.gz linux-d240d4c20578d8b6dc8b3720534681aa8636fdad.tar.bz2 linux-d240d4c20578d8b6dc8b3720534681aa8636fdad.zip |
Merge branches 'clk-amlogic', 'clk-rockchip', 'clk-of', 'clk-freescale' and 'clk-unused' into clk-next
- Replace clk-provider.h with of_clk.h when possible
* clk-amlogic:
clk: meson: g12a: add MIPI DSI Host Pixel Clock
dt-bindings: clk: g12a-clkc: add DSI Pixel clock bindings
clk: meson: enable building as modules
clk: meson: Kconfig: fix dependency for G12A
clk: meson: axg: add MIPI DSI Host clock
clk: meson: axg: add Video Clocks
dt-bindings: clk: axg-clkc: add MIPI DSI Host clock binding
dt-bindings: clk: axg-clkc: add Video Clocks
* clk-rockchip:
clk: rockchip: fix i2s gate bits on rk3066 and rk3188
clk: rockchip: add CLK_SET_RATE_PARENT to sclk for rk3066a i2s and uart clocks
clk: rockchip: Remove redundant null check before clk_prepare_enable
clk: rockchip: Add appropriate arch dependencies
* clk-of:
xtensa: Replace <linux/clk-provider.h> by <linux/of_clk.h>
sh: boards: Replace <linux/clk-provider.h> by <linux/of_clk.h>
* clk-freescale:
clk: fsl-flexspi: new driver
dt-bindings: clock: document the fsl-flexspi-clk device
clk: divider: add devm_clk_hw_register_divider_table()
clk: qoriq: provide constants for the type
clk: fsl-sai: use devm_clk_hw_register_composite_pdata()
clk: composite: add devm_clk_hw_register_composite_pdata()
clk: fsl-sai: fix memory leak
clk: qoriq: Add platform dependencies
* clk-unused:
clk: scpi: mark scpi_clk_match as maybe unused
clk: pwm: drop of_match_ptr from of_device_id table