]> git.proxmox.com Git - mirror_ubuntu-bionic-kernel.git/commit
Merge tag 'v4.10-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel...
authorOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 07:31:18 +0000 (23:31 -0800)
committerOlof Johansson <olof@lixom.net>
Fri, 18 Nov 2016 07:31:18 +0000 (23:31 -0800)
commit7558341659e1b76e5c58345ab699a7ea1c6a9326
tree01ddc929862188a3fe8fbae2bbf17f133272e6d1
parent26aec1f476fdea2e93d47b5728d1432a20ff9b71
parentdabc0259db63338f0e64107cc92b2241f98a3284
Merge tag 'v4.10-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into next/drivers

Changes to the power-domain driver including counter presets now being set
by firmware on the rk3399, avoiding infite loops when powering on/off a
domain and actually returning an error if power-domain addition fails.
The last part requires usage of the (new in 4.9-rc1) pm_genpd_remove
functionality as well.

* tag 'v4.10-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: power-domain: Handle errors from of_genpd_add_provider_onecell
  soc: rockchip: power-domain: use pm_genpd_remove in error cleanup
  soc: rockchip: power-domain: avoid infinite loop
  soc: rockchip: power-domain: Don't (incorrectly) set rk3399 up/down counts

Signed-off-by: Olof Johansson <olof@lixom.net>