diff options
author | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 21:32:33 +0200 |
---|---|---|
committer | Stephen Boyd <sboyd@kernel.org> | 2018-06-04 21:32:33 +0200 |
commit | 36851edd7ea96ac74266de27b2ff7870e14563c8 (patch) | |
tree | 130ac48233f332d45863a4ce98c37cde0424af60 /include/dt-bindings | |
parent | Merge branches 'clk-imx7d', 'clk-hisi-stub', 'clk-mvebu', 'clk-imx6-epit' and... (diff) | |
parent | clk: use match_string() helper (diff) | |
parent | clk: ingenic: jz4770: Add 150us delay after enabling VPU clock (diff) | |
parent | clk-si544: Properly round requested frequency to nearest match (diff) | |
parent | clk: bcm: Update and add Stingray clock entries (diff) | |
download | linux-36851edd7ea96ac74266de27b2ff7870e14563c8.tar.xz linux-36851edd7ea96ac74266de27b2ff7870e14563c8.zip |
Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk-bcm-stingray' into clk-next
* clk-match-string:
clk: use match_string() helper
clk: bcm2835: use match_string() helper
* clk-ingenic:
clk: ingenic: jz4770: Add 150us delay after enabling VPU clock
clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock
clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle
clk: ingenic: jz4770: Change OTG from custom to standard gated clock
clk: ingenic: Support specifying "wait for clock stable" delay
clk: ingenic: Add support for clocks whose gate bit is inverted
* clk-si544-round-fix:
clk-si544: Properly round requested frequency to nearest match
* clk-bcm-stingray:
clk: bcm: Update and add Stingray clock entries
dt-bindings: clk: Update Stingray binding doc