From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 31 Oct 2017 23:28:02 +0000 (-0700)
Subject: Merge tag 'v4.15-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: rel_imx_4.19.35_1.1.0~11230^2~17
X-Git-Url: https://git.somdevices.com/?a=commitdiff_plain;h=6705fc944107756857f5f2301f99a9ba7f702a04;p=linux.git

Merge tag 'v4.15-rockchip-clk-1' of git://git./linux/kernel/git/mmind/linux-rockchip into clk-next

Pull Rockchip clk drivers updates from Heiko Stuebner:

 - new clock ids for rk3188 and rk3368
 - removal of a superfluous memory allocation error message

* tag 'v4.15-rockchip-clk-1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  clk: rockchip: use new cif/vdpu clock ids on rk3188
  clk: rockchip: export clock pclk_efuse_256 for RK3368 SoCs
  clk: rockchip: add more rk3188 graphics clock ids
  clk: rockchip: add clock id for PCLK_EFUSE256 of RK3368 SoCs
  clk: rockchip: Remove superfluous error message in rockchip_clk_register_cpuclk()
---

6705fc944107756857f5f2301f99a9ba7f702a04