Merge tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman...
authorArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 16:19:19 +0000 (17:19 +0100)
committerArnd Bergmann <arnd@arndb.de>
Fri, 15 Feb 2019 16:19:32 +0000 (17:19 +0100)
commit1d03f187f6f9b14852d3b5d7cfe14578e3c0b7cc
tree940ee2c9435c818a00c610da02a1c27024dabdff
parentc9235d9996463ba8e8dde7bfe659352b20739e36
parent19e0bde7bf6a18a910e5d633ef606d6ff298c2cb
Merge tag 'amlogic-drivers' of git://git./linux/kernel/git/khilman/linux-amlogic into arm/drivers

Amlogic: driver updates for v5.1
- clock measure: add support for G12a SoC family
- misc. fixes

* tag 'amlogic-drivers' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-amlogic:
  soc: amlogic: clk-measure: add axg and g12a support
  dt-bindings: amlogic: add new compatible devices to clk_measure
  soc: amlogic: canvas: Fix meson_canvas_get when probe failed
  soc: amlogic: add missing of_node_put()

Signed-off-by: Arnd Bergmann <arnd@arndb.de>