kernel: bump 4.9 to 4.9.137

Refreshed all patches.

Removed upstreamed hunks in:
- 703-phy-support-layerscape.patch

Compile-tested on: ar71xx, layerscape
Runtime-tested on: ar71xx

Signed-off-by: Koen Vandeputte <koen.vandeputte@ncentric.com>

15 files changed, 27 insertions, 27 deletions

diff --git a/target/linux/brcm2708/patches-4.9/031-v4.10-0001-ARM-dts-bcm283x-Define-standard-pinctrl-groups-in-th.patch b/target/linux/brcm2708/patches-4.9/031-v4.10-0001-ARM-dts-bcm283x-Define-standard-pinctrl-groups-in-th.patch
index 6173d943d2..ac9bd2ba03 100644
--- a/target/linux/brcm2708/patches-4.9/031-v4.10-0001-ARM-dts-bcm283x-Define-standard-pinctrl-groups-in-th.patch
+++ b/target/linux/brcm2708/patches-4.9/031-v4.10-0001-ARM-dts-bcm283x-Define-standard-pinctrl-groups-in-th.patch
@@ -23,7 +23,7 @@ Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -132,6 +132,209 @@
+@@ -137,6 +137,209 @@
  
  			interrupt-controller;
  			#interrupt-cells = <2>;
diff --git a/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch b/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
index 4c541a7669..e561e058e5 100644
--- a/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
+++ b/target/linux/brcm2708/patches-4.9/031-v4.10-0008-ARM-bcm2835-dts-add-thermal-node-to-device-tree-of-b.patch
@@ -51,7 +51,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 +};
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -390,6 +390,13 @@
+@@ -395,6 +395,13 @@
  			interrupts = <2 14>; /* pwa1 */
  		};
  
diff --git a/target/linux/brcm2708/patches-4.9/032-v4.11-0001-ARM-dts-bcm283x-Add-VEC-node-in-bcm283x.dtsi.patch b/target/linux/brcm2708/patches-4.9/032-v4.11-0001-ARM-dts-bcm283x-Add-VEC-node-in-bcm283x.dtsi.patch
index c0d43870ec..17e9b3e3f5 100644
--- a/target/linux/brcm2708/patches-4.9/032-v4.11-0001-ARM-dts-bcm283x-Add-VEC-node-in-bcm283x.dtsi.patch
+++ b/target/linux/brcm2708/patches-4.9/032-v4.11-0001-ARM-dts-bcm283x-Add-VEC-node-in-bcm283x.dtsi.patch
@@ -13,7 +13,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -476,6 +476,14 @@
+@@ -481,6 +481,14 @@
  			status = "disabled";
  		};
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0001-smsx95xx-fix-crimes-against-truesize.patch b/target/linux/brcm2708/patches-4.9/950-0001-smsx95xx-fix-crimes-against-truesize.patch
index a5737e3c83..8916e52741 100644
--- a/target/linux/brcm2708/patches-4.9/950-0001-smsx95xx-fix-crimes-against-truesize.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0001-smsx95xx-fix-crimes-against-truesize.patch
@@ -25,7 +25,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -1951,7 +1955,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1954,7 +1958,8 @@ static int smsc95xx_rx_fixup(struct usbn
  				if (dev->net->features & NETIF_F_RXCSUM)
  					smsc95xx_rx_csum_offload(skb);
  				skb_trim(skb, skb->len - 4); /* remove fcs */
@@ -35,7 +35,7 @@ Signed-off-by: Steve Glendinning <steve.glendinning@smsc.com>
  
  				return 1;
  			}
