From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 11 Dec 2012 19:25:08 +0000 (-0800)
Subject: Merge tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=93874681aa3f538a2b9d59a6c5b7c0e882a36978;p=GitHub%2FLineageOS%2Fandroid_kernel_motorola_exynos9610.git

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

Pull clock framework changes from Mike Turquette:
 "The common clock framework changes for 3.8 are comprised of lots of
  fixes for existing platforms as well as new ports for some ARM
  platforms.  In addition there are new clk drivers for audio devices
  and MFDs."

Fix up trivial conflict in <linux/clk-provider.h> (removal of 'inline'
clashing with return type fixes)

* tag 'clk-for-linus' of git://git.linaro.org/people/mturquette/linux: (51 commits)
  MAINTAINERS: bad email address for Mike Turquette
  clk: introduce optional disable_unused callback
  clk: ux500: fix bit error
  clk: clock multiplexers may register out of order
  clk: ux500: Initial support for abx500 clock driver
  CLK: SPEAr: Remove unused dummy apb_pclk
  CLK: SPEAr: Correct index scanning done for clock synths
  CLK: SPEAr: Update clock rate table
  CLK: SPEAr: Add missing clocks
  CLK: SPEAr: Set CLK_SET_RATE_PARENT for few clocks
  CLK: SPEAr13xx: fix parent names of multiple clocks
  CLK: SPEAr13xx: Fix mux clock names
  CLK: SPEAr: Fix dev_id & con_id for multiple clocks
  clk: move IM-PD1 clocks to drivers/clk
  clk: make ICST driver handle the VCO registers
  clk: add GPLv2 headers to the Versatile clock files
  clk: mxs: Use a better name for the USB PHY clock
  clk: spear: Add stub functions for spear3[0|1|2]0_clk_init()
  CLK: clk-twl6040: fix return value check in twl6040_clk_probe()
  clk: ux500: Register nomadik keypad clock lookups for u8500
  ...
---

93874681aa3f538a2b9d59a6c5b7c0e882a36978
diff --cc include/linux/clk-provider.h
index f9f5e9eeb9dd,1c94d18514e2..4989b8a7bed1
--- a/include/linux/clk-provider.h
+++ b/include/linux/clk-provider.h
@@@ -335,11 -347,11 +347,11 @@@ const char *__clk_get_name(struct clk *
  struct clk_hw *__clk_get_hw(struct clk *clk);
  u8 __clk_get_num_parents(struct clk *clk);
  struct clk *__clk_get_parent(struct clk *clk);
- int __clk_get_enable_count(struct clk *clk);
- int __clk_get_prepare_count(struct clk *clk);
 -inline unsigned int __clk_get_enable_count(struct clk *clk);
 -inline unsigned int __clk_get_prepare_count(struct clk *clk);
++unsigned int __clk_get_enable_count(struct clk *clk);
++unsigned int __clk_get_prepare_count(struct clk *clk);
  unsigned long __clk_get_rate(struct clk *clk);
  unsigned long __clk_get_flags(struct clk *clk);
- int __clk_is_enabled(struct clk *clk);
+ bool __clk_is_enabled(struct clk *clk);
  struct clk *__clk_lookup(const char *name);
  
  /*