]> git.proxmox.com Git - mirror_ubuntu-artful-kernel.git/commit
Merge tag 'sunxi-clk-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel...
authorStephen Boyd <sboyd@codeaurora.org>
Wed, 14 Jun 2017 23:48:03 +0000 (16:48 -0700)
committerStephen Boyd <sboyd@codeaurora.org>
Wed, 14 Jun 2017 23:48:03 +0000 (16:48 -0700)
commit949bdfed4b0f74215da60992e9f5e14c9ecbb064
tree4c5ff96d9e35f4febe334f36d9b57f8fdf54f58b
parent658a7568030e287215b069a9c383c0fd0c5f57d5
parentd85da227c3ae43d9ca513d60f244213cb4e55485
Merge tag 'sunxi-clk-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes

Allwinner clock fixes for 4.12

Some fixes that fix some bindings that went in 4.12, fix a few reset and
clock offsets and a build error fix

* tag 'sunxi-clk-fixes-for-4.12' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux:
  clk: sunxi-ng: a64: Export PLL_PERIPH0 clock for the PRCM
  clk: sunxi-ng: h3: Export PLL_PERIPH0 clock for the PRCM
  dt-bindings: clock: sunxi-ccu: Add pll-periph to PRCM's needed clocks
  clk: sunxi-ng: enable SUNXI_CCU_MP for PRCM
  clk: sunxi-ng: v3s: Fix usb otg device reset bit
  clk: sunxi-ng: a31: Correct lcd1-ch1 clock register offset