summaryrefslogtreecommitdiffstats
path: root/drivers/vlynq
diff options
context:
space:
mode:
authorStephen Boyd <sboyd@codeaurora.org>2017-01-27 00:52:37 +0100
committerStephen Boyd <sboyd@codeaurora.org>2017-01-27 00:52:37 +0100
commit645ebb1daa6c7d26a0ad5c7e919e3ed907956a51 (patch)
tree39d0cde20722c293eed77b348116199d41d2e7b1 /drivers/vlynq
parentclk: cs2000: add Suspend/Resume feature (diff)
parentclk: imx7d: Add the OCOTP clock (diff)
parentclk: bcm2835: Add leaf clock measurement support, disabled by default (diff)
downloadlinux-645ebb1daa6c7d26a0ad5c7e919e3ed907956a51.tar.xz
linux-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.