Update KERNEL_VERSION to 3.14.51

16 files changed, 110 insertions, 234 deletions

diff --git a/KERNEL_VERSION b/KERNEL_VERSION
index 91471d2231bf60..d7b9a1eb19b828 100644
--- a/KERNEL_VERSION
+++ b/KERNEL_VERSION
@@ -1 +1 @@
-3.14.28
+3.14.51
diff --git a/patches.ltsi/ltsi-makefile-addition.patch b/patches.ltsi/ltsi-makefile-addition.patch
index 53a8fa76e9daeb..85d0d2d2f567f8 100644
--- a/patches.ltsi/ltsi-makefile-addition.patch
+++ b/patches.ltsi/ltsi-makefile-addition.patch
@@ -18,7 +18,7 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 @@ -1,7 +1,7 @@
  VERSION = 3
  PATCHLEVEL = 14
- SUBLEVEL = 28
+ SUBLEVEL = 51
 -EXTRAVERSION =
 +EXTRAVERSION = -ltsi
  NAME = Remembering Coco
diff --git a/patches.renesas/0001-clk-add-clock-indices-support.patch b/patches.renesas/0001-clk-add-clock-indices-support.patch
index 4845c1f73d9724..7dd0596c7ba82e 100644
--- a/patches.renesas/0001-clk-add-clock-indices-support.patch
+++ b/patches.renesas/0001-clk-add-clock-indices-support.patch
@@ -44,7 +44,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  Required properties:
 --- a/drivers/clk/clk.c
 +++ b/drivers/clk/clk.c