-@@ -1969,7 +1974,8 @@ static int smsc95xx_rx_fixup(struct usbn
+@@ -1972,7 +1977,8 @@ static int smsc95xx_rx_fixup(struct usbn
  			if (dev->net->features & NETIF_F_RXCSUM)
  				smsc95xx_rx_csum_offload(ax_skb);
  			skb_trim(ax_skb, ax_skb->len - 4); /* remove fcs */
diff --git a/target/linux/brcm2708/patches-4.9/950-0002-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch b/target/linux/brcm2708/patches-4.9/950-0002-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
index fc7ac4d8b9..763b5c7375 100644
--- a/target/linux/brcm2708/patches-4.9/950-0002-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0002-smsc95xx-Experimental-Enable-turbo_mode-and-packetsi.patch
@@ -22,7 +22,7 @@ See: http://forum.kodi.tv/showthread.php?tid=285288
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -1106,13 +1110,13 @@ static int smsc95xx_reset(struct usbnet
+@@ -1109,13 +1113,13 @@ static int smsc95xx_reset(struct usbnet
  
  	if (!turbo_mode) {
  		burst_cap = 0;
diff --git a/target/linux/brcm2708/patches-4.9/950-0003-Allow-mac-address-to-be-set-in-smsc95xx.patch b/target/linux/brcm2708/patches-4.9/950-0003-Allow-mac-address-to-be-set-in-smsc95xx.patch
index 8075dff2f3..fdf5fc86d7 100644
--- a/target/linux/brcm2708/patches-4.9/950-0003-Allow-mac-address-to-be-set-in-smsc95xx.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0003-Allow-mac-address-to-be-set-in-smsc95xx.patch
@@ -29,7 +29,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -918,6 +923,53 @@ static int smsc95xx_ioctl(struct net_dev
+@@ -921,6 +926,53 @@ static int smsc95xx_ioctl(struct net_dev
  	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
  }
  
@@ -83,7 +83,7 @@ Signed-off-by: popcornmix <popcornmix@gmail.com>
  static void smsc95xx_init_mac_address(struct usbnet *dev)
  {
  	const u8 *mac_addr;
-@@ -939,6 +991,10 @@ static void smsc95xx_init_mac_address(st
+@@ -942,6 +994,10 @@ static void smsc95xx_init_mac_address(st
  		}
  	}
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch b/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch
index 6646d77944..0d9b165aba 100644
--- a/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0107-i2c-bcm2835-Protect-against-unexpected-TXW-RXR-inter.patch
@@ -70,7 +70,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
  	}
  
  	if (val & BCM2835_I2C_S_DONE) {
-@@ -137,21 +141,38 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -139,21 +143,38 @@ static irqreturn_t bcm2835_i2c_isr(int t
  			i2c_dev->msg_err = BCM2835_I2C_S_LEN;
  		else
  			i2c_dev->msg_err = 0;
@@ -111,7 +111,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
  }
  
  static int bcm2835_i2c_xfer_msg(struct bcm2835_i2c_dev *i2c_dev,
-@@ -181,8 +202,9 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -183,8 +204,9 @@ static int bcm2835_i2c_xfer_msg(struct b
  
  	time_left = wait_for_completion_timeout(&i2c_dev->completion,
  						BCM2835_I2C_TIMEOUT);
diff --git a/target/linux/brcm2708/patches-4.9/950-0108-i2c-bcm2835-Use-dev_dbg-logging-on-transfer-errors.patch b/target/linux/brcm2708/patches-4.9/950-0108-i2c-bcm2835-Use-dev_dbg-logging-on-transfer-errors.patch
index acc2ade0a3..a3c68467be 100644
--- a/target/linux/brcm2708/patches-4.9/950-0108-i2c-bcm2835-Use-dev_dbg-logging-on-transfer-errors.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0108-i2c-bcm2835-Use-dev_dbg-logging-on-transfer-errors.patch
@@ -21,7 +21,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
 
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -216,7 +216,7 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -218,7 +218,7 @@ static int bcm2835_i2c_xfer_msg(struct b
  	    (msg->flags & I2C_M_IGNORE_NAK))
  		return 0;
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0109-i2c-bcm2835-Can-t-support-I2C_M_IGNORE_NAK.patch b/target/linux/brcm2708/patches-4.9/950-0109-i2c-bcm2835-Can-t-support-I2C_M_IGNORE_NAK.patch
index a913c50082..65bf08fe8a 100644
--- a/target/linux/brcm2708/patches-4.9/950-0109-i2c-bcm2835-Can-t-support-I2C_M_IGNORE_NAK.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0109-i2c-bcm2835-Can-t-support-I2C_M_IGNORE_NAK.patch
@@ -31,7 +31,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
 
 --- a/drivers/i2c/busses/i2c-bcm2835.c
 +++ b/drivers/i2c/busses/i2c-bcm2835.c
-@@ -212,10 +212,6 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -214,10 +214,6 @@ static int bcm2835_i2c_xfer_msg(struct b
  	if (likely(!i2c_dev->msg_err))
  		return 0;
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
index 0cd5aa4693..9ae16e426a 100644
--- a/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0110-i2c-bcm2835-Add-support-for-Repeated-Start-Condition.patch
@@ -86,7 +86,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
   * Note about I2C_C_CLEAR on error:
   * The I2C_C_CLEAR on errors will take some time to resolve -- if you were in
   * non-idle state and I2C_C_READ, it sets an abort_rx flag and runs through
-@@ -151,6 +191,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
+@@ -153,6 +193,12 @@ static irqreturn_t bcm2835_i2c_isr(int t
  		}
  
  		bcm2835_fill_txfifo(i2c_dev);
@@ -99,7 +99,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
  		return IRQ_HANDLED;
  	}
  
-@@ -175,30 +221,25 @@ complete:
+@@ -177,30 +223,25 @@ complete:
  	return IRQ_HANDLED;
  }
  
@@ -144,7 +144,7 @@ Acked-by: Eric Anholt <eric@anholt.net>
  
  	time_left = wait_for_completion_timeout(&i2c_dev->completion,
  						BCM2835_I2C_TIMEOUT);
-@@ -209,31 +250,15 @@ static int bcm2835_i2c_xfer_msg(struct b
+@@ -211,31 +252,15 @@ static int bcm2835_i2c_xfer_msg(struct b
  		return -ETIMEDOUT;
  	}
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0111-i2c-bcm2835-Support-i2c-dev-ioctl-I2C_TIMEOUT.patch b/target/linux/brcm2708/patches-4.9/950-0111-i2c-bcm2835-Support-i2c-dev-ioctl-I2C_TIMEOUT.patch
index 07016d9782..d939c1d6f8 100644
--- a/target/linux/brcm2708/patches-4.9/950-0111-i2c-bcm2835-Support-i2c-dev-ioctl-I2C_TIMEOUT.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0111-i2c-bcm2835-Support-i2c-dev-ioctl-I2C_TIMEOUT.patch
@@ -26,7 +26,7 @@ Reviewed-by: Eric Anholt <eric@anholt.net>
  struct bcm2835_i2c_dev {
  	struct device *dev;
  	void __iomem *regs;
-@@ -242,7 +240,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -244,7 +242,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
  	bcm2835_i2c_start_transfer(i2c_dev);
  
  	time_left = wait_for_completion_timeout(&i2c_dev->completion,
diff --git a/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch b/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch
index afe2b2297c..d287ae2cb7 100644
--- a/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0112-i2c-bcm2835-Add-support-for-dynamic-clock.patch
@@ -56,7 +56,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  static void bcm2835_fill_txfifo(struct bcm2835_i2c_dev *i2c_dev)
  {
  	u32 val;
-@@ -224,7 +249,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -226,7 +251,7 @@ static int bcm2835_i2c_xfer(struct i2c_a
  {
  	struct bcm2835_i2c_dev *i2c_dev = i2c_get_adapdata(adap);
  	unsigned long time_left;
@@ -65,7 +65,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  
  	for (i = 0; i < (num - 1); i++)
  		if (msgs[i].flags & I2C_M_RD) {
-@@ -233,6 +258,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -235,6 +260,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
  			return -EOPNOTSUPP;
  		}
  
@@ -76,7 +76,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  	i2c_dev->curr_msg = msgs;
  	i2c_dev->num_msgs = num;
  	reinit_completion(&i2c_dev->completion);
-@@ -282,7 +311,6 @@ static int bcm2835_i2c_probe(struct plat
+@@ -284,7 +313,6 @@ static int bcm2835_i2c_probe(struct plat
  {
  	struct bcm2835_i2c_dev *i2c_dev;
  	struct resource *mem, *irq;
@@ -84,7 +84,7 @@ Reviewed-by: Martin Sperl <kernel@martin.sperl.org>
  	int ret;
  	struct i2c_adapter *adap;
  
-@@ -306,28 +334,13 @@ static int bcm2835_i2c_probe(struct plat
+@@ -308,28 +336,13 @@ static int bcm2835_i2c_probe(struct plat
  	}
  
  	ret = of_property_read_u32(pdev->dev.of_node, "clock-frequency",
diff --git a/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch b/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch
index f69a48f623..8e31bcc5e7 100644
--- a/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0113-i2c-bcm2835-Add-debug-support.patch
@@ -151,7 +151,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  
  	err = val & (BCM2835_I2C_S_CLKT | BCM2835_I2C_S_ERR);
  	if (err) {
-@@ -251,6 +335,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -253,6 +337,13 @@ static int bcm2835_i2c_xfer(struct i2c_a
  	unsigned long time_left;
  	int i, ret;
  
@@ -165,7 +165,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  	for (i = 0; i < (num - 1); i++)
  		if (msgs[i].flags & I2C_M_RD) {
  			dev_warn_once(i2c_dev->dev,
-@@ -270,6 +361,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -272,6 +363,10 @@ static int bcm2835_i2c_xfer(struct i2c_a
  
  	time_left = wait_for_completion_timeout(&i2c_dev->completion,
  						adap->timeout);
@@ -176,7 +176,7 @@ Signed-off-by: Noralf Trønnes <noralf@tronnes.org>
  	if (!time_left) {
  		bcm2835_i2c_writel(i2c_dev, BCM2835_I2C_C,
  				   BCM2835_I2C_C_CLEAR);
-@@ -280,7 +375,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
+@@ -282,7 +377,9 @@ static int bcm2835_i2c_xfer(struct i2c_a
  	if (!i2c_dev->msg_err)
  		return num;
  
diff --git a/target/linux/brcm2708/patches-4.9/950-0126-spi-bcm2835-Disable-forced-software-CS.patch b/target/linux/brcm2708/patches-4.9/950-0126-spi-bcm2835-Disable-forced-software-CS.patch
index 34acd201ba..1d2bd29ab6 100644
--- a/target/linux/brcm2708/patches-4.9/950-0126-spi-bcm2835-Disable-forced-software-CS.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0126-spi-bcm2835-Disable-forced-software-CS.patch
@@ -16,7 +16,7 @@ Signed-off-by: Phil Elwell <phil@raspberrypi.org>
 
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -366,6 +366,7 @@
+@@ -371,6 +371,7 @@
  			#address-cells = <1>;
  			#size-cells = <0>;
  			status = "disabled";
diff --git a/target/linux/brcm2708/patches-4.9/950-0160-ARM-bcm2835-dt-Add-the-DSI-module-nodes-and-clocks.patch b/target/linux/brcm2708/patches-4.9/950-0160-ARM-bcm2835-dt-Add-the-DSI-module-nodes-and-clocks.patch
index 00703579e5..285a7b3530 100644
--- a/target/linux/brcm2708/patches-4.9/950-0160-ARM-bcm2835-dt-Add-the-DSI-module-nodes-and-clocks.patch
+++ b/target/linux/brcm2708/patches-4.9/950-0160-ARM-bcm2835-dt-Add-the-DSI-module-nodes-and-clocks.patch
@@ -28,7 +28,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
 +};
 --- a/arch/arm/boot/dts/bcm283x.dtsi
 +++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -93,10 +93,13 @@
+@@ -98,10 +98,13 @@
  			#clock-cells = <1>;
  			reg = <0x7e101000 0x2000>;
  
@@ -45,7 +45,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  		};
  
  		rng@7e104000 {
-@@ -398,6 +401,26 @@
+@@ -403,6 +406,26 @@
  			status = "disabled";
  		};
  
@@ -72,7 +72,7 @@ Signed-off-by: Eric Anholt <eric@anholt.net>
  		aux: aux@0x7e215000 {
  			compatible = "brcm,bcm2835-aux";
  			#clock-cells = <1>;
-@@ -457,6 +480,26 @@
+@@ -462,6 +485,26 @@
  			interrupts = <2 1>;
  		};