From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 8 Jun 2014 03:27:30 +0000 (-0700)
Subject: Merge tag 'clk-for-linus-3.16' of git://git.linaro.org/people/mike.turquette/linux... 
X-Git-Tag: next-20140610~96^2
X-Git-Url: https://git.kernelconcepts.de/?a=commitdiff_plain;h=1a5700bc2d10cd379a795fd2bb377a190af5acd4;p=karo-tx-linux.git

Merge tag 'clk-for-linus-3.16' of git://git.linaro.org/people/mike.turquette/linux into next

Pull clock framework updates from Mike Turquette:
 "The clock framework changes for 3.16 are pretty typical: mostly clock
  driver additions and fixes.  There are additions to the clock core
  code for some of the basic types (e.g. the common divider type has
  some fixes and featured added to it).

  One minor annoyance is a last-minute dependency that wasn't handled
  quite right.  Commit ba0fae3b06a6 ("clk: berlin: add core clock driver
  for BG2/BG2CD") in this pull request depends on
  include/dt-bindings/clock/berlin2.h, which is already in your tree via
  the arm-soc pull request.  Building for the berlin platform will break
  when the clk tree is built on it's own, but merged into your master
  branch everything should be fine"

* tag 'clk-for-linus-3.16' of git://git.linaro.org/people/mike.turquette/linux: (75 commits)
  mmc: sunxi: Add driver for SD/MMC hosts found on Allwinner sunxi SoCs
  clk: export __clk_round_rate for providers
  clk: versatile: free icst on error return
  clk: qcom: Return error pointers for unimplemented clocks
  clk: qcom: Support msm8974pro global clock control hardware
  clk: qcom: Properly support display clocks on msm8974
  clk: qcom: Support display RCG clocks
  clk: qcom: Return highest rate when round_rate() exceeds plan
  clk: qcom: Fix mmcc-8974's PLL configurations
  clk: qcom: Fix clk_rcg2_is_enabled() check
  clk: berlin: add core clock driver for BG2Q
  clk: berlin: add core clock driver for BG2/BG2CD
  clk: berlin: add driver for BG2x complex divider cells
  clk: berlin: add driver for BG2x simple PLLs
  clk: berlin: add driver for BG2x audio/video PLL
  clk: st: Terminate of match table
  clk/exynos4: Fix compilation warning
  ARM: shmobile: r8a7779: Add clock index macros for DT sources
  clk: divider: Fix overflow in clk_divider_bestdiv
  clk: u300: Terminate of match table
  ...
---

1a5700bc2d10cd379a795fd2bb377a190af5acd4
diff --cc Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
index 6c3c0847e4fd,30df825d72ef..8a92b5fb3540
--- a/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
+++ b/Documentation/devicetree/bindings/clock/renesas,cpg-mstp-clocks.txt
@@@ -10,7 -10,7 +10,8 @@@ index in the group, from 0 to 31
  Required Properties:
  
    - compatible: Must be one of the following
 +    - "renesas,r7s72100-mstp-clocks" for R7S72100 (RZ) MSTP gate clocks
+     - "renesas,r8a7779-mstp-clocks" for R8A7779 (R-Car H1) MSTP gate clocks
      - "renesas,r8a7790-mstp-clocks" for R8A7790 (R-Car H2) MSTP gate clocks
      - "renesas,r8a7791-mstp-clocks" for R8A7791 (R-Car M2) MSTP gate clocks
      - "renesas,cpg-mstp-clock" for generic MSTP gate clocks
diff --cc drivers/mmc/host/Kconfig
index b675882307e4,d50ac1ca11ea..779368b683d0
--- a/drivers/mmc/host/Kconfig
+++ b/drivers/mmc/host/Kconfig
@@@ -695,9 -695,9 +695,16 @@@ config MMC_REALTEK_PC
  	  Say Y here to include driver code to support SD/MMC card interface
  	  of Realtek PCI-E card reader
  
 +config MMC_REALTEK_USB
 +	tristate "Realtek USB SD/MMC Card Interface Driver"
 +	depends on MFD_RTSX_USB
 +	help
 +	  Say Y here to include driver code to support SD/MMC card interface
 +	  of Realtek RTS5129/39 series card reader
++
+ config MMC_SUNXI
+ 	tristate "Allwinner sunxi SD/MMC Host Controller support"
+ 	depends on ARCH_SUNXI
+ 	help
+ 	  This selects support for the SD/MMC Host Controller on
+ 	  Allwinner sunxi SoCs.
diff --cc drivers/mmc/host/Makefile
index 3eb48b656f25,3072bfb6d26a..61cbc241935b
--- a/drivers/mmc/host/Makefile
+++ b/drivers/mmc/host/Makefile
@@@ -50,9 -50,9 +50,10 @@@ obj-$(CONFIG_MMC_JZ4740)	+= jz4740_mmc.
  obj-$(CONFIG_MMC_VUB300)	+= vub300.o
  obj-$(CONFIG_MMC_USHC)		+= ushc.o
  obj-$(CONFIG_MMC_WMT)		+= wmt-sdmmc.o
+ obj-$(CONFIG_MMC_SUNXI)		+= sunxi-mmc.o
  
  obj-$(CONFIG_MMC_REALTEK_PCI)	+= rtsx_pci_sdmmc.o
 +obj-$(CONFIG_MMC_REALTEK_USB)	+= rtsx_usb_sdmmc.o
  
  obj-$(CONFIG_MMC_SDHCI_PLTFM)		+= sdhci-pltfm.o
  obj-$(CONFIG_MMC_SDHCI_CNS3XXX)		+= sdhci-cns3xxx.o