Merge branch 'clk-parent-rewrite-1' into clk-next

 - Rewrite how clk parents can be specified to be DT/clkdev based instead
   of just string based

* clk-parent-rewrite-1:
  clk: Cache core in clk_fetch_parent_index() without names
  clk: fixed-factor: Initialize clk_init_data on stack
  clk: fixed-factor: Let clk framework find parent
  clk: Allow parents to be specified via clkspec index
  clk: Look for parents with clkdev based clk_lookups
  clk: Allow parents to be specified without string names
  clk: Add of_clk_hw_register() API for early clk drivers
  driver core: Let dev_of_node() accept a NULL dev
  clk: Prepare for clk registration API that uses DT nodes
  clkdev: Move clk creation outside of 'clocks_mutex'

diff --cc drivers/clk/clk-fixed-factor.c
index 8aac2d1b6feac260f962b8cfab4bbcbdf022d00f,2d988a7585d50c5358c97e976cdf7a23f31db22d..8b343e59dc616e959a78463941868500c7b9da53
--- 1/drivers/clk/clk-fixed-factor.c
--- 2/drivers/clk/clk-fixed-factor.c
+++ b/drivers/clk/clk-fixed-factor.c
@@@ -84,8 -86,11 +86,11 @@@ __clk_hw_register_fixed_factor(struct d
  
        init.name = name;
        init.ops = &clk_fixed_factor_ops;
 -      init.flags = flags | CLK_IS_BASIC;
 +      init.flags = flags;
-       init.parent_names = &parent_name;
+       if (parent_name)
+               init.parent_names = &parent_name;
+       else
+               init.parent_data = &pdata;
        init.num_parents = 1;
  
        hw = &fix->hw;

diff --cc drivers/clk/clk.c
index 3e1708747cd2821573175d0dd0dae1955a744dce,dcb7e1cddd2de4b92555e456fe9c4a352db80f8a..aa51756fd4d695b359ee5c6117e7c9d00fddf183
--- 1/drivers/clk/clk.c
--- 2/drivers/clk/clk.c
+++ b/drivers/clk/clk.c
@@@ -3428,6 -3591,22 +3591,24 @@@ fail_name
  fail_out:
        return ERR_PTR(ret);
  }
 - * clk_register is the primary interface for populating the clock tree with new
 - * clock nodes.  It returns a pointer to the newly allocated struct clk which
+ 
+ /**
+  * clk_register - allocate a new clock, register it and return an opaque cookie
+  * @dev: device that is registering this clock
+  * @hw: link to hardware-specific clock data
+  *
++ * clk_register is the *deprecated* interface for populating the clock tree with
++ * new clock nodes. Use clk_hw_register() instead.
++ *
++ * Returns: a pointer to the newly allocated struct clk which
+  * cannot be dereferenced by driver code but may be used in conjunction with the
+  * rest of the clock API.  In the event of an error clk_register will return an
+  * error code; drivers must test for an error code after calling clk_register.
+  */
+ struct clk *clk_register(struct device *dev, struct clk_hw *hw)
+ {
+       return __clk_register(dev, dev_of_node(dev), hw);
+ }
  EXPORT_SYMBOL_GPL(clk_register);
  
  /**

diff --cc include/linux/clk-provider.h
Simple merge

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