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 /include | |
| parent | c567fb37f123511d752a454fb11d8bcaf46a7895 (diff) | |
| parent | 6847c4c296a4d44c5cd1230a59b997aea9a9d35d (diff) | |
| parent | 3f9195811d8d829556c4cd88d3f9e56a80d5ba60 (diff) | |
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.