From: Stephen Boyd <sboyd@kernel.org>
Date: Mon, 4 Jun 2018 19:32:33 +0000 (-0700)
Subject: Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk... 
X-Git-Tag: Ubuntu-5.2.0-15.16~4227^2~4
X-Git-Url: https://git.proxmox.com/?a=commitdiff_plain;h=36851edd7ea96ac74266de27b2ff7870e14563c8;p=mirror_ubuntu-eoan-kernel.git

Merge branches 'clk-match-string', 'clk-ingenic', 'clk-si544-round-fix' and 'clk-bcm-stingray' into clk-next

* 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
---

36851edd7ea96ac74266de27b2ff7870e14563c8
diff --cc drivers/clk/clk.c
index f9deb2f9b95d,b7d1a5634164,ea67ac81c6f9,ea67ac81c6f9,ea67ac81c6f9..940347e38c16
--- a/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);
     }
     
     /**