From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 15 Nov 2015 17:10:53 +0000 (-0800)
Subject: Merge branch 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus
X-Git-Tag: v4.4-rc1~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b84da9fa47cf6e8dfd71d673a2f744ec1cac452c;p=profile%2Fwearable%2Fplatform%2Fkernel%2Flinux-4.9-exynos9110.git

Merge branch 'upstream' of git://git.linux-mips.org/ralf/upstream-linus

Pull MIPS updates from Ralf Baechle:
 "These are the highlists of the main MIPS pull request for 4.4:

   - Add latencytop support
   - Support appended DTBs
   - VDSO support and initially use it for gettimeofday.
   - Drop the .MIPS.abiflags and ELF NOTE sections from vmlinux
   - Support for the 5KE, an internal test core.
   - Switch all MIPS platfroms to libata drivers.
   - Improved support, cleanups for ralink and Lantiq platforms.
   - Support for the new xilfpga platform.
   - A number of DTB improvments for BMIPS.
   - Improved support for CM and CPS.
   - Minor JZ4740 and BCM47xx enhancements"

* 'upstream' of git://git.linux-mips.org/pub/scm/ralf/upstream-linus: (120 commits)
  MIPS: idle: add case for CPU_5KE
  MIPS: Octeon: Support APPENDED_DTB
  MIPS: vmlinux: create a section for appended DTB
  MIPS: Clean up compat_siginfo_t
  MIPS: Fix PAGE_MASK definition
  MIPS: BMIPS: Enable GZIP ramdisk and timed printks
  MIPS: Add xilfpga defconfig
  MIPS: xilfpga: Add mipsfpga platform code
  MIPS: xilfpga: Add xilfpga device tree files.
  dt-bindings: MIPS: Document xilfpga bindings and boot style
  MIPS: Make MIPS_CMDLINE_DTB default
  MIPS: Make the kernel arguments from dtb available
  MIPS: Use USE_OF as the guard for appended dtb
  MIPS: BCM63XX: Use pr_* instead of printk
  MIPS: Loongson: Cleanup CONFIG_LOONGSON_SUSPEND.
  MIPS: lantiq: Disable xbar fpi burst mode
  MIPS: lantiq: Force the crossbar to big endian
  MIPS: lantiq: Initialize the USB core on boot
  MIPS: lantiq: Return correct value for fpi clock on ar9
  MIPS: ralink: Add missing clock on rt305x
  ...
---

b84da9fa47cf6e8dfd71d673a2f744ec1cac452c
diff --cc arch/mips/xilfpga/time.c
index 0000000,a1c0fc8..cbb3fca
mode 000000,100644..100644
--- a/arch/mips/xilfpga/time.c
+++ b/arch/mips/xilfpga/time.c
@@@ -1,0 -1,41 +1,41 @@@
+ /*
+  * Xilfpga clocksource/timer setup
+  *
+  * Copyright (C) 2015 Imagination Technologies
+  * Author: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
+  *
+  * This program is free software; you can redistribute it and/or modify it
+  * under the terms and conditions of the GNU General Public License,
+  * version 2, as published by the Free Software Foundation.
+  */
+ 
+ #include <linux/clk.h>
+ #include <linux/clk-provider.h>
+ #include <linux/clocksource.h>
+ #include <linux/of.h>
+ 
+ #include <asm/time.h>
+ 
+ void __init plat_time_init(void)
+ {
+ 	struct device_node *np;
+ 	struct clk *clk;
+ 
+ 	of_clk_init(NULL);
 -	clocksource_of_init();
++	clocksource_probe();
+ 
+ 	np = of_get_cpu_node(0, NULL);
+ 	if (!np) {
+ 		pr_err("Failed to get CPU node\n");
+ 		return;
+ 	}
+ 
+ 	clk = of_clk_get(np, 0);
+ 	if (IS_ERR(clk)) {
+ 		pr_err("Failed to get CPU clock: %ld\n", PTR_ERR(clk));
+ 		return;
+ 	}
+ 
+ 	mips_hpt_frequency = clk_get_rate(clk) / 2;
+ 	clk_put(clk);
+ }