diff options
| author |   Stephen Boyd <sboyd@codeaurora.org> | 2017-01-26 15:52:37 -0800 |
|---|---|---|
| committer | Stephen Boyd <sboyd@codeaurora.org> | 2017-01-26 15:52:37 -0800 |
| commit | 645ebb1daa6c7d26a0ad5c7e919e3ed907956a51 (patch) | |
| tree | 39d0cde20722c293eed77b348116199d41d2e7b1 /drivers/clk/imx | |
| parent | clk: cs2000: add Suspend/Resume feature (diff) | |
| parent | clk: imx7d: Add the OCOTP clock (diff) | |
| parent | clk: bcm2835: Add leaf clock measurement support, disabled by default (diff) | |
| download | linux-dev-645ebb1daa6c7d26a0ad5c7e919e3ed907956a51.tar.xz linux-dev-645ebb1daa6c7d26a0ad5c7e919e3ed907956a51.zip | |
Merge branch 'clk-imx7', 'clk-bcm2835' into clk-next
* clk-imx7:
clk: imx7d: Add the OCOTP clock
* clk-bcm2835:
clk: bcm2835: Add leaf clock measurement support, disabled by default
clk: bcm2835: Register the DSI0/DSI1 pixel clocks.
clk: bcm2835: Don't rate change PLLs on behalf of DSI PLL dividers.