Merge tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux

Pull clk updates from Stephen Boyd:
 "The clk changes for this release cycle are mostly dominated by new
  device support in terms of LoC, but there has been some cleanup in the
  core as well as the usual minor clk additions to various drivers.

  Core:
   - parent tracking has been simplified
   - CLK_IS_ROOT is now a no-op flag, cleaning up drivers has started
   - of_clk_init() doesn't consider disabled DT nodes anymore
   - clk_unregister() had an error path bug squashed
   - of_clk_get_parent_count() has been fixed to only return unsigned ints
   - HAVE_MACH_CLKDEV is removed now that the last arch user (ARM) is gone

  New Drivers:
   - NXP LPC18xx creg
   - QCOM IPQ4019 GCC
   - TI dm814x ADPLL
   - i.MX6QP

  Updates:
   - Cyngus audio clks found on Broadcom iProc devices
   - Non-critical fixes for BCM2385 PLLs
   - Samsung exynos5433 updates for clk id errors, HDMI support,
     suspend/resume simplifications
   - USB, CAN, LVDS, and FCP clks on shmobile devices
   - sunxi got support for more clks on new SoCs and went through a
     minor refactoring/rewrite to use a simpler factor clk construct
   - rockchip added some more clk ids and added suport for fraction
     dividers
   - QCOM GDSCs in msm8996
   - A new devm helper to make adding custom actions simpler (acked by Greg)"

* tag 'clk-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux: (197 commits)
  clk: bcm2835: fix check of error code returned by devm_ioremap_resource()
  clk: renesas: div6: use RENESAS for #define
  clk: renesas: Rename header file renesas.h
  clk: max77{686,802}: Remove CLK_IS_ROOT
  clk: versatile: Remove CLK_IS_ROOT
  clk: sunxi: Remove use of variable length array
  clk: fixed-rate: Remove CLK_IS_ROOT
  clk: qcom: Remove CLK_IS_ROOT
  doc: dt: add documentation for lpc1850-creg-clk driver
  clk: add lpc18xx creg clk driver
  clk: lpc32xx: fix compilation warning
  clk: xgene: Add missing parenthesis when clearing divider value
  clk: mb86s7x: Remove CLK_IS_ROOT
  clk: x86: Remove clkdev.h and clk.h includes
  clk: x86: Remove CLK_IS_ROOT
  clk: mvebu: Remove CLK_IS_ROOT
  clk: renesas: move drivers to renesas directory
  clk: si5{14,351,70}: Remove CLK_IS_ROOT
  clk: scpi: Remove CLK_IS_ROOT
  clk: s2mps11: Remove CLK_IS_ROOT
  ...

diff --cc arch/arm/boot/dts/rk3288-veyron.dtsi
Simple merge

diff --cc arch/arm/mach-mvebu/Kconfig
Simple merge

diff --cc arch/arm/mach-shmobile/setup-rcar-gen2.c
Simple merge

diff --cc arch/mips/Kconfig
Simple merge