-@@ -2501,8 +2501,12 @@ EXPORT_SYMBOL_GPL(of_clk_get_parent_coun
+@@ -2504,8 +2504,12 @@ EXPORT_SYMBOL_GPL(of_clk_get_parent_coun
  const char *of_clk_get_parent_name(struct device_node *np, int index)
  {
  	struct of_phandle_args clkspec;
@@ -57,7 +57,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  
  	if (index < 0)
  		return NULL;
-@@ -2512,8 +2516,22 @@ const char *of_clk_get_parent_name(struc
+@@ -2515,8 +2519,22 @@ const char *of_clk_get_parent_name(struc
  	if (rc)
  		return NULL;
  
diff --git a/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch b/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
index d4a595791afccf..bb65309414e3a4 100644
--- a/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
+++ b/patches.renesas/0137-cpufreq-remove-unused-notifier-CPUFREQ_-SUSPENDCHANG.patch
@@ -14,21 +14,19 @@ Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
 (cherry picked from commit 0b443ead714f0cba797a7f2476dd756f22b5421e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- Documentation/cpu-freq/core.txt       | 4 ----
- arch/arm/kernel/smp.c                 | 3 +--
- arch/arm/kernel/smp_twd.c             | 2 +-
- arch/arm/mach-pxa/viper.c             | 3 ---
- arch/powerpc/oprofile/op_model_cell.c | 3 +--
- arch/sparc/kernel/time_64.c           | 3 +--
- arch/x86/kernel/tsc.c                 | 3 +--
- drivers/cpufreq/cpufreq.c             | 3 +--
- drivers/pcmcia/sa11xx_base.c          | 3 ---
- drivers/tty/serial/sh-sci.c           | 3 +--
- include/linux/cpufreq.h               | 2 --
+ Documentation/cpu-freq/core.txt       |    4 ----
+ arch/arm/kernel/smp.c                 |    3 +--
+ arch/arm/kernel/smp_twd.c             |    2 +-
+ arch/arm/mach-pxa/viper.c             |    3 ---
+ arch/powerpc/oprofile/op_model_cell.c |    3 +--
+ arch/sparc/kernel/time_64.c           |    3 +--
+ arch/x86/kernel/tsc.c                 |    3 +--
+ drivers/cpufreq/cpufreq.c             |    3 +--
+ drivers/pcmcia/sa11xx_base.c          |    3 ---
+ drivers/tty/serial/sh-sci.c           |    3 +--
+ include/linux/cpufreq.h               |    2 --
  11 files changed, 7 insertions(+), 25 deletions(-)
 
-diff --git a/Documentation/cpu-freq/core.txt b/Documentation/cpu-freq/core.txt
-index ce0666e51036..0060d76b445f 100644
 --- a/Documentation/cpu-freq/core.txt
 +++ b/Documentation/cpu-freq/core.txt
 @@ -92,7 +92,3 @@ values:
@@ -39,11 +37,9 @@ index ce0666e51036..0060d76b445f 100644
 -If the cpufreq core detects the frequency has changed while the system
 -was suspended, these notifiers are called with CPUFREQ_RESUMECHANGE as
 -second argument.
-diff --git a/arch/arm/kernel/smp.c b/arch/arm/kernel/smp.c
-index b7b4c86e338b..7c4fada440f0 100644
 --- a/arch/arm/kernel/smp.c
 +++ b/arch/arm/kernel/smp.c
-@@ -674,8 +674,7 @@ static int cpufreq_callback(struct notifier_block *nb,
+@@ -683,8 +683,7 @@ static int cpufreq_callback(struct notif
  	}
  
  	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
@@ -53,11 +49,9 @@ index b7b4c86e338b..7c4fada440f0 100644
  		loops_per_jiffy = cpufreq_scale(global_l_p_j_ref,
  						global_l_p_j_ref_freq,
  						freq->new);
-diff --git a/arch/arm/kernel/smp_twd.c b/arch/arm/kernel/smp_twd.c
-index 6591e26fc13f..dfc32130bc44 100644
 --- a/arch/arm/kernel/smp_twd.c
 +++ b/arch/arm/kernel/smp_twd.c
-@@ -166,7 +166,7 @@ static int twd_cpufreq_transition(struct notifier_block *nb,
+@@ -166,7 +166,7 @@ static int twd_cpufreq_transition(struct
  	 * frequency.  The timer is local to a cpu, so cross-call to the
  	 * changing cpu.
  	 */
@@ -66,11 +60,9 @@ index 6591e26fc13f..dfc32130bc44 100644
  		smp_call_function_single(freqs->cpu, twd_update_frequency,
  			NULL, 1);
  
-diff --git a/arch/arm/mach-pxa/viper.c b/arch/arm/mach-pxa/viper.c
-index 29905b127ad9..41f27f667ca8 100644
 --- a/arch/arm/mach-pxa/viper.c
 +++ b/arch/arm/mach-pxa/viper.c
-@@ -885,9 +885,6 @@ static int viper_cpufreq_notifier(struct notifier_block *nb,
+@@ -885,9 +885,6 @@ static int viper_cpufreq_notifier(struct
  			viper_set_core_cpu_voltage(freq->new, 0);
  		}
  		break;
@@ -80,11 +72,9 @@ index 29905b127ad9..41f27f667ca8 100644
  	default:
  		/* ignore */
  		break;
-diff --git a/arch/powerpc/oprofile/op_model_cell.c b/arch/powerpc/oprofile/op_model_cell.c
-index 1f0ebdeea5f7..863d89386f60 100644
 --- a/arch/powerpc/oprofile/op_model_cell.c
 +++ b/arch/powerpc/oprofile/op_model_cell.c
-@@ -1121,8 +1121,7 @@ oprof_cpufreq_notify(struct notifier_block *nb, unsigned long val, void *data)
+@@ -1121,8 +1121,7 @@ oprof_cpufreq_notify(struct notifier_blo
  	int ret = 0;
  	struct cpufreq_freqs *frq = data;
  	if ((val == CPUFREQ_PRECHANGE && frq->old < frq->new) ||
@@ -94,11 +84,9 @@ index 1f0ebdeea5f7..863d89386f60 100644
  		set_spu_profiling_frequency(frq->new, spu_cycle_reset);
  	return ret;
  }
-diff --git a/arch/sparc/kernel/time_64.c b/arch/sparc/kernel/time_64.c
-index c3d82b5f54ca..b397e053b872 100644
 --- a/arch/sparc/kernel/time_64.c
 +++ b/arch/sparc/kernel/time_64.c
-@@ -659,8 +659,7 @@ static int sparc64_cpufreq_notifier(struct notifier_block *nb, unsigned long val
+@@ -659,8 +659,7 @@ static int sparc64_cpufreq_notifier(stru
  		ft->clock_tick_ref = cpu_data(cpu).clock_tick;
  	}
  	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
@@ -108,11 +96,9 @@ index c3d82b5f54ca..b397e053b872 100644
  		cpu_data(cpu).clock_tick =
  			cpufreq_scale(ft->clock_tick_ref,
  				      ft->ref_freq,
-diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c
-index e0d1d7a8354e..6b8d35b8cd62 100644
 --- a/arch/x86/kernel/tsc.c
 +++ b/arch/x86/kernel/tsc.c
-@@ -914,8 +914,7 @@ static int time_cpufreq_notifier(struct notifier_block *nb, unsigned long val,
+@@ -914,8 +914,7 @@ static int time_cpufreq_notifier(struct
  		tsc_khz_ref = tsc_khz;
  	}
  	if ((val == CPUFREQ_PRECHANGE  && freq->old < freq->new) ||
@@ -122,11 +108,9 @@ index e0d1d7a8354e..6b8d35b8cd62 100644
  		*lpj = cpufreq_scale(loops_per_jiffy_ref, ref_freq, freq->new);
  
  		tsc_khz = cpufreq_scale(tsc_khz_ref, ref_freq, freq->new);
-diff --git a/drivers/cpufreq/cpufreq.c b/drivers/cpufreq/cpufreq.c
-index 153f4b92cc05..dc1447dc173e 100644
 --- a/drivers/cpufreq/cpufreq.c
 +++ b/drivers/cpufreq/cpufreq.c
-@@ -257,8 +257,7 @@ static void adjust_jiffies(unsigned long val, struct cpufreq_freqs *ci)
+@@ -257,8 +257,7 @@ static void adjust_jiffies(unsigned long
  		pr_debug("saving %lu as reference value for loops_per_jiffy; "
  			"freq is %u kHz\n", l_p_j_ref, l_p_j_ref_freq);
  	}
@@ -136,11 +120,9 @@ index 153f4b92cc05..dc1447dc173e 100644
  		loops_per_jiffy = cpufreq_scale(l_p_j_ref, l_p_j_ref_freq,
  								ci->new);
  		pr_debug("scaling loops_per_jiffy to %lu "
-diff --git a/drivers/pcmcia/sa11xx_base.c b/drivers/pcmcia/sa11xx_base.c
-index 6eecd7cddf57..54d3089d157b 100644
 --- a/drivers/pcmcia/sa11xx_base.c
 +++ b/drivers/pcmcia/sa11xx_base.c
-@@ -125,9 +125,6 @@ sa1100_pcmcia_frequency_change(struct soc_pcmcia_socket *skt,
+@@ -125,9 +125,6 @@ sa1100_pcmcia_frequency_change(struct so
  		if (freqs->new < freqs->old)
  			sa1100_pcmcia_set_mecr(skt, freqs->new);
  		break;
@@ -150,11 +132,9 @@ index 6eecd7cddf57..54d3089d157b 100644
  	}
  
  	return 0;
-diff --git a/drivers/tty/serial/sh-sci.c b/drivers/tty/serial/sh-sci.c
-index 7ee5a79222ff..88236da0ddf7 100644
 --- a/drivers/tty/serial/sh-sci.c
 +++ b/drivers/tty/serial/sh-sci.c
-@@ -1041,8 +1041,7 @@ static int sci_notifier(struct notifier_block *self,
+@@ -1041,8 +1041,7 @@ static int sci_notifier(struct notifier_
  
  	sci_port = container_of(self, struct sci_port, freq_transition);
  
@@ -164,11 +144,9 @@ index 7ee5a79222ff..88236da0ddf7 100644
  		struct uart_port *port = &sci_port->port;
  
  		spin_lock_irqsave(&port->lock, flags);
-diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
-index 4d89e0e6f9cc..945313ca4bbf 100644
 --- a/include/linux/cpufreq.h
 +++ b/include/linux/cpufreq.h
-@@ -306,8 +306,6 @@ cpufreq_verify_within_cpu_limits(struct cpufreq_policy *policy)
+@@ -306,8 +306,6 @@ cpufreq_verify_within_cpu_limits(struct
  /* Transition notifiers */
  #define CPUFREQ_PRECHANGE		(0)
  #define CPUFREQ_POSTCHANGE		(1)
@@ -177,6 +155,3 @@ index 4d89e0e6f9cc..945313ca4bbf 100644
  
  /* Policy Notifiers  */
  #define CPUFREQ_ADJUST			(0)
--- 
-2.1.2
-
diff --git a/patches.renesas/0139-i2c-add-deprecation-warning-for-class-based-instanti.patch b/patches.renesas/0139-i2c-add-deprecation-warning-for-class-based-instanti.patch
index 333c4beff7565f..3bd316bde7b9b8 100644
--- a/patches.renesas/0139-i2c-add-deprecation-warning-for-class-based-instanti.patch
+++ b/patches.renesas/0139-i2c-add-deprecation-warning-for-class-based-instanti.patch
@@ -15,15 +15,13 @@ Signed-off-by: Wolfram Sang <wsa@the-dreams.de>
 (cherry picked from commit 0c176170089c3a7f2a891f9860f5cdc5f481ff78)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/i2c/i2c-core.c | 7 +++++++
- include/linux/i2c.h    | 1 +
+ drivers/i2c/i2c-core.c |    7 +++++++
+ include/linux/i2c.h    |    1 +
  2 files changed, 8 insertions(+)
 
-diff --git a/drivers/i2c/i2c-core.c b/drivers/i2c/i2c-core.c
-index 5fb80b8962a2..98a5fd950f16 100644
 --- a/drivers/i2c/i2c-core.c
 +++ b/drivers/i2c/i2c-core.c
-@@ -1941,6 +1941,13 @@ static int i2c_detect_address(struct i2c_client *temp_client,
+@@ -1944,6 +1944,13 @@ static int i2c_detect_address(struct i2c
  		struct i2c_client *client;
  
  		/* Detection succeeded, instantiate the device */
@@ -37,11 +35,9 @@ index 5fb80b8962a2..98a5fd950f16 100644
  		dev_dbg(&adapter->dev, "Creating %s at 0x%02x\n",
  			info.type, info.addr);
  		client = i2c_new_device(adapter, &info);
-diff --git a/include/linux/i2c.h b/include/linux/i2c.h
-index deddeb8c337c..b556e0ab946f 100644
 --- a/include/linux/i2c.h
 +++ b/include/linux/i2c.h
-@@ -487,6 +487,7 @@ void i2c_unlock_adapter(struct i2c_adapter *);
+@@ -487,6 +487,7 @@ void i2c_unlock_adapter(struct i2c_adapt
  #define I2C_CLASS_HWMON		(1<<0)	/* lm_sensors, ... */
  #define I2C_CLASS_DDC		(1<<3)	/* DDC bus on graphics adapters */
  #define I2C_CLASS_SPD		(1<<7)	/* Memory modules */
@@ -49,6 +45,3 @@ index deddeb8c337c..b556e0ab946f 100644
  
  /* Internal numbers to terminate lists */
  #define I2C_CLIENT_END		0xfffeU
--- 
-2.1.2
-
diff --git a/patches.renesas/0143-spi-Provide-core-support-for-DMA-mapping-transfers.patch b/patches.renesas/0143-spi-Provide-core-support-for-DMA-mapping-transfers.patch
index 7c547128da184e..c836bc80007a73 100644
--- a/patches.renesas/0143-spi-Provide-core-support-for-DMA-mapping-transfers.patch
+++ b/patches.renesas/0143-spi-Provide-core-support-for-DMA-mapping-transfers.patch
@@ -20,12 +20,10 @@ Signed-off-by: Mark Brown <broonie@linaro.org>
 (cherry picked from commit 99adef310f682d6343cb40c1f6c9c25a4b3a450d)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/spi/spi.c       | 82 +++++++++++++++++++++++++++++++++++++++++++++++++
- include/linux/spi/spi.h | 18 +++++++++++
+ drivers/spi/spi.c       |   82 ++++++++++++++++++++++++++++++++++++++++++++++++
+ include/linux/spi/spi.h |   18 ++++++++++
  2 files changed, 100 insertions(+)
 
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index fbf3b22efe5a..048eb72029a4 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
 @@ -24,6 +24,8 @@
@@ -37,7 +35,7 @@ index fbf3b22efe5a..048eb72029a4 100644
  #include <linux/mutex.h>
  #include <linux/of_device.h>
  #include <linux/of_irq.h>
-@@ -580,6 +582,77 @@ static void spi_set_cs(struct spi_device *spi, bool enable)
+@@ -580,6 +582,77 @@ static void spi_set_cs(struct spi_device
  		spi->master->set_cs(spi, !enable);
  }
  
@@ -115,7 +113,7 @@ index fbf3b22efe5a..048eb72029a4 100644
  /*
   * spi_transfer_one_message - Default implementation of transfer_one_message()
   *
-@@ -752,6 +825,13 @@ static void spi_pump_messages(struct kthread_work *work)
+@@ -752,6 +825,13 @@ static void spi_pump_messages(struct kth
  		master->cur_msg_prepared = true;
  	}
  
@@ -129,8 +127,8 @@ index fbf3b22efe5a..048eb72029a4 100644
  	ret = master->transfer_one_message(master, master->cur_msg);
  	if (ret) {
  		dev_err(&master->dev,
-@@ -839,6 +919,8 @@ void spi_finalize_current_message(struct spi_master *master)
- 	queue_kthread_work(&master->kworker, &master->pump_messages);
+@@ -836,6 +916,8 @@ void spi_finalize_current_message(struct
+ 	mesg = master->cur_msg;
  	spin_unlock_irqrestore(&master->queue_lock, flags);
  
 +	spi_unmap_msg(master, mesg);
@@ -138,8 +136,6 @@ index fbf3b22efe5a..048eb72029a4 100644
  	if (master->cur_msg_prepared && master->unprepare_message) {
  		ret = master->unprepare_message(master, mesg);
  		if (ret) {
-diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
-index 4203c66d8803..dd8b91d95110 100644
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h
 @@ -25,6 +25,8 @@
@@ -188,6 +184,3 @@ index 4203c66d8803..dd8b91d95110 100644
  };
  
  static inline void *spi_master_get_devdata(struct spi_master *master)
--- 
-2.1.2
-
diff --git a/patches.renesas/0145-spi-core-Ignore-unsupported-spi-tr-x-bus-width-prope.patch b/patches.renesas/0145-spi-core-Ignore-unsupported-spi-tr-x-bus-width-prope.patch
index aa988d8486a706..1c8e243180a3e6 100644
--- a/patches.renesas/0145-spi-core-Ignore-unsupported-spi-tr-x-bus-width-prope.patch
+++ b/patches.renesas/0145-spi-core-Ignore-unsupported-spi-tr-x-bus-width-prope.patch
@@ -12,14 +12,12 @@ Signed-off-by: Mark Brown <broonie@linaro.org>
 (cherry picked from commit 80874d8c9e9cbfa195572dfea46f2314098b3869)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/spi/spi.c | 18 ++++++++----------
+ drivers/spi/spi.c |   18 ++++++++----------
  1 file changed, 8 insertions(+), 10 deletions(-)
 
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index dbab6681a1a1..3f401021f104 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -1190,11 +1190,10 @@ static void of_register_spi_devices(struct spi_master *master)
+@@ -1192,11 +1192,10 @@ static void of_register_spi_devices(stru
  				spi->mode |= SPI_TX_QUAD;
  				break;
  			default:
@@ -35,7 +33,7 @@ index dbab6681a1a1..3f401021f104 100644
  			}
  		}
  
-@@ -1209,11 +1208,10 @@ static void of_register_spi_devices(struct spi_master *master)
+@@ -1211,11 +1210,10 @@ static void of_register_spi_devices(stru
  				spi->mode |= SPI_RX_QUAD;
  				break;
  			default:
@@ -51,6 +49,3 @@ index dbab6681a1a1..3f401021f104 100644
  			}
  		}
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0146-spi-Make-core-DMA-mapping-functions-generate-scatter.patch b/patches.renesas/0146-spi-Make-core-DMA-mapping-functions-generate-scatter.patch
index 5913fdaa859b41..abb9f1eeac4422 100644
--- a/patches.renesas/0146-spi-Make-core-DMA-mapping-functions-generate-scatter.patch
+++ b/patches.renesas/0146-spi-Make-core-DMA-mapping-functions-generate-scatter.patch
@@ -34,16 +34,14 @@ Signed-off-by: Mark Brown <broonie@linaro.org>
 (cherry picked from commit 6ad45a27cbe343ec8d7888e5edf6335499a4b555)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/spi/spi-s3c64xx.c |  14 +++++--
- drivers/spi/spi.c         | 101 ++++++++++++++++++++++++++++++++++------------
- include/linux/spi/spi.h   |   7 ++++
+ drivers/spi/spi-s3c64xx.c |   14 +++++-
+ drivers/spi/spi.c         |  101 ++++++++++++++++++++++++++++++++++------------
+ include/linux/spi/spi.h   |    7 +++
  3 files changed, 94 insertions(+), 28 deletions(-)
 
-diff --git a/drivers/spi/spi-s3c64xx.c b/drivers/spi/spi-s3c64xx.c
-index ae907dde1371..c717b2b1b911 100644
 --- a/drivers/spi/spi-s3c64xx.c
 +++ b/drivers/spi/spi-s3c64xx.c
-@@ -381,7 +381,7 @@ static void s3c64xx_spi_dma_stop(struct s3c64xx_spi_driver_data *sdd,
+@@ -381,7 +381,7 @@ static void s3c64xx_spi_dma_stop(struct
  #else
  
  static void prepare_dma(struct s3c64xx_spi_dma_data *dma,
@@ -52,7 +50,7 @@ index ae907dde1371..c717b2b1b911 100644
  {
  	struct s3c64xx_spi_driver_data *sdd;
  	struct dma_slave_config config;
-@@ -407,8 +407,8 @@ static void prepare_dma(struct s3c64xx_spi_dma_data *dma,
+@@ -407,8 +407,8 @@ static void prepare_dma(struct s3c64xx_s
  		dmaengine_slave_config(dma->ch, &config);
  	}
  
@@ -63,7 +61,7 @@ index ae907dde1371..c717b2b1b911 100644
  
  	desc->callback = s3c64xx_spi_dmacb;
  	desc->callback_param = dma;
-@@ -515,7 +515,11 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
+@@ -515,7 +515,11 @@ static void enable_datapath(struct s3c64
  		chcfg |= S3C64XX_SPI_CH_TXCH_ON;
  		if (dma_mode) {
  			modecfg |= S3C64XX_SPI_MODE_TXDMA_ON;
@@ -75,7 +73,7 @@ index ae907dde1371..c717b2b1b911 100644
  		} else {
  			switch (sdd->cur_bpw) {
  			case 32:
-@@ -547,7 +551,11 @@ static void enable_datapath(struct s3c64xx_spi_driver_data *sdd,
+@@ -547,7 +551,11 @@ static void enable_datapath(struct s3c64
  			writel(((xfer->len * 8 / sdd->cur_bpw) & 0xffff)
  					| S3C64XX_SPI_PACKET_CNT_EN,
  					regs + S3C64XX_SPI_PACKET_CNT);
@@ -87,11 +85,9 @@ index ae907dde1371..c717b2b1b911 100644
  		}
  	}
  
-diff --git a/drivers/spi/spi.c b/drivers/spi/spi.c
-index 3f401021f104..caa658f8c910 100644
 --- a/drivers/spi/spi.c
 +++ b/drivers/spi/spi.c
-@@ -582,13 +582,70 @@ static void spi_set_cs(struct spi_device *spi, bool enable)
+@@ -582,13 +582,70 @@ static void spi_set_cs(struct spi_device
  		spi->master->set_cs(spi, !enable);
  }
  
@@ -163,7 +159,7 @@ index 3f401021f104..caa658f8c910 100644
  
  	if (master->flags & (SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX)) {
  		max_tx = 0;
-@@ -631,7 +688,7 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg)
+@@ -631,7 +688,7 @@ static int spi_map_msg(struct spi_master
  		}
  	}
  
@@ -172,7 +168,7 @@ index 3f401021f104..caa658f8c910 100644
  		return 0;
  
  	tx_dev = &master->dma_tx->dev->device;
-@@ -642,25 +699,21 @@ static int spi_map_msg(struct spi_master *master, struct spi_message *msg)
+@@ -642,25 +699,21 @@ static int spi_map_msg(struct spi_master
  			continue;
  
  		if (xfer->tx_buf != NULL) {
@@ -210,7 +206,7 @@ index 3f401021f104..caa658f8c910 100644
  			}
  		}
  	}
-@@ -675,7 +728,7 @@ static int spi_unmap_msg(struct spi_master *master, struct spi_message *msg)
+@@ -675,7 +728,7 @@ static int spi_unmap_msg(struct spi_mast
  	struct spi_transfer *xfer;
  	struct device *tx_dev, *rx_dev;
  
@@ -219,7 +215,7 @@ index 3f401021f104..caa658f8c910 100644
  		return 0;
  
  	tx_dev = &master->dma_tx->dev->device;
-@@ -685,12 +738,8 @@ static int spi_unmap_msg(struct spi_master *master, struct spi_message *msg)
+@@ -685,12 +738,8 @@ static int spi_unmap_msg(struct spi_mast
  		if (!master->can_dma(master, msg->spi, xfer))
  			continue;
  
@@ -234,7 +230,7 @@ index 3f401021f104..caa658f8c910 100644
  	}
  
  	return 0;
-@@ -1499,6 +1548,8 @@ int spi_register_master(struct spi_master *master)
+@@ -1501,6 +1550,8 @@ int spi_register_master(struct spi_maste
  	mutex_init(&master->bus_lock_mutex);
  	master->bus_lock_flag = 0;
  	init_completion(&master->xfer_completion);
@@ -243,8 +239,6 @@ index 3f401021f104..caa658f8c910 100644
  
  	/* register the device, then userspace will see it.
  	 * registration fails if the bus ID is in use.
-diff --git a/include/linux/spi/spi.h b/include/linux/spi/spi.h
-index c4c68093cd7c..36c86ef51ff3 100644
 --- a/include/linux/spi/spi.h
 +++ b/include/linux/spi/spi.h
 @@ -24,6 +24,7 @@
@@ -255,7 +249,7 @@ index c4c68093cd7c..36c86ef51ff3 100644
  
  struct dma_chan;
  
-@@ -268,6 +269,7 @@ static inline void spi_unregister_driver(struct spi_driver *sdrv)
+@@ -268,6 +269,7 @@ static inline void spi_unregister_driver
   * @auto_runtime_pm: the core should ensure a runtime PM reference is held
   *                   while the hardware is prepared, using the parent
   *                   device for the spidev
@@ -271,7 +265,7 @@ index c4c68093cd7c..36c86ef51ff3 100644
  
  	int (*prepare_transfer_hardware)(struct spi_master *master);
  	int (*transfer_one_message)(struct spi_master *master,
-@@ -536,6 +539,8 @@ extern struct spi_master *spi_busnum_to_master(u16 busnum);
+@@ -536,6 +539,8 @@ extern struct spi_master *spi_busnum_to_
   *	(optionally) changing the chipselect status, then starting
   *	the next transfer or completing this @spi_message.
   * @transfer_list: transfers are sequenced through @spi_message.transfers
@@ -289,6 +283,3 @@ index c4c68093cd7c..36c86ef51ff3 100644
  
  	unsigned	cs_change:1;
  	unsigned	tx_nbits:3;
--- 
-2.1.2
-
diff --git a/patches.renesas/0147-regulator-core-Allow-regulator_set_voltage-for-fixed.patch b/patches.renesas/0147-regulator-core-Allow-regulator_set_voltage-for-fixed.patch
index f6f1d9b0ed3837..a0590694224539 100644
--- a/patches.renesas/0147-regulator-core-Allow-regulator_set_voltage-for-fixed.patch
+++ b/patches.renesas/0147-regulator-core-Allow-regulator_set_voltage-for-fixed.patch
@@ -13,14 +13,12 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit d5c3595331d512c6af6b636cef687421c2ba11e3)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/regulator/core.c | 14 ++++++++++++++
+ drivers/regulator/core.c |   14 ++++++++++++++
  1 file changed, 14 insertions(+)
 
-diff --git a/drivers/regulator/core.c b/drivers/regulator/core.c
-index afca1bc24f26..bac485acc7f3 100644
 --- a/drivers/regulator/core.c
 +++ b/drivers/regulator/core.c
-@@ -2399,6 +2399,7 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
+@@ -2405,6 +2405,7 @@ int regulator_set_voltage(struct regulat
  	struct regulator_dev *rdev = regulator->rdev;
  	int ret = 0;
  	int old_min_uV, old_max_uV;
@@ -28,7 +26,7 @@ index afca1bc24f26..bac485acc7f3 100644
  
  	mutex_lock(&rdev->mutex);
  
-@@ -2409,6 +2410,19 @@ int regulator_set_voltage(struct regulator *regulator, int min_uV, int max_uV)
+@@ -2415,6 +2416,19 @@ int regulator_set_voltage(struct regulat
  	if (regulator->min_uV == min_uV && regulator->max_uV == max_uV)
  		goto out;
  
@@ -48,6 +46,3 @@ index afca1bc24f26..bac485acc7f3 100644
  	/* sanity check */
  	if (!rdev->desc->ops->set_voltage &&
  	    !rdev->desc->ops->set_voltage_sel) {
--- 
-2.1.2
-
diff --git a/patches.renesas/0150-of-add-functions-to-count-number-of-elements-in-a-pr.patch b/patches.renesas/0150-of-add-functions-to-count-number-of-elements-in-a-pr.patch
index 5783f46b221966..b901981b820d3e 100644
--- a/patches.renesas/0150-of-add-functions-to-count-number-of-elements-in-a-pr.patch
+++ b/patches.renesas/0150-of-add-functions-to-count-number-of-elements-in-a-pr.patch
@@ -87,7 +87,7 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
  static inline int of_property_read_u32_index(const struct device_node *np,
  			const char *propname, u32 index, u32 *out_value)
  {
-@@ -592,6 +600,74 @@ static inline int of_property_read_strin
+@@ -595,6 +603,74 @@ static inline int of_property_read_strin
  }
  
  /**
diff --git a/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch b/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
index 64b2ea234b0910..847d16ba285993 100644
--- a/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
+++ b/patches.renesas/0389-i2c-remove-unnecessary-OOM-messages.patch
@@ -24,27 +24,25 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 Conflicts:
 	drivers/i2c/busses/i2c-efm32.c
 ---
- drivers/i2c/busses/i2c-bcm2835.c    | 4 +---
- drivers/i2c/busses/i2c-diolan-u2c.c | 1 -
- drivers/i2c/busses/i2c-eg20t.c      | 4 +---
- drivers/i2c/busses/i2c-exynos5.c    | 4 +---
- drivers/i2c/busses/i2c-imx.c        | 4 +---
- drivers/i2c/busses/i2c-omap.c       | 4 +---
- drivers/i2c/busses/i2c-rcar.c       | 4 +---
- drivers/i2c/busses/i2c-s3c2410.c    | 8 ++------
- drivers/i2c/busses/i2c-simtec.c     | 4 +---
- drivers/i2c/busses/i2c-sirf.c       | 1 -
- drivers/i2c/busses/i2c-stu300.c     | 4 +---
- drivers/i2c/busses/i2c-tegra.c      | 4 +---
- drivers/i2c/busses/i2c-wmt.c        | 4 +---
- drivers/i2c/busses/scx200_acb.c     | 4 +---
+ drivers/i2c/busses/i2c-bcm2835.c    |    4 +---
+ drivers/i2c/busses/i2c-diolan-u2c.c |    1 -
+ drivers/i2c/busses/i2c-eg20t.c      |    4 +---
+ drivers/i2c/busses/i2c-exynos5.c    |    4 +---
+ drivers/i2c/busses/i2c-imx.c        |    4 +---
+ drivers/i2c/busses/i2c-omap.c       |    4 +---
+ drivers/i2c/busses/i2c-rcar.c       |    4 +---
+ drivers/i2c/busses/i2c-s3c2410.c    |    8 ++------
+ drivers/i2c/busses/i2c-simtec.c     |    4 +---
+ drivers/i2c/busses/i2c-sirf.c       |    1 -
+ drivers/i2c/busses/i2c-stu300.c     |    4 +---
+ drivers/i2c/busses/i2c-tegra.c      |    4 +---
+ drivers/i2c/busses/i2c-wmt.c        |    4 +---
+ drivers/i2c/busses/scx200_acb.c     |    4 +---
  14 files changed, 13 insertions(+), 41 deletions(-)
 
-diff --git a/drivers/i2c/busses/i2c-bcm2835.c b/drivers/i2c/busses/i2c-bcm2835.c
-index 77df97b932af..9d7d1cdf6abe 100644
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -225,10 +225,8 @@ static int bcm2835_i2c_probe(struct platform_device *pdev)
+@@ -225,10 +225,8 @@ static int bcm2835_i2c_probe(struct plat
  	struct i2c_adapter *adap;
  
  	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
@@ -56,11 +54,9 @@ index 77df97b932af..9d7d1cdf6abe 100644
  	platform_set_drvdata(pdev, i2c_dev);
  	i2c_dev->dev = &pdev->dev;
  	init_completion(&i2c_dev->completion);
-diff --git a/drivers/i2c/busses/i2c-diolan-u2c.c b/drivers/i2c/busses/i2c-diolan-u2c.c
-index 721f7ebf9a3b..b19a310bf9b3 100644
 --- a/drivers/i2c/busses/i2c-diolan-u2c.c
 +++ b/drivers/i2c/busses/i2c-diolan-u2c.c
-@@ -455,7 +455,6 @@ static int diolan_u2c_probe(struct usb_interface *interface,
+@@ -455,7 +455,6 @@ static int diolan_u2c_probe(struct usb_i
  	/* allocate memory for our device state and initialize it */
  	dev = kzalloc(sizeof(*dev), GFP_KERNEL);
  	if (dev == NULL) {
@@ -68,11 +64,9 @@ index 721f7ebf9a3b..b19a310bf9b3 100644
  		ret = -ENOMEM;
  		goto error;
  	}
-diff --git a/drivers/i2c/busses/i2c-eg20t.c b/drivers/i2c/busses/i2c-eg20t.c
-index e08e458bab02..26ca8c7e133d 100644
 --- a/drivers/i2c/busses/i2c-eg20t.c
 +++ b/drivers/i2c/busses/i2c-eg20t.c
-@@ -751,10 +751,8 @@ static int pch_i2c_probe(struct pci_dev *pdev,
+@@ -751,10 +751,8 @@ static int pch_i2c_probe(struct pci_dev
  	pch_pci_dbg(pdev, "Entered.\n");
  
  	adap_info = kzalloc((sizeof(struct adapter_info)), GFP_KERNEL);
@@ -84,11 +78,9 @@ index e08e458bab02..26ca8c7e133d 100644
  
  	ret = pci_enable_device(pdev);
  	if (ret) {
-diff --git a/drivers/i2c/busses/i2c-exynos5.c b/drivers/i2c/busses/i2c-exynos5.c
-index 9fd711c03dd2..6fcc0b288fc4 100644
 --- a/drivers/i2c/busses/i2c-exynos5.c
 +++ b/drivers/i2c/busses/i2c-exynos5.c
-@@ -621,10 +621,8 @@ static int exynos5_i2c_probe(struct platform_device *pdev)
+@@ -621,10 +621,8 @@ static int exynos5_i2c_probe(struct plat
  	int ret;
  
  	i2c = devm_kzalloc(&pdev->dev, sizeof(struct exynos5_i2c), GFP_KERNEL);
@@ -100,11 +92,9 @@ index 9fd711c03dd2..6fcc0b288fc4 100644
  
  	if (of_property_read_u32(np, "clock-frequency", &op_clock)) {
  		i2c->speed_mode = HSI2C_FAST_SPD;
-diff --git a/drivers/i2c/busses/i2c-imx.c b/drivers/i2c/busses/i2c-imx.c
-index db895fb22e65..584e002fa252 100644
 --- a/drivers/i2c/busses/i2c-imx.c
 +++ b/drivers/i2c/busses/i2c-imx.c
-@@ -617,10 +617,8 @@ static int i2c_imx_probe(struct platform_device *pdev)
+@@ -617,10 +617,8 @@ static int i2c_imx_probe(struct platform
  
  	i2c_imx = devm_kzalloc(&pdev->dev, sizeof(struct imx_i2c_struct),
  				GFP_KERNEL);
@@ -116,11 +106,9 @@ index db895fb22e65..584e002fa252 100644
  
  	if (of_id)
  		i2c_imx->hwdata = of_id->data;
-diff --git a/drivers/i2c/busses/i2c-omap.c b/drivers/i2c/busses/i2c-omap.c
-index 90dcc2eaac5f..fe9ee696ac49 100644
 --- a/drivers/i2c/busses/i2c-omap.c
 +++ b/drivers/i2c/busses/i2c-omap.c
-@@ -1114,10 +1114,8 @@ omap_i2c_probe(struct platform_device *pdev)
+@@ -1114,10 +1114,8 @@ omap_i2c_probe(struct platform_device *p
  	}
  
  	dev = devm_kzalloc(&pdev->dev, sizeof(struct omap_i2c_dev), GFP_KERNEL);
@@ -132,11 +120,9 @@ index 90dcc2eaac5f..fe9ee696ac49 100644
  
  	mem = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	dev->base = devm_ioremap_resource(&pdev->dev, mem);
-diff --git a/drivers/i2c/busses/i2c-rcar.c b/drivers/i2c/busses/i2c-rcar.c
-index 71e88d055500..899405923678 100644
 --- a/drivers/i2c/busses/i2c-rcar.c
 +++ b/drivers/i2c/busses/i2c-rcar.c
-@@ -509,10 +509,8 @@ static int rcar_i2c_probe(struct platform_device *pdev)
+@@ -509,10 +509,8 @@ static int rcar_i2c_probe(struct platfor
  	int irq, ret;
  
  	priv = devm_kzalloc(dev, sizeof(struct rcar_i2c_priv), GFP_KERNEL);
@@ -148,11 +134,9 @@ index 71e88d055500..899405923678 100644
  
  	priv->clk = devm_clk_get(dev, NULL);
  	if (IS_ERR(priv->clk)) {
-diff --git a/drivers/i2c/busses/i2c-s3c2410.c b/drivers/i2c/busses/i2c-s3c2410.c
-index 93ec37649346..5e74249dbd13 100644
 --- a/drivers/i2c/busses/i2c-s3c2410.c
 +++ b/drivers/i2c/busses/i2c-s3c2410.c
-@@ -1085,16 +1085,12 @@ static int s3c24xx_i2c_probe(struct platform_device *pdev)
+@@ -1087,16 +1087,12 @@ static int s3c24xx_i2c_probe(struct plat
  	}
  
  	i2c = devm_kzalloc(&pdev->dev, sizeof(struct s3c24xx_i2c), GFP_KERNEL);
@@ -171,11 +155,9 @@ index 93ec37649346..5e74249dbd13 100644
  
  	i2c->quirks = s3c24xx_get_device_quirks(pdev);
  	if (pdata)
-diff --git a/drivers/i2c/busses/i2c-simtec.c b/drivers/i2c/busses/i2c-simtec.c
-index 294c80f21d65..964e5c6f84ab 100644
 --- a/drivers/i2c/busses/i2c-simtec.c
 +++ b/drivers/i2c/busses/i2c-simtec.c
-@@ -77,10 +77,8 @@ static int simtec_i2c_probe(struct platform_device *dev)
+@@ -77,10 +77,8 @@ static int simtec_i2c_probe(struct platf
  	int ret;
  
  	pd = kzalloc(sizeof(struct simtec_i2c_data), GFP_KERNEL);
@@ -187,11 +169,9 @@ index 294c80f21d65..964e5c6f84ab 100644
  
  	platform_set_drvdata(dev, pd);
  
-diff --git a/drivers/i2c/busses/i2c-sirf.c b/drivers/i2c/busses/i2c-sirf.c
-index 6784f7f527a4..02556c0ff27a 100644
 --- a/drivers/i2c/busses/i2c-sirf.c
 +++ b/drivers/i2c/busses/i2c-sirf.c
-@@ -307,7 +307,6 @@ static int i2c_sirfsoc_probe(struct platform_device *pdev)
+@@ -307,7 +307,6 @@ static int i2c_sirfsoc_probe(struct plat
  
  	siic = devm_kzalloc(&pdev->dev, sizeof(*siic), GFP_KERNEL);
  	if (!siic) {
@@ -199,11 +179,9 @@ index 6784f7f527a4..02556c0ff27a 100644
  		err = -ENOMEM;
  		goto out;
  	}
-diff --git a/drivers/i2c/busses/i2c-stu300.c b/drivers/i2c/busses/i2c-stu300.c
-index 5b80ef310841..dc57a16c0e73 100644
 --- a/drivers/i2c/busses/i2c-stu300.c
 +++ b/drivers/i2c/busses/i2c-stu300.c
-@@ -868,10 +868,8 @@ static int stu300_probe(struct platform_device *pdev)
+@@ -868,10 +868,8 @@ static int stu300_probe(struct platform_
  	int ret = 0;
  
  	dev = devm_kzalloc(&pdev->dev, sizeof(struct stu300_dev), GFP_KERNEL);
@@ -215,11 +193,9 @@ index 5b80ef310841..dc57a16c0e73 100644
  
  	bus_nr = pdev->id;
  	dev->clk = devm_clk_get(&pdev->dev, NULL);
-diff --git a/drivers/i2c/busses/i2c-tegra.c b/drivers/i2c/busses/i2c-tegra.c
-index 9704537aee3c..8f6f1e4141c1 100644
 --- a/drivers/i2c/busses/i2c-tegra.c
 +++ b/drivers/i2c/busses/i2c-tegra.c
-@@ -732,10 +732,8 @@ static int tegra_i2c_probe(struct platform_device *pdev)
+@@ -732,10 +732,8 @@ static int tegra_i2c_probe(struct platfo
  	}
  
  	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
@@ -231,11 +207,9 @@ index 9704537aee3c..8f6f1e4141c1 100644
  
  	i2c_dev->base = base;
  	i2c_dev->div_clk = div_clk;
-diff --git a/drivers/i2c/busses/i2c-wmt.c b/drivers/i2c/busses/i2c-wmt.c
-index 2c8a3e4f9008..889a212b6c3d 100644
 --- a/drivers/i2c/busses/i2c-wmt.c
 +++ b/drivers/i2c/busses/i2c-wmt.c
-@@ -379,10 +379,8 @@ static int wmt_i2c_probe(struct platform_device *pdev)
+@@ -379,10 +379,8 @@ static int wmt_i2c_probe(struct platform
  	u32 clk_rate;
  
  	i2c_dev = devm_kzalloc(&pdev->dev, sizeof(*i2c_dev), GFP_KERNEL);
@@ -247,11 +221,9 @@ index 2c8a3e4f9008..889a212b6c3d 100644
  
  	res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
  	i2c_dev->base = devm_ioremap_resource(&pdev->dev, res);
-diff --git a/drivers/i2c/busses/scx200_acb.c b/drivers/i2c/busses/scx200_acb.c
-index 2d1d2c5653fb..99d6bb3f9d3f 100644
 --- a/drivers/i2c/busses/scx200_acb.c
 +++ b/drivers/i2c/busses/scx200_acb.c
-@@ -431,10 +431,8 @@ static struct scx200_acb_iface *scx200_create_iface(const char *text,
+@@ -431,10 +431,8 @@ static struct scx200_acb_iface *scx200_c
  	struct i2c_adapter *adapter;
  
  	iface = kzalloc(sizeof(*iface), GFP_KERNEL);
@@ -263,6 +235,3 @@ index 2d1d2c5653fb..99d6bb3f9d3f 100644
  
  	adapter = &iface->adapter;
  	i2c_set_adapdata(adapter, iface);
--- 
-2.1.2
-
diff --git a/patches.renesas/0400-pinctrl-allows-not-to-define-the-get_group_pins-oper.patch b/patches.renesas/0400-pinctrl-allows-not-to-define-the-get_group_pins-oper.patch
index cba44f4ada3bcc..dcb7b91b623587 100644
--- a/patches.renesas/0400-pinctrl-allows-not-to-define-the-get_group_pins-oper.patch
+++ b/patches.renesas/0400-pinctrl-allows-not-to-define-the-get_group_pins-oper.patch
@@ -30,15 +30,13 @@ Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
 (cherry picked from commit e5b3b2d9ed202697a937c282f9c4d93b1e3e0848)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/pinctrl/core.c   | 17 ++++++++++-------
- drivers/pinctrl/pinmux.c | 23 +++++++++++++----------
+ drivers/pinctrl/core.c   |   17 ++++++++++-------
+ drivers/pinctrl/pinmux.c |   23 +++++++++++++----------
  2 files changed, 23 insertions(+), 17 deletions(-)
 
-diff --git a/drivers/pinctrl/core.c b/drivers/pinctrl/core.c
-index c0fe6091566a..e09474ecde23 100644
 --- a/drivers/pinctrl/core.c
 +++ b/drivers/pinctrl/core.c
-@@ -468,6 +468,9 @@ int pinctrl_get_group_pins(struct pinctrl_dev *pctldev, const char *pin_group,
+@@ -468,6 +468,9 @@ int pinctrl_get_group_pins(struct pinctr
  	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
  	int gs;
  
@@ -48,7 +46,7 @@ index c0fe6091566a..e09474ecde23 100644
  	gs = pinctrl_get_group_selector(pctldev, pin_group);
  	if (gs < 0)
  		return gs;
-@@ -1362,15 +1365,16 @@ static int pinctrl_groups_show(struct seq_file *s, void *what)
+@@ -1360,15 +1363,16 @@ static int pinctrl_groups_show(struct se
  
  	seq_puts(s, "registered pin groups:\n");
  	while (selector < ngroups) {
@@ -70,7 +68,7 @@ index c0fe6091566a..e09474ecde23 100644
  		if (ret)
  			seq_printf(s, "%s [ERROR GETTING PINS]\n",
  				   gname);
-@@ -1694,8 +1698,7 @@ static int pinctrl_check_ops(struct pinctrl_dev *pctldev)
+@@ -1692,8 +1696,7 @@ static int pinctrl_check_ops(struct pinc
  
  	if (!ops ||
  	    !ops->get_groups_count ||
@@ -80,11 +78,9 @@ index c0fe6091566a..e09474ecde23 100644
  		return -EINVAL;
  
  	if (ops->dt_node_to_map && !ops->dt_free_map)
-diff --git a/drivers/pinctrl/pinmux.c b/drivers/pinctrl/pinmux.c
-index 9248ce4efed4..051e8592990e 100644
 --- a/drivers/pinctrl/pinmux.c
 +++ b/drivers/pinctrl/pinmux.c
-@@ -391,14 +391,16 @@ int pinmux_enable_setting(struct pinctrl_setting const *setting)
+@@ -391,14 +391,16 @@ int pinmux_enable_setting(struct pinctrl
  	struct pinctrl_dev *pctldev = setting->pctldev;
  	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
  	const struct pinmux_ops *ops = pctldev->desc->pmxops;
@@ -106,7 +102,7 @@ index 9248ce4efed4..051e8592990e 100644
  	if (ret) {
  		const char *gname;
  
-@@ -470,14 +472,15 @@ void pinmux_disable_setting(struct pinctrl_setting const *setting)
+@@ -470,14 +472,15 @@ void pinmux_disable_setting(struct pinct
  	struct pinctrl_dev *pctldev = setting->pctldev;
  	const struct pinctrl_ops *pctlops = pctldev->desc->pctlops;
  	const struct pinmux_ops *ops = pctldev->desc->pmxops;
@@ -127,6 +123,3 @@ index 9248ce4efed4..051e8592990e 100644
  	if (ret) {
  		const char *gname;
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0530-usb-host-xhci-plat-add-clock-support.patch b/patches.renesas/0530-usb-host-xhci-plat-add-clock-support.patch
index 32545bcef99168..b90cac86917516 100644
--- a/patches.renesas/0530-usb-host-xhci-plat-add-clock-support.patch
+++ b/patches.renesas/0530-usb-host-xhci-plat-add-clock-support.patch
@@ -21,12 +21,10 @@ Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
 (cherry picked from commit 4718c177405112386a977fd9f1cba5fd6aa82315)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- drivers/usb/host/xhci-plat.c | 24 +++++++++++++++++++++++-
- drivers/usb/host/xhci.h      |  2 ++
+ drivers/usb/host/xhci-plat.c |   24 +++++++++++++++++++++++-
+ drivers/usb/host/xhci.h      |    2 ++
  2 files changed, 25 insertions(+), 1 deletion(-)
 
-diff --git a/drivers/usb/host/xhci-plat.c b/drivers/usb/host/xhci-plat.c
-index 706fe185fe4d..17465cce6d0d 100644
 --- a/drivers/usb/host/xhci-plat.c
 +++ b/drivers/usb/host/xhci-plat.c
 @@ -11,6 +11,7 @@
@@ -37,7 +35,7 @@ index 706fe185fe4d..17465cce6d0d 100644
  #include <linux/dma-mapping.h>
  #include <linux/module.h>
  #include <linux/of.h>
-@@ -91,6 +92,7 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -91,6 +92,7 @@ static int xhci_plat_probe(struct platfo
  	struct xhci_hcd		*xhci;
  	struct resource         *res;
  	struct usb_hcd		*hcd;
@@ -45,7 +43,7 @@ index 706fe185fe4d..17465cce6d0d 100644
  	int			ret;
  	int			irq;
  
-@@ -137,14 +139,27 @@ static int xhci_plat_probe(struct platform_device *pdev)
+@@ -137,14 +139,27 @@ static int xhci_plat_probe(struct platfo
  		goto release_mem_region;
  	}
  
@@ -85,7 +83,7 @@ index 706fe185fe4d..17465cce6d0d 100644
  unmap_registers:
  	iounmap(hcd->regs);
  
-@@ -186,11 +205,14 @@ static int xhci_plat_remove(struct platform_device *dev)
+@@ -186,11 +205,14 @@ static int xhci_plat_remove(struct platf
  {
  	struct usb_hcd	*hcd = platform_get_drvdata(dev);
  	struct xhci_hcd	*xhci = hcd_to_xhci(hcd);
@@ -100,11 +98,9 @@ index 706fe185fe4d..17465cce6d0d 100644
  	iounmap(hcd->regs);
  	release_mem_region(hcd->rsrc_start, hcd->rsrc_len);
  	usb_put_hcd(hcd);
-diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
-index 8faef64371c6..1e60ab8f8f5b 100644
 --- a/drivers/usb/host/xhci.h
 +++ b/drivers/usb/host/xhci.h
-@@ -1473,6 +1473,8 @@ struct xhci_hcd {
+@@ -1478,6 +1478,8 @@ struct xhci_hcd {
  	/* msi-x vectors */
  	int		msix_count;
  	struct msix_entry	*msix_entries;
@@ -113,6 +109,3 @@ index 8faef64371c6..1e60ab8f8f5b 100644
  	/* data structures */
  	struct xhci_device_context_array *dcbaa;
  	struct xhci_ring	*cmd_ring;
--- 
-2.1.2
-
diff --git a/patches.renesas/0629-ARM-shmobile-sh73a0-Switch-to-new-style-CMT-device.patch b/patches.renesas/0629-ARM-shmobile-sh73a0-Switch-to-new-style-CMT-device.patch
index 27cba7c0f51358..53c081f0feef54 100644
--- a/patches.renesas/0629-ARM-shmobile-sh73a0-Switch-to-new-style-CMT-device.patch
+++ b/patches.renesas/0629-ARM-shmobile-sh73a0-Switch-to-new-style-CMT-device.patch
@@ -12,12 +12,10 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 652256fd475053f7fd8c2cd3e85f37be96d594db)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/mach-shmobile/clock-sh73a0.c |  2 +-
- arch/arm/mach-shmobile/setup-sh73a0.c | 36 ++++++++++++-----------------------
+ arch/arm/mach-shmobile/clock-sh73a0.c |    2 -
+ arch/arm/mach-shmobile/setup-sh73a0.c |   36 +++++++++++-----------------------
  2 files changed, 13 insertions(+), 25 deletions(-)
 
-diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
-index 23edf8360c27..ca03989c0d78 100644
 --- a/arch/arm/mach-shmobile/clock-sh73a0.c
 +++ b/arch/arm/mach-shmobile/clock-sh73a0.c
 @@ -650,7 +650,6 @@ static struct clk_lookup lookups[] = {
@@ -36,11 +34,9 @@ index 23edf8360c27..ca03989c0d78 100644
  };
  
  void __init sh73a0_clock_init(void)
-diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
-index f74ab530c71d..71d0e4460a10 100644
 --- a/arch/arm/mach-shmobile/setup-sh73a0.c
 +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
-@@ -104,35 +104,23 @@ SH73A0_SCIF(PORT_SCIFA, 6, 0xe6cc0000, gic_spi(156));
+@@ -104,35 +104,23 @@ SH73A0_SCIF(PORT_SCIFA, 6, 0xe6cc0000, g
  SH73A0_SCIF(PORT_SCIFA, 7, 0xe6cd0000, gic_spi(143));
  SH73A0_SCIF(PORT_SCIFB, 8, 0xe6c30000, gic_spi(80));
  
@@ -87,7 +83,7 @@ index f74ab530c71d..71d0e4460a10 100644
  };
  
  /* TMU */
-@@ -746,7 +734,7 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = {
+@@ -749,7 +737,7 @@ static struct platform_device *sh73a0_de
  	&scif6_device,
  	&scif7_device,
  	&scif8_device,
@@ -96,6 +92,3 @@ index f74ab530c71d..71d0e4460a10 100644
  };
  
  static struct platform_device *sh73a0_early_devices[] __initdata = {
--- 
-2.1.2
-
diff --git a/patches.renesas/0635-ARM-shmobile-sh73a0-Switch-to-new-style-TMU-device.patch b/patches.renesas/0635-ARM-shmobile-sh73a0-Switch-to-new-style-TMU-device.patch
index 09e7e622b6b766..ef1d40f54b552b 100644
--- a/patches.renesas/0635-ARM-shmobile-sh73a0-Switch-to-new-style-TMU-device.patch
+++ b/patches.renesas/0635-ARM-shmobile-sh73a0-Switch-to-new-style-TMU-device.patch
@@ -12,12 +12,10 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 3df592bc335a6efe30c88c9e39d29ceb5c20bbfb)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/mach-shmobile/clock-sh73a0.c |  3 +-
- arch/arm/mach-shmobile/setup-sh73a0.c | 56 ++++++++---------------------------
+ arch/arm/mach-shmobile/clock-sh73a0.c |    3 -
+ arch/arm/mach-shmobile/setup-sh73a0.c |   56 +++++++---------------------------
  2 files changed, 14 insertions(+), 45 deletions(-)
 
-diff --git a/arch/arm/mach-shmobile/clock-sh73a0.c b/arch/arm/mach-shmobile/clock-sh73a0.c
-index ca03989c0d78..0d9cd1fe0212 100644
 --- a/arch/arm/mach-shmobile/clock-sh73a0.c
 +++ b/arch/arm/mach-shmobile/clock-sh73a0.c
 @@ -633,8 +633,6 @@ static struct clk_lookup lookups[] = {
@@ -37,11 +35,9 @@ index ca03989c0d78..0d9cd1fe0212 100644
  };
  
  void __init sh73a0_clock_init(void)
-diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
-index 71d0e4460a10..ad00724a2269 100644
 --- a/arch/arm/mach-shmobile/setup-sh73a0.c
 +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
-@@ -124,54 +124,25 @@ static struct platform_device cmt1_device = {
+@@ -124,54 +124,25 @@ static struct platform_device cmt1_devic
  };
  
  /* TMU */
@@ -108,7 +104,7 @@ index 71d0e4460a10..ad00724a2269 100644
  };
  
  static struct resource i2c0_resources[] = {
-@@ -738,8 +709,7 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = {
+@@ -741,8 +712,7 @@ static struct platform_device *sh73a0_de
  };
  
  static struct platform_device *sh73a0_early_devices[] __initdata = {
@@ -118,6 +114,3 @@ index 71d0e4460a10..ad00724a2269 100644
  	&ipmmu_device,
  };
  
--- 
-2.1.2
-
diff --git a/patches.renesas/0947-ARM-shmobile-kzm9g-reference-Initialise-SCIF-device-.patch b/patches.renesas/0947-ARM-shmobile-kzm9g-reference-Initialise-SCIF-device-.patch
index 488b072e7b1c1f..d560de2b64025f 100644
--- a/patches.renesas/0947-ARM-shmobile-kzm9g-reference-Initialise-SCIF-device-.patch
+++ b/patches.renesas/0947-ARM-shmobile-kzm9g-reference-Initialise-SCIF-device-.patch
@@ -10,12 +10,10 @@ Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 (cherry picked from commit 700ce7c2bb2a4963472d95eba1436d6b0945918e)
 Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
 ---
- arch/arm/boot/dts/sh73a0-kzm9g-reference.dts | 14 +++++++++++---
- arch/arm/mach-shmobile/setup-sh73a0.c        |  8 ++++----
+ arch/arm/boot/dts/sh73a0-kzm9g-reference.dts |   14 +++++++++++---
+ arch/arm/mach-shmobile/setup-sh73a0.c        |    8 ++++----
  2 files changed, 15 insertions(+), 7 deletions(-)
 
-diff --git a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
-index 838f93e44452..18662aec2ec4 100644
 --- a/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
 +++ b/arch/arm/boot/dts/sh73a0-kzm9g-reference.dts
 @@ -21,6 +21,10 @@
@@ -53,11 +51,9 @@ index 838f93e44452..18662aec2ec4 100644
  &sdhi0 {
  	pinctrl-0 = <&sdhi0_pins>;
  	pinctrl-names = "default";
-diff --git a/arch/arm/mach-shmobile/setup-sh73a0.c b/arch/arm/mach-shmobile/setup-sh73a0.c
-index 224882151667..2c802ae9b241 100644
 --- a/arch/arm/mach-shmobile/setup-sh73a0.c
 +++ b/arch/arm/mach-shmobile/setup-sh73a0.c
-@@ -697,6 +697,10 @@ static struct platform_device irqpin3_device = {
+@@ -700,6 +700,10 @@ static struct platform_device irqpin3_de
  };
  
  static struct platform_device *sh73a0_devices_dt[] __initdata = {
@@ -68,7 +64,7 @@ index 224882151667..2c802ae9b241 100644
  	&scif0_device,
  	&scif1_device,
  	&scif2_device,
-@@ -706,10 +710,6 @@ static struct platform_device *sh73a0_devices_dt[] __initdata = {
+@@ -709,10 +713,6 @@ static struct platform_device *sh73a0_de
  	&scif6_device,
  	&scif7_device,
  	&scif8_device,
@@ -79,6 +75,3 @@ index 224882151667..2c802ae9b241 100644
  	&tmu0_device,
  	&ipmmu_device,
  };
--- 
-2.1.2
-