Linus Torvalds 1a5700bc2d 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. ba0fae3 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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) iQIcBAABAgAGBQJTkhd7AAoJEDqPOy9afJhJ/kAQAKJt4slFYNW5t69HBmqlfkxR 1Y61KqTaZiJ2XNqudNUDd6GkD5CW0pqD194dOXOLQMSGIZ3i+mHJ91ddV4x7J8xe +eAvaHqDc4XJyJouzOOxx2LhnThRUkpyXLzbXTITIoy4nK6K+ANg6hPjfBwTDs3m 7dDu+WDYAN4EMjMffpPD26axl778H5FXzqJaKx+RmMDw6f3y6g+8hKCvSicetpAa AnTLhx8q4kbEmOZHOEny28KliOpDAMPd/nNcnjqpfKBSoq0J6aYGM0t5bUH+clY9 nzjgMfE+pRm8N+oyssNCqT99ebeIxSF6Ps/EVZRJCETUi3s0n1/Y4dK3uPNOyo+G BSv0wfQ5M1IebmnIIlQuJ+zNvtKFkoLoi1Q/fsOr51HVfddwrEbd972+zYdjSeVe RXRb3HAStfQEjp0874VD9wr6u0tHskUrQGzHSSs8PNsfCv/URwJUPuS7XnePPXAZ KdtJST/b+WiY96pPJDLc44trRko1opxgncYqsusnWtwsUzK5aKnAbbYSiTIZhxJU 44p7/xOokeTcgDuluEk8mR+PEX5EhGokYXOVXfSCMJOXehpHnpMHtzCieTcmJ9Ir NaOATHjSXwHI7jiv/W+EZQnZCnoHnST+GT4FtmjYkD3lzMpK9d/E9mxjKs8hUNgO xH71k4uL7WljxsVWp/16 =2AAL -----END PGP SIGNATURE----- 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 ba0fae3b06 ("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 ...		2014-06-07 20:27:30 -07:00
..
at91.h	dt-bindings: clock: Move at91.h to dt-bindigs/clock	2014-04-18 23:44:52 +02:00
bcm281xx.h	clk: bcm281xx: move compatible string definitions	2014-04-30 11:51:39 -07:00
bcm21664.h	clk: bcm21664: use common clock framework	2014-04-30 11:51:44 -07:00
berlin2.h	clk: berlin: add binding include for Berlin SoC clock ids	2014-05-19 23:02:24 +02:00
berlin2q.h	clk: berlin: add binding include for Berlin SoC clock ids	2014-05-19 23:02:24 +02:00
efm32-cmu.h	clk: new driver for efm32 SoC	2013-11-04 12:23:18 -08:00
exynos4.h	clk: samsung: exynos4: export sclk_hdmiphy clock	2014-05-14 19:40:15 +02:00
exynos3250.h	clk: samsung: exynos3250: Add clocks using common clock framework	2014-05-14 19:41:32 +02:00
exynos5250.h	clk: exynos5250: Add missing sysmmu clocks for DISP and ISP blocks	2014-05-26 06:48:10 +09:00
exynos5260-clk.h	clk/exynos5260: add macros and documentation for exynos5260	2014-05-14 19:16:55 +02:00
exynos5410.h	clk: exynos5410: register clocks using common clock framework	2014-05-31 02:13:16 +09:00
exynos5420.h	clk: exynos5420: Add 5800 specific clocks	2014-05-19 22:15:08 +09:00
exynos5440.h	ARM: exynos5440: create a DT header defining CLK IDs	2014-01-08 18:02:40 +01:00
exynos-audss-clk.h	dt-bindings: clock: Move exynos-audss-clk.h to dt-bindings/clock	2014-03-21 04:31:30 +09:00
hi3620-clock.h	clk: hisilicon: add hi3620_mmc_clks	2014-02-26 16:03:56 -08:00
hip04-clock.h	clk: hip04: add clock driver	2014-03-19 15:23:53 +08:00
hix5hd2-clock.h	clk: hisi: add clk-hix5hd2.c	2014-05-12 11:30:32 +08:00
imx5-clock.h	ARM: imx: imx53: Add SATA PHY clock	2013-12-31 09:36:26 +08:00
imx6sl-clock.h	ARM: imx6sl: Add missing spba clock to clock tree	2013-12-31 09:36:37 +08:00
imx6sx-clock.h	ARM: imx: add clock driver for imx6sx	2014-05-16 15:35:19 +08:00
lsi,axm5516-clks.h	ARM: Add platform support for LSI AXM55xx SoC	2014-05-23 18:18:39 +02:00
mpc512x-clock.h	powerpc/512x: clk: support MPC5121/5123/5125 SoC variants	2014-01-12 18:59:36 +01:00
qcom,gcc-msm8660.h	clk: qcom: Add support for MSM8660's global clock controller (GCC)	2014-01-16 12:01:05 -08:00
qcom,gcc-msm8960.h	clk: qcom: Various fixes for MSM8960's global clock controller	2014-04-30 11:54:16 -07:00
qcom,gcc-msm8974.h	clk: qcom: Support msm8974pro global clock control hardware	2014-05-29 09:30:24 -07:00
qcom,mmcc-msm8960.h	clk: qcom: Add support for MSM8960's multimedia clock controller (MMCC)	2014-01-16 12:01:03 -08:00
qcom,mmcc-msm8974.h	dt-bindings: qcom: Fix warning with duplicate dt define	2014-01-27 11:27:04 -08:00
r7s72100-clock.h	ARM: shmobile: r7s72100: add spi clocks to dtsi	2014-05-14 11:42:54 +09:00
r8a7779-clock.h	ARM: shmobile: r8a7779: Add clock index macros for DT sources	2014-05-27 19:17:25 -07:00
r8a7790-clock.h	ARM: SoC devicetree updates for 3.16	2014-06-02 16:34:00 -07:00
r8a7791-clock.h	ARM: SoC devicetree updates for 3.16	2014-06-02 16:34:00 -07:00
s3c2410.h	clk: samsung: add clock controller driver for s3c2410, s3c2440 and s3c2442	2014-05-13 08:00:40 +09:00
s3c2412.h	clk: samsung: add clock controller driver for s3c2412	2014-04-15 02:11:36 +09:00
s3c2443.h	clk: samsung: add clock-driver for s3c2416, s3c2443 and s3c2450	2014-04-15 02:11:08 +09:00
samsung,s3c64xx-clock.h	clk: samsung: Add clock driver for S3C64xx SoCs	2013-08-05 11:58:37 -07:00
stih415-clks.h	ARM: STi: DT: STiH415: 415 DT Entry for clockgen A0/1/10/11/12	2014-05-21 14:27:12 +02:00
stih416-clks.h	ARM: STi: DT: STiH416: 416 DT Entry for clockgen A0/1/10/11/12	2014-05-21 14:27:09 +02:00
tegra20-car.h	clk: tegra: remove bogus PCIE_XCLK	2013-12-11 16:45:13 -07:00
tegra30-car.h	clk: tegra: remove bogus PCIE_XCLK	2013-12-11 16:45:13 -07:00
tegra114-car.h	clk: tegra: Fix xusb_hs_src clock hierarchy	2014-05-22 22:14:52 -07:00
tegra124-car.h	clk: tegra: Fix xusb_hs_src clock hierarchy	2014-05-22 22:14:52 -07:00
vf610-clock.h	ARM: imx: Add DMAMUX clock for Vybrid vf610 SoC	2013-12-09 13:18:31 +08:00