diff --cc drivers/clk/at91/clk-generated.c
index 4ad3298,f82b16a..e1aa210
--- 1/drivers/clk/at91/clk-generated.c
--- 2/drivers/clk/at91/clk-generated.c
+++ b/drivers/clk/at91/clk-generated.c
@@@ -277,10 -272,9 +277,10 @@@ void __init of_sama5d2_clk_generated_se
        const char *parent_names[GENERATED_SOURCE_MAX];
        struct device_node *gcknp;
        struct clk_range range = CLK_RANGE(0, 0);
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > GENERATED_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > GENERATED_SOURCE_MAX)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/at91/clk-main.c
index 4bfc94d,b9bdfd8..58b5bac
--- 1/drivers/clk/at91/clk-main.c
--- 2/drivers/clk/at91/clk-main.c
+++ b/drivers/clk/at91/clk-main.c
@@@ -291,10 -315,11 +291,10 @@@ at91_clk_register_main_rc_osc(struct re
        init.ops = &main_rc_osc_ops;
        init.parent_names = NULL;
        init.num_parents = 0;
-       init.flags = CLK_IS_ROOT | CLK_IGNORE_UNUSED;
+       init.flags = CLK_IGNORE_UNUSED;
  
        osc->hw.init = &init;
 -      osc->pmc = pmc;
 -      osc->irq = irq;
 +      osc->regmap = regmap;
        osc->frequency = frequency;
        osc->accuracy = accuracy;
  
@@@ -572,12 -611,12 +572,12 @@@ static void __init of_at91sam9x5_clk_ma
  {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
 -      unsigned int irq;
        const char *name = np->name;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > 2)
+       if (num_parents == 0 || num_parents > 2)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/at91/clk-master.c
index 7d4a186,016fe11..d1021e1
--- 1/drivers/clk/at91/clk-master.c
--- 2/drivers/clk/at91/clk-master.c
+++ b/drivers/clk/at91/clk-master.c
@@@ -199,14 -221,14 +199,14 @@@ of_at91_clk_master_setup(struct device_
                         const struct clk_master_layout *layout)
  {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
 -      unsigned int irq;
        const char *parent_names[MASTER_SOURCE_MAX];
        const char *name = np->name;
        struct clk_master_characteristics *characteristics;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > MASTER_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > MASTER_SOURCE_MAX)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/at91/clk-programmable.c
index bc0be62,b955fb8..10f846c
--- 1/drivers/clk/at91/clk-programmable.c
--- 2/drivers/clk/at91/clk-programmable.c
+++ b/drivers/clk/at91/clk-programmable.c
@@@ -234,10 -236,9 +234,10 @@@ of_at91_clk_prog_setup(struct device_no
        const char *parent_names[PROG_SOURCE_MAX];
        const char *name;
        struct device_node *progclknp;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > PROG_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > PROG_SOURCE_MAX)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/at91/clk-slow.c
index 911e941,402b45d..61090b1
--- 1/drivers/clk/at91/clk-slow.c
--- 2/drivers/clk/at91/clk-slow.c
+++ b/drivers/clk/at91/clk-slow.c
@@@ -433,9 -437,8 +433,9 @@@ static void __init of_at91sam9260_clk_s
  {
        struct clk *clk;
        const char *parent_names[2];
-       int num_parents;
+       unsigned int num_parents;
        const char *name = np->name;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
        if (num_parents != 2)

diff --cc drivers/clk/at91/clk-smd.c
index e6948a5,f525830..3c04b06
--- 1/drivers/clk/at91/clk-smd.c
--- 2/drivers/clk/at91/clk-smd.c
+++ b/drivers/clk/at91/clk-smd.c
@@@ -139,16 -141,16 +139,16 @@@ at91sam9x5_clk_register_smd(struct regm
        return clk;
  }
  
 -void __init of_at91sam9x5_clk_smd_setup(struct device_node *np,
 -                                      struct at91_pmc *pmc)
 +static void __init of_at91sam9x5_clk_smd_setup(struct device_node *np)
  {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[SMD_SOURCE_MAX];
        const char *name = np->name;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > SMD_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > SMD_SOURCE_MAX)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/at91/clk-usb.c
index 650ca45,be1c7f5..d80bdb0
--- 1/drivers/clk/at91/clk-usb.c
--- 2/drivers/clk/at91/clk-usb.c
+++ b/drivers/clk/at91/clk-usb.c
@@@ -363,16 -369,16 +363,16 @@@ at91rm9200_clk_register_usb(struct regm
        return clk;
  }
  
 -void __init of_at91sam9x5_clk_usb_setup(struct device_node *np,
 -                                      struct at91_pmc *pmc)
 +static void __init of_at91sam9x5_clk_usb_setup(struct device_node *np)
  {
        struct clk *clk;
-       int num_parents;
+       unsigned int num_parents;
        const char *parent_names[USB_SOURCE_MAX];
        const char *name = np->name;
 +      struct regmap *regmap;
  
        num_parents = of_clk_get_parent_count(np);
-       if (num_parents <= 0 || num_parents > USB_SOURCE_MAX)
+       if (num_parents == 0 || num_parents > USB_SOURCE_MAX)
                return;
  
        of_clk_parent_fill(np, parent_names, num_parents);

diff --cc drivers/clk/pxa/clk-pxa25x.c
Simple merge

diff --cc drivers/clk/pxa/clk-pxa27x.c
Simple merge

diff --cc drivers/clk/pxa/clk-pxa3xx.c
Simple merge

diff --cc drivers/clk/rockchip/clk-rk3036.c
Simple merge

diff --cc include/linux/device.h
Simple merge