These changes are the raw update to linux-4.4.6-rt14. Kernel sources

are taken from kernel.org, and rt patch from the rt wiki download page.

During the rebasing, the following patch collided:

Force tick interrupt and get rid of softirq magic(I70131fb85).

Collisions have been removed because its logic was found on the
source already.

Change-Id: I7f57a4081d9deaa0d9ccfc41a6c8daccdee3b769
Signed-off-by: José Pekkarinen <jose.pekkarinen@nokia.com>

10 files changed, 11 insertions, 14 deletions

diff --git a/kernel/drivers/clk/spear/clk-aux-synth.c b/kernel/drivers/clk/spear/clk-aux-synth.c
index bdfb4421c..f271c350e 100644
--- a/kernel/drivers/clk/spear/clk-aux-synth.c
+++ b/kernel/drivers/clk/spear/clk-aux-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/clk-frac-synth.c b/kernel/drivers/clk/spear/clk-frac-synth.c
index dffd4ce6c..58d678b5b 100644
--- a/kernel/drivers/clk/spear/clk-frac-synth.c
+++ b/kernel/drivers/clk/spear/clk-frac-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/clk-gpt-synth.c b/kernel/drivers/clk/spear/clk-gpt-synth.c
index 1afc18c4e..1a722e99e 100644
--- a/kernel/drivers/clk/spear/clk-gpt-synth.c
+++ b/kernel/drivers/clk/spear/clk-gpt-synth.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/clk-vco-pll.c b/kernel/drivers/clk/spear/clk-vco-pll.c
index 1b9b65bca..dc21ca460 100644
--- a/kernel/drivers/clk/spear/clk-vco-pll.c
+++ b/kernel/drivers/clk/spear/clk-vco-pll.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
@@ -87,7 +87,7 @@ static long clk_pll_round_rate_index(struct clk_hw *hw, unsigned long drate,
 	struct clk_pll *pll = to_clk_pll(hw);
 	unsigned long prev_rate, vco_prev_rate, rate = 0;
 	unsigned long vco_parent_rate =
-		__clk_get_rate(__clk_get_parent(__clk_get_parent(hw->clk)));
+		clk_hw_get_rate(clk_hw_get_parent(clk_hw_get_parent(hw)));
 
 	if (!prate) {
 		pr_err("%s: prate is must for pll clk\n", __func__);
diff --git a/kernel/drivers/clk/spear/clk.c b/kernel/drivers/clk/spear/clk.c
index 628b6d5ed..157fe099e 100644
--- a/kernel/drivers/clk/spear/clk.c
+++ b/kernel/drivers/clk/spear/clk.c
@@ -1,6 +1,6 @@
 /*
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/clk.h b/kernel/drivers/clk/spear/clk.h
index 931737677..9834944f0 100644
--- a/kernel/drivers/clk/spear/clk.h
+++ b/kernel/drivers/clk/spear/clk.h
@@ -2,7 +2,7 @@
  * Clock framework definitions for SPEAr platform
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/spear1310_clock.c b/kernel/drivers/clk/spear/spear1310_clock.c
index 4daa59777..009bd1410 100644
--- a/kernel/drivers/clk/spear/spear1310_clock.c
+++ b/kernel/drivers/clk/spear/spear1310_clock.c
@@ -4,14 +4,13 @@
  * SPEAr1310 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>
 #include <linux/io.h>
diff --git a/kernel/drivers/clk/spear/spear1340_clock.c b/kernel/drivers/clk/spear/spear1340_clock.c
index 5a5c66483..9c7abfd95 100644
--- a/kernel/drivers/clk/spear/spear1340_clock.c
+++ b/kernel/drivers/clk/spear/spear1340_clock.c
@@ -4,14 +4,13 @@
  * SPEAr1340 machine clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/err.h>
 #include <linux/io.h>
diff --git a/kernel/drivers/clk/spear/spear3xx_clock.c b/kernel/drivers/clk/spear/spear3xx_clock.c
index bb5f38777..404a55edd 100644
--- a/kernel/drivers/clk/spear/spear3xx_clock.c
+++ b/kernel/drivers/clk/spear/spear3xx_clock.c
@@ -2,7 +2,7 @@
  * SPEAr3xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
diff --git a/kernel/drivers/clk/spear/spear6xx_clock.c b/kernel/drivers/clk/spear/spear6xx_clock.c
index 4f649c9cb..e24f85cd4 100644
--- a/kernel/drivers/clk/spear/spear6xx_clock.c
+++ b/kernel/drivers/clk/spear/spear6xx_clock.c
@@ -2,14 +2,13 @@
  * SPEAr6xx machines clock framework source file
  *
  * Copyright (C) 2012 ST Microelectronics
- * Viresh Kumar <viresh.linux@gmail.com>
+ * Viresh Kumar <vireshk@kernel.org>
  *
  * This file is licensed under the terms of the GNU General Public
  * License version 2. This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-#include <linux/clk.h>
 #include <linux/clkdev.h>
 #include <linux/io.h>
 #include <linux/spinlock_types.h>