From: Stephen Boyd <sboyd@kernel.org>
Date: Thu, 18 Oct 2018 22:41:21 +0000 (-0700)
Subject: Merge branch 'clk-ti' into clk-next
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8a69f1d4707a69faab58d9735c2cb1898140124a;p=linux.git

Merge branch 'clk-ti' into clk-next

* clk-ti:
  clk: ti: Prepare for remove of OF node name
  clk: Clean up suspend/resume coding style
  clk: ti: Add functions to save/restore clk context
  clk: clk: Add clk_gate_restore_context function
  clk: Add functions to save/restore clock context en-masse
  clk: ti: dra7: add new clkctrl data
  clk: ti: dra7xx: rename existing clkctrl data as compat data
  clk: ti: am43xx: add new clkctrl data for am43xx
  clk: ti: am43xx: rename existing clkctrl data as compat data
  clk: ti: am33xx: add new clkctrl data for am33xx
  clk: ti: am33xx: rename existing clkctrl data as compat data
  clk: ti: clkctrl: replace dashes from clkdm name with underscore
  clk: ti: clkctrl: support multiple clkctrl nodes under a cm node
  dt-bindings: clock: dra7xx: add clkctrl indices for new data layout
  dt-bindings: clock: am43xx: add clkctrl indices for new data layout
  dt-bindings: clock: am33xx: add clkctrl indices for new data layout
---

8a69f1d4707a69faab58d9735c2cb1898140124a
diff --cc drivers/clk/ti/clkctrl.c
index 240e911a3db9e,853a5e650ff7e..469f560ae1cf7
--- a/drivers/clk/ti/clkctrl.c
+++ b/drivers/clk/ti/clkctrl.c
@@@ -259,8 -259,13 +259,13 @@@ _ti_clkctrl_clk_register(struct omap_cl
  	struct omap_clkctrl_clk *clkctrl_clk;
  	int ret = 0;
  
- 	init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d", node->parent,
- 			      node, offset, bit);
+ 	if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
 -		init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
 -				      node->parent->name, node->name, offset,
++		init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
++				      node->parent, node, offset,
+ 				      bit);
+ 	else
 -		init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d", node->name,
++		init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d", node,
+ 				      offset, bit);
  	clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
  	if (!init.name || !clkctrl_clk) {
  		ret = -ENOMEM;
@@@ -537,9 -588,13 +588,13 @@@ static void __init _ti_omap4_clkctrl_se
  		init.flags = 0;
  		if (reg_data->flags & CLKF_SET_RATE_PARENT)
  			init.flags |= CLK_SET_RATE_PARENT;
- 		init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
- 				      node->parent, node,
- 				      reg_data->offset, 0);
+ 		if (ti_clk_get_features()->flags & TI_CLK_CLKCTRL_COMPAT)
 -			init.name = kasprintf(GFP_KERNEL, "%s:%s:%04x:%d",
 -					      node->parent->name, node->name,
++			init.name = kasprintf(GFP_KERNEL, "%pOFn:%pOFn:%04x:%d",
++					      node->parent, node,
+ 					      reg_data->offset, 0);
+ 		else
 -			init.name = kasprintf(GFP_KERNEL, "%s:%04x:%d",
 -					      node->name, reg_data->offset, 0);
++			init.name = kasprintf(GFP_KERNEL, "%pOFn:%04x:%d",
++					      node, reg_data->offset, 0);
  		clkctrl_clk = kzalloc(sizeof(*clkctrl_clk), GFP_KERNEL);
  		if (!init.name || !clkctrl_clk)
  			goto cleanup;