From: Stephen Boyd <sboyd@kernel.org>
Date: Fri, 12 Jul 2019 18:11:30 +0000 (-0700)
Subject: Merge branches 'clk-rpi-cpufreq', 'clk-tegra', 'clk-simplify-provider.h', 'clk-sprd... 
X-Git-Tag: v5.3-rc1~59^2~1
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=47c9e0cef01494aa512e924b100160206295f45e;p=linux.git

Merge branches 'clk-rpi-cpufreq', 'clk-tegra', 'clk-simplify-provider.h', 'clk-sprd' and 'clk-at91' into clk-next

 - Support for CPU clks on Raspberry Pi devices
 - Slow clk support for AT91 SAM9X60 SoCs

* clk-rpi-cpufreq:
  clk: raspberrypi: register platform device for raspberrypi-cpufreq
  firmware: raspberrypi: register clk device
  clk: bcm283x: add driver interfacing with Raspberry Pi's firmware
  clk: bcm2835: remove pllb

* clk-tegra:
  clk: tegra: Do not enable PLL_RE_VCO on Tegra210
  clk: tegra: Warn if an enabled PLL is in IDDQ
  clk: tegra: Do not warn unnecessarily
  clk: tegra210: fix PLLU and PLLU_OUT1

* clk-simplify-provider.h:
  clk: consoldiate the __clk_get_hw() declarations
  clk: Unexport __clk_of_table
  clk: Remove ifdef for COMMON_CLK in clk-provider.h

* clk-sprd:
  clk: sprd: Add check for return value of sprd_clk_regmap_init()
  clk: sprd: Check error only for devm_regmap_init_mmio()
  clk: sprd: Switch from of_iomap() to devm_ioremap_resource()

* clk-at91:
  clk: at91: sckc: use dedicated functions to unregister clock
  clk: at91: sckc: improve error path for sama5d4 sck registration
  clk: at91: sckc: remove unnecessary line
  clk: at91: sckc: improve error path for sam9x5 sck register
  clk: at91: sckc: add support to free slow clock osclillator
  clk: at91: sckc: add support to free slow rc oscillator
  clk: at91: sckc: add support to free slow oscillator
  clk: at91: sckc: add support for SAM9X60
  dt-bindings: clk: at91: add bindings for SAM9X60's slow clock controller
  clk: at91: sckc: add support to specify registers bit offsets
  clk: at91: sckc: sama5d4 has no bypass support
---

47c9e0cef01494aa512e924b100160206295f45e
diff --cc drivers/clk/imx/clk.c
index 76457b2bd7f0,1efed86217f7,1efed86217f7,588d1f45325d,1efed86217f7,1efed86217f7..f628071f6605
--- a/drivers/clk/imx/clk.c
+++ b/drivers/clk/imx/clk.c
@@@@@@@ -1,7 -1,6 -1,6 -1,7 -1,6 -1,6 +1,8 @@@@@@@
      // SPDX-License-Identifier: GPL-2.0
      #include <linux/clk.h>
+++ ++#include <linux/clk-provider.h>
      #include <linux/err.h>
 +++++#include <linux/io.h>
      #include <linux/of.h>
      #include <linux/slab.h>
      #include <linux/spinlock.h>