From: Stephen Boyd <sboyd@kernel.org>
Date: Sat, 16 Feb 2019 00:13:58 +0000 (-0800)
Subject: Merge tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson into clk-meson
X-Git-Tag: v5.1-rc1~34^2~10^5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a9ca321716c801ae4e731b3a016c24633374b59b;p=thirdparty%2Fkernel%2Flinux.git

Merge tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson into clk-meson

Pull another set of Amlogic clk drivers updates from Neil Armstrong:
 - Add G12A Always-On Clock Controller
 - Fix Meson8 APB clock ID name

* tag 'meson-clk-5.1-2' of https://github.com/BayLibre/clk-meson:
  clk: meson: meson8b: fix the naming of the APB clocks
  dt-bindings: clock: meson8b: add APB clock definition
  clk: meson: Add G12A AO Clock + Reset Controller
  dt-bindings: clk: add G12A AO Clock and Reset Bindings
---

a9ca321716c801ae4e731b3a016c24633374b59b