]> asedeno.scripts.mit.edu Git - linux.git/commitdiff
Merge tag 'amlogic-drivers-2' of https://git.kernel.org/pub/scm/linux/kernel/git...
authorOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 06:44:20 +0000 (23:44 -0700)
committerOlof Johansson <olof@lixom.net>
Mon, 29 Apr 2019 06:44:20 +0000 (23:44 -0700)
soc: amlogic: updates for v5.2, round 2
- VPU power domain: add supporg for G12A SoCs
- socinfo: add new SoC and package IDS.

* tag 'amlogic-drivers-2' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  soc: amlogic: meson-gx-pwrc-vpu: Add support for G12A
  soc: amlogic: meson-gx-pwrc-vpu: Fix power on/off register bitmask

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

Trivial merge