Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk...

* clk-match-string:
  clk: use match_string() helper
  clk: bcm2835: use match_string() helper

* clk-ingenic:
  clk: ingenic: jz4770: Add 150us delay after enabling VPU clock
  clk: ingenic: jz4770: Enable power of AHB1 bus after ungating VPU clock
  clk: ingenic: jz4770: Modify C1CLK clock to disable CPU clock stop on idle
  clk: ingenic: jz4770: Change OTG from custom to standard gated clock
  clk: ingenic: Support specifying "wait for clock stable" delay
  clk: ingenic: Add support for clocks whose gate bit is inverted

* clk-si544-round-fix:
  clk-si544: Properly round requested frequency to nearest match

* clk-bcm-stingray:
  clk: bcm: Update and add Stingray clock entries
  dt-bindings: clk: Update Stingray binding doc

diff --cc drivers/clk/bcm/clk-bcm2835.c
Simple merge

diff --cc drivers/clk/clk.c
index f9deb2f9b95d713cd56f4f6e50b56ee14b9f9a1c,b7d1a563416427e94b42737aaaa8b56fbbe719b3,ea67ac81c6f97db113cef4977936776d1673ae3f,ea67ac81c6f97db113cef4977936776d1673ae3f,ea67ac81c6f97db113cef4977936776d1673ae3f..940347e38c1684416c98e6f2f907eeeda8962e86
--- 1/drivers/clk/clk.c
--- 2/drivers/clk/clk.c
--- 3/drivers/clk/clk.c
--- 4/drivers/clk/clk.c
--- 5/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@@@@@ -2613,31 -2604,81 -2608,81 -2608,81 -2608,81 +2609,31 @@@@@@ static int possible_parents_show(struc
     }
     DEFINE_SHOW_ATTRIBUTE(possible_parents);
     
 ----static int clk_debug_create_one(struct clk_core *core, struct dentry *pdentry)
 ++++static void clk_debug_create_one(struct clk_core *core, struct dentry *pdentry)
     {
 ----   struct dentry *d;
 ----   int ret = -ENOMEM;
 ----
 ----   if (!core || !pdentry) {
 ----           ret = -EINVAL;
 ----           goto out;
 ----   }
 ----
 ----   d = debugfs_create_dir(core->name, pdentry);
 ----   if (!d)
 ----           goto out;
 -   
 -      core->dentry = d;
 -   
 -      d = debugfs_create_ulong("clk_rate", 0444, core->dentry, &core->rate);
 -      if (!d)
 -              goto err_out;
 -   
 -      d = debugfs_create_ulong("clk_accuracy", 0444, core->dentry,
 -                               &core->accuracy);
 -      if (!d)
 -              goto err_out;
 -   
 -      d = debugfs_create_u32("clk_phase", 0444, core->dentry, &core->phase);
 -      if (!d)
 -              goto err_out;
 ++++   struct dentry *root;
     
  ---   core->dentry = d;
  ---
  ---   d = debugfs_create_ulong("clk_rate", 0444, core->dentry, &core->rate);
  ---   if (!d)
  ---           goto err_out;
  ---
  ---   d = debugfs_create_ulong("clk_accuracy", 0444, core->dentry,
  ---                            &core->accuracy);
  ---   if (!d)
  ---           goto err_out;
  ---
  ---   d = debugfs_create_u32("clk_phase", 0444, core->dentry, &core->phase);
  ---   if (!d)
  ---           goto err_out;
  ---
 ----   d = debugfs_create_file("clk_flags", 0444, core->dentry, core,
 ----                           &clk_flags_fops);
 ----   if (!d)
 ----           goto err_out;
 ----
 ----   d = debugfs_create_u32("clk_prepare_count", 0444, core->dentry,
 ----                          &core->prepare_count);
 ----   if (!d)
 ----           goto err_out;
 ----
 ----   d = debugfs_create_u32("clk_enable_count", 0444, core->dentry,
 ----                          &core->enable_count);
 ----   if (!d)
 ----           goto err_out;
 ----
 ----   d = debugfs_create_u32("clk_protect_count", 0444, core->dentry,
 ----                          &core->protect_count);
 ----   if (!d)
 ----           goto err_out;
 ----
 ----   d = debugfs_create_u32("clk_notifier_count", 0444, core->dentry,
 ----                          &core->notifier_count);
 ----   if (!d)
 ----           goto err_out;
 ++++   if (!core || !pdentry)
 ++++           return;
     
 ----   if (core->num_parents > 1) {
 ----           d = debugfs_create_file("clk_possible_parents", 0444,
 ----                           core->dentry, core, &possible_parents_fops);
 ----           if (!d)
 ----                   goto err_out;
 ----   }
 ++++   root = debugfs_create_dir(core->name, pdentry);
 ++++   core->dentry = root;
     
 ----   if (core->ops->debug_init) {
 ----           ret = core->ops->debug_init(core->hw, core->dentry);
 ----           if (ret)
 ----                   goto err_out;
 ----   }
 ++++   debugfs_create_ulong("clk_rate", 0444, root, &core->rate);
 ++++   debugfs_create_ulong("clk_accuracy", 0444, root, &core->accuracy);
 ++++   debugfs_create_u32("clk_phase", 0444, root, &core->phase);
 ++++   debugfs_create_file("clk_flags", 0444, root, core, &clk_flags_fops);
 ++++   debugfs_create_u32("clk_prepare_count", 0444, root, &core->prepare_count);
 ++++   debugfs_create_u32("clk_enable_count", 0444, root, &core->enable_count);
 ++++   debugfs_create_u32("clk_protect_count", 0444, root, &core->protect_count);
 ++++   debugfs_create_u32("clk_notifier_count", 0444, root, &core->notifier_count);
     
 ----   ret = 0;
 ----   goto out;
 ++++   if (core->num_parents > 1)
 ++++           debugfs_create_file("clk_possible_parents", 0444, root, core,
 ++++                               &possible_parents_fops);
     
 ----err_out:
 ----   debugfs_remove_recursive(core->dentry);
 ----   core->dentry = NULL;
 ----out:
 ----   return ret;
 ++++   if (core->ops->debug_init)
 ++++           core->ops->debug_init(core->hw, core->dentry);
     }
     
     /**