Merge tag 'clk-for-linus-3.10' of git://git.linaro.org/people/mturquette/linux

Pull clock framework update from Michael Turquette:
 "The common clock framework changes for 3.10 include many fixes for
  existing platforms, as well as adoption of the framework by new
  platforms and devices.

  Some long-needed fixes to the core framework are here as well as new
  features such as improved initialization of clocks from DT as well as
  framework reentrancy for nested clock operations."

* tag 'clk-for-linus-3.10' of git://git.linaro.org/people/mturquette/linux: (44 commits)
  clk: add clk_ignore_unused option to keep boot clocks on
  clk: ux500: fix mismatched types
  clk: vexpress: Add separate SP810 driver
  clk: si5351: make clk-si5351 depend on CONFIG_OF
  clk: export __clk_get_flags for modular clock providers
  clk: vt8500: Missing breaks in vtwm_pll_round_rate/_set_rate.
  clk: sunxi: Unify oscillator clock
  clk: composite: allow fixed rates & fixed dividers
  clk: composite: rename 'div' references to 'rate'
  clk: add si5351 i2c common clock driver
  clk: add device tree fixed-factor-clock binding support
  clk: Properly handle notifier return values
  clk: ux500: abx500: Define clock tree for ab850x
  clk: ux500: Add support for sysctrl clocks
  clk: mvebu: Fix valid value range checking for cpu_freq_select
  clk: Fixup locking issues for clk_set_parent
  clk: Fixup errorhandling for clk_set_parent
  clk: Restructure code for __clk_reparent
  clk: sunxi: drop an unnecesary kmalloc
  clk: sunxi: drop CLK_IGNORE_UNUSED
  ...

diff --combined Documentation/devicetree/bindings/vendor-prefixes.txt
index 3b3b0194adfe9867d9f7cdafd9ad1a2c10096cfd,ca608496507bf533604790fa408fc78c945c0d92..4d1919bf23322ac2209eb3046bfce404c5ced483
--- 1/Documentation/devicetree/bindings/vendor-prefixes.txt
--- 2/Documentation/devicetree/bindings/vendor-prefixes.txt
+++ b/Documentation/devicetree/bindings/vendor-prefixes.txt
@@@ -5,7 -5,6 +5,7 @@@ using them to avoid name-space collisio
  
  ad    Avionic Design GmbH
  adi   Analog Devices, Inc.
 +aeroflexgaisler       Aeroflex Gaisler AB
  ak    Asahi Kasei Corp.
  amcc  Applied Micro Circuits Corporation (APM, formally AMCC)
  apm   Applied Micro Circuits Corporation (APM)
@@@ -49,6 -48,7 +49,7 @@@ samsung       Samsung Semiconducto
  sbs   Smart Battery System
  schindler     Schindler
  sil   Silicon Image
+ silabs        Silicon Laboratories
  simtek
  sirf  SiRF Technology, Inc.
  snps  Synopsys, Inc.

diff --combined Documentation/kernel-parameters.txt
index 5abc09a93bc274d5c2453b6038a6cfba8f215c13,9aa5562fed9cf03e868348f3ace7e1d01e1730ed..365f7bd40eebd3bf5b697d8a76f2641752c3852c
--- 1/Documentation/kernel-parameters.txt
--- 2/Documentation/kernel-parameters.txt
+++ b/Documentation/kernel-parameters.txt
@@@ -44,6 -44,7 +44,7 @@@ parameter is applicable
        AVR32   AVR32 architecture is enabled.
        AX25    Appropriate AX.25 support is enabled.
        BLACKFIN Blackfin architecture is enabled.
+       CLK     Common clock infrastructure is enabled.
        DRM     Direct Rendering Management support is enabled.
        DYNAMIC_DEBUG Build in debug messages and enable them at runtime
        EDD     BIOS Enhanced Disk Drive Services (EDD) is enabled
@@@ -320,13 -321,6 +321,13 @@@ bytes respectively. Such letter suffixe
                        on: enable for both 32- and 64-bit processes
                        off: disable for both 32- and 64-bit processes
  
 +      alloc_snapshot  [FTRACE]
 +                      Allocate the ftrace snapshot buffer on boot up when the
 +                      main buffer is allocated. This is handy if debugging
 +                      and you need to use tracing_snapshot() on boot up, and
 +                      do not want to use tracing_snapshot_alloc() as it needs
 +                      to be done where GFP_KERNEL allocations are allowed.
 +
        amd_iommu=      [HW,X86-64]
                        Pass parameters to the AMD IOMMU driver in the system.
                        Possible values are:
@@@ -472,6 -466,13 +473,13 @@@
  
        cio_ignore=     [S390]
                        See Documentation/s390/CommonIO for details.
+       clk_ignore_unused
+                       [CLK]
+                       Keep all clocks already enabled by bootloader on,
+                       even if no driver has claimed them. This is useful
+                       for debug and development, but should not be
+                       needed on a platform with proper driver support.
+                       For more information, see Documentation/clk.txt.
  
        clock=          [BUGS=X86-32, HW] gettimeofday clocksource override.
                        [Deprecated]
@@@ -603,6 -604,9 +611,6 @@@
                        is selected automatically. Check
                        Documentation/kdump/kdump.txt for further details.
  
 -      crashkernel_low=size[KMG]
 -                      [KNL, x86] parts under 4G.
 -
        crashkernel=range1:size1[,range2:size2,...][@offset]
                        [KNL] Same as above, but depends on the memory
                        in the running system. The syntax of range is
@@@ -610,26 -614,6 +618,26 @@@
                        a memory unit (amount[KMG]). See also
                        Documentation/kdump/kdump.txt for an example.
  
 +      crashkernel=size[KMG],high
 +                      [KNL, x86_64] range could be above 4G. Allow kernel
 +                      to allocate physical memory region from top, so could
 +                      be above 4G if system have more than 4G ram installed.
 +                      Otherwise memory region will be allocated below 4G, if
 +                      available.
 +                      It will be ignored if crashkernel=X is specified.
 +      crashkernel=size[KMG],low
 +                      [KNL, x86_64] range under 4G. When crashkernel=X,high
 +                      is passed, kernel could allocate physical memory region
 +                      above 4G, that cause second kernel crash on system
 +                      that require some amount of low memory, e.g. swiotlb
 +                      requires at least 64M+32K low memory.  Kernel would
 +                      try to allocate 72M below 4G automatically.
 +                      This one let user to specify own low range under 4G
 +                      for second kernel instead.
 +                      0: to disable low allocation.
 +                      It will be ignored when crashkernel=X,high is not used
 +                      or memory reserved is below 4G.
 +
        cs89x0_dma=     [HW,NET]
                        Format: <dma>
  
@@@ -812,12 -796,6 +820,12 @@@
        edd=            [EDD]
                        Format: {"off" | "on" | "skip[mbr]"}
  
 +      efi_no_storage_paranoia [EFI; X86]
 +                      Using this parameter you can use more than 50% of
 +                      your efi variable storage. Use this parameter only if
 +                      you are really sure that your UEFI does sane gc and
 +                      fulfills the spec otherwise your board may brick.
 +
        eisa_irq_edge=  [PARISC,HW]
                        See header of drivers/parisc/eisa.c.
  

diff --combined drivers/clk/clk-vt8500.c
index 09c63315e57979f8d726f627279f0e5e88e94c3f,6bc82d1bfe789fd12ac6554360bb15c305485aed..debf688afa8e503c4dba690b5cfffe983c7abae0
--- 1/drivers/clk/clk-vt8500.c
--- 2/drivers/clk/clk-vt8500.c
+++ b/drivers/clk/clk-vt8500.c
@@@ -157,7 -157,7 +157,7 @@@ static int vt8500_dclk_set_rate(struct 
        divisor =  parent_rate / rate;
  
        /* If prate / rate would be decimal, incr the divisor */
 -      if (rate * divisor < *prate)
 +      if (rate * divisor < parent_rate)
                divisor++;
  
        if (divisor == cdev->div_mask + 1)
@@@ -488,6 -488,7 +488,7 @@@ static int vtwm_pll_set_rate(struct clk
        case PLL_TYPE_WM8750:
                wm8750_find_pll_bits(rate, parent_rate, &filter, &mul, &div1, &div2);
                pll_val = WM8750_BITS_TO_VAL(filter, mul, div1, div2);
+               break;
        default:
                pr_err("%s: invalid pll type\n", __func__);
                return 0;
@@@ -523,6 -524,7 +524,7 @@@ static long vtwm_pll_round_rate(struct 
        case PLL_TYPE_WM8750:
                wm8750_find_pll_bits(rate, *prate, &filter, &mul, &div1, &div2);
                round_rate = WM8750_BITS_TO_FREQ(*prate, mul, div1, div2);
+               break;
        default:
                round_rate = 0;
        }