linux-libre-xen: update armv7h patches

14 files changed, 42 insertions, 958 deletions

diff --git a/kernels/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index c4e315141..7ab3b23d7 100644
--- a/kernels/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-xen/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 3a71f920fb71aaf3c8a74a73d5bba925752e8390 Mon Sep 17 00:00:00 2001
+From 001565916ddb8589ec7920b0d3c0d007225c79c4 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 01/13] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
 
 Marvell uses a specific atag in its u-boot which includes among other
 information the MAC addresses for up to 4 network interfaces.
@@ -47,5 +47,5 @@ index 979ff40..d1d0c19 100644
  };
  
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-xen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index 79d0dfb7e..719475bad 100644
--- a/kernels/linux-libre-xen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-xen/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,8 +1,8 @@
-From f414d34637b5ffb6cf3e3b9849cd5cc584ef8f19 Mon Sep 17 00:00:00 2001
+From c25c95072f199e0d0a56cbd4db701ab5b36a9f0c Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 02/13] ARM: atags/fdt: retrieve MAC addresses from Marvell
- boot loader
+Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+ loader
 
 The atags are parsed and if a Marvell atag is found, up to 4 MAC
 addresses are extracted there and assigned to node aliases eth0..3
@@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
  	}
  
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-xen/0003-SMILE-Plug-device-tree-file.patch
index b52ebad33..b686a3298 100644
--- a/kernels/linux-libre-xen/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-xen/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From 922440581e2bf77e75230b926ad5fe746327209a Mon Sep 17 00:00:00 2001
+From 3822d03ac84e6581583c3e533eb0e015334242bd Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 03/13] SMILE Plug device tree file
+Subject: [PATCH 3/8] SMILE Plug device tree file
 
 This adds a dts file for the SMILE Plug, which only differs from the Mirabox
 dts with the LED definitions.
@@ -14,10 +14,10 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  create mode 100644 arch/arm/boot/dts/armada-370-smileplug.dts
 
 diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index faacd52..b41e5b0 100644
+index befcd26..2be4c48 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -871,6 +871,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -906,6 +906,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
  	armada-370-db.dtb \
  	armada-370-dlink-dns327l.dtb \
  	armada-370-mirabox.dtb \
@@ -205,5 +205,5 @@ index 0000000..d01308a
 +	};
 +};
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-xen/0004-fix-mvsdio-eMMC-timing.patch
index 13910397d..050e8a0e5 100644
--- a/kernels/linux-libre-xen/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-xen/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From edb8d8e73417db6941473734b9cfb673c7089f72 Mon Sep 17 00:00:00 2001
+From 51597a7978cb561ba33d2fe4f9fb3aa07f448cc4 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 04/13] fix mvsdio eMMC timing
+Subject: [PATCH 4/8] fix mvsdio eMMC timing
 
 These changes from Globalscale change the MMC timing to allow the eMMC versions
 of the Mirabox and SMILE Plug to work.
@@ -34,5 +34,5 @@ index 42296e5..e5ce6d2 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index e89e6388e..09b889f59 100644
--- a/kernels/linux-libre-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-xen/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,15 +1,14 @@
-From a6b9bd0029d9453d4f59bc367f9a33e1a3285709 Mon Sep 17 00:00:00 2001
+From f0e29c8c8744317cfe946faf4f4ebae76f2c4eb1 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 05/13] net/smsc95xx: Allow mac address to be set as a
- parameter
+Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
 
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 56 insertions(+)
 
 diff --git a/drivers/net/usb/smsc95xx.c b/drivers/net/usb/smsc95xx.c
-index dc989a8..912be75 100644
+index 831aa33..0362554 100644
 --- a/drivers/net/usb/smsc95xx.c
 +++ b/drivers/net/usb/smsc95xx.c
 @@ -60,6 +60,7 @@
@@ -20,7 +19,7 @@ index dc989a8..912be75 100644
  
  #define CARRIER_CHECK_DELAY (2 * HZ)
  
-@@ -80,6 +81,10 @@ static bool turbo_mode = true;
+@@ -82,6 +83,10 @@ static bool turbo_mode = true;
  module_param(turbo_mode, bool, 0644);
  MODULE_PARM_DESC(turbo_mode, "Enable multiple frames per Rx transaction");
  
@@ -31,7 +30,7 @@ index dc989a8..912be75 100644
  static int __must_check __smsc95xx_read_reg(struct usbnet *dev, u32 index,
  					    u32 *data, int in_pm)
  {
-@@ -809,8 +814,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
+@@ -910,8 +915,59 @@ static int smsc95xx_ioctl(struct net_device *netdev, struct ifreq *rq, int cmd)
  	return generic_mii_ioctl(&dev->mii, if_mii(rq), cmd, NULL);
  }
  
@@ -92,5 +91,5 @@ index dc989a8..912be75 100644
  
  	/* maybe the boot loader passed the MAC address in devicetree */
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-xen/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
index b310bdfc8..44e766b8d 100644
--- a/kernels/linux-libre-xen/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/kernels/linux-libre-xen/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@@ -1,7 +1,7 @@
-From 927b66f6154db0cf7eb5a6d016a1e53d742a8098 Mon Sep 17 00:00:00 2001
+From 200fab4de6f535e626095b9782b56e0ed101409c Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
-Subject: [PATCH 06/13] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
+Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
  related to input routing signals.
 
 The following patch, based on stable v3.19,  corrects the errors that are reported in the boot trace in reference to the Input Signals of the audio codec TLV320AIC23:
@@ -27,7 +27,7 @@ Tested-by: Max Filippov <jcmvbkbc@gmail.com>
  1 file changed, 3 insertions(+), 3 deletions(-)
 
 diff --git a/sound/soc/codecs/tlv320aic23.c b/sound/soc/codecs/tlv320aic23.c
-index cd8c02b..95e6b11 100644
+index 410cae0..0bb8e26 100644
 --- a/sound/soc/codecs/tlv320aic23.c
 +++ b/sound/soc/codecs/tlv320aic23.c
 @@ -174,10 +174,10 @@ static const struct snd_soc_dapm_route tlv320aic23_intercon[] = {
@@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644
  	/* input mux */
  	{"Capture Source", "Line", "Line Input"},
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-xen/0007-set-default-cubietruck-led-triggers.patch
index fcad9ed0a..7464f8281 100644
--- a/kernels/linux-libre-xen/0007-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-xen/0007-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From 42885038fd78080edabbce377800994337fbc644 Mon Sep 17 00:00:00 2001
+From 011f5e6c9ef7350ac6e7bbd486318b1b96d78652 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Sat, 14 Feb 2015 12:32:27 +0100
-Subject: [PATCH 07/13] set default cubietruck led triggers
+Subject: [PATCH 7/8] set default cubietruck led triggers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@@ -29,5 +29,5 @@ index 83f39b0..15e9626 100644
  	};
  
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0008-USB-armory-support.patch b/kernels/linux-libre-xen/0008-USB-armory-support.patch
deleted file mode 100644
index 6b99d160c..000000000
--- a/kernels/linux-libre-xen/0008-USB-armory-support.patch
+++ /dev/null
@@ -1,681 +0,0 @@
-From e603d79db1ce38be15a8b7d1514301a67d88f920 Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sat, 7 Feb 2015 12:32:27 +0100
-Subject: [PATCH 08/13] USB armory support
-
----
- arch/arm/boot/dts/Makefile                    |   5 +
- arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 286 ++++++++++++++++++++++++++
- arch/arm/boot/dts/imx53-usbarmory-gpio.dts    |  62 ++++++
- arch/arm/boot/dts/imx53-usbarmory-host.dts    |  54 +++++
- arch/arm/boot/dts/imx53-usbarmory-i2c.dts     |  68 ++++++
- arch/arm/boot/dts/imx53-usbarmory-spi.dts     |  81 ++++++++
- arch/arm/boot/dts/imx53-usbarmory.dts         |  54 +++++
- 7 files changed, 610 insertions(+)
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory-common.dtsi
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory-gpio.dts
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory-host.dts
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory-i2c.dts
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory-spi.dts
- create mode 100644 arch/arm/boot/dts/imx53-usbarmory.dts
-
-diff --git a/arch/arm/boot/dts/Makefile b/arch/arm/boot/dts/Makefile
-index b41e5b0..3ce4c32 100644
---- a/arch/arm/boot/dts/Makefile
-+++ b/arch/arm/boot/dts/Makefile
-@@ -315,6 +315,11 @@ dtb-$(CONFIG_SOC_IMX53) += \
- 	imx53-smd.dtb \
- 	imx53-tx53-x03x.dtb \
- 	imx53-tx53-x13x.dtb \
-+	imx53-usbarmory.dtb \
-+	imx53-usbarmory-gpio.dtb \
-+	imx53-usbarmory-host.dtb \
-+	imx53-usbarmory-i2c.dtb \
-+	imx53-usbarmory-spi.dtb \
- 	imx53-voipac-bsb.dtb
- dtb-$(CONFIG_SOC_IMX6Q) += \
- 	imx6dl-apf6dev.dtb \
-diff --git a/arch/arm/boot/dts/imx53-usbarmory-common.dtsi b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
-new file mode 100644
-index 0000000..ab5d00a
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
-@@ -0,0 +1,286 @@
-+/*
-+ * USB armory MkI device tree include file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+#include "imx53.dtsi"
-+
-+/ {
-+	model = "Inverse Path USB armory";
-+	compatible = "inversepath,imx53-usbarmory", "fsl,imx53";
-+};
-+
-+/ {
-+	chosen {
-+		stdout-path = &uart1;
-+	};
-+
-+	memory {
-+		reg = <0x70000000 0x20000000>;
-+	};
-+
-+	leds {
-+		compatible = "gpio-leds";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&led_pin_gpio4_27>;
-+
-+		user {
-+			label = "LED";
-+			gpios = <&gpio4 27 GPIO_ACTIVE_LOW>;
-+			linux,default-trigger = "heartbeat";
-+		};
-+	};
-+
-+	soc {
-+		aips@60000000 {
-+			scc2: scc2@63fb4000 {
-+				compatible = "fsl,imx53-scc2";
-+				reg = <0x63fb4000 0x4000>,
-+				      <0x07000000 0x4000>;
-+				interrupts = <21 23>;
-+			};
-+		};
-+	};
-+};
-+
-+&cpu0 {
-+	device_type = "cpu";
-+	compatible = "arm,cortex-a8";
-+	reg = <0x0>;
-+	clocks = <&clks IMX5_CLK_ARM>;
-+	clock-latency = <61036>;
-+	voltage-tolerance = <5>;
-+	operating-points = <
-+		/* kHz */
-+		 166666  850000
-+		 400000  900000
-+		 800000 1050000
-+	>;
-+};
-+
-+&esdhc1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_esdhc1>;
-+	status = "okay";
-+};
-+
-+&iomuxc {
-+	pinctrl-names = "default";
-+
-+	imx53-usbarmory {
-+		led_pin_gpio4_27: led_gpio4_27@0 {
-+			fsl,pins = <
-+				MX53_PAD_DISP0_DAT6__GPIO4_27 0x0
-+			>;
-+		};
-+
-+		pinctrl_esdhc1: esdhc1grp {
-+			fsl,pins = <
-+				MX53_PAD_SD1_DATA0__ESDHC1_DAT0		0x1d5
-+				MX53_PAD_SD1_DATA1__ESDHC1_DAT1		0x1d5
-+				MX53_PAD_SD1_DATA2__ESDHC1_DAT2		0x1d5
-+				MX53_PAD_SD1_DATA3__ESDHC1_DAT3		0x1d5
-+				MX53_PAD_SD1_CMD__ESDHC1_CMD		0x1d5
-+				MX53_PAD_SD1_CLK__ESDHC1_CLK		0x1d5
-+			>;
-+		};
-+
-+		pinctrl_i2c1_pmic: i2c1grp_pmic {
-+			fsl,pins = <
-+				MX53_PAD_EIM_D21__I2C1_SCL	0x0
-+				MX53_PAD_EIM_D28__I2C1_SDA	0x0
-+			>;
-+		};
-+
-+		/*
-+		UART mode pin header configration:
-+		pin number:	1     2     3     4     5      6      7
-+		function:	GND   5V    ?     ?     TX     RX     ?
-+		*/
-+		pinctrl_uart1: uart1grp {
-+			fsl,pins = <
-+				MX53_PAD_CSI0_DAT10__UART1_TXD_MUX	0x1e4
-+				MX53_PAD_CSI0_DAT11__UART1_RXD_MUX	0x1e4
-+			>;
-+		};
-+
-+		/*
-+		GPIO mode pin header configuration:
-+		1     2     3         4         5         6         7
-+		GND   5V    GPIO5[26] GPIO5[27] GPIO5[28] GPIO5[29] GPIO5[30]
-+		*/
-+		pinctrl_gpio5: gpio5grp {
-+			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__GPIO5_26	0xc0
-+				MX53_PAD_CSI0_DAT9__GPIO5_27	0xc0
-+				MX53_PAD_CSI0_DAT10__GPIO5_28	0xc0
-+				MX53_PAD_CSI0_DAT11__GPIO5_29	0xc0
-+				MX53_PAD_CSI0_DAT12__GPIO5_30	0xc0
-+			>;
-+		};
-+
-+		/*
-+		SPI mode pin header configuration:
-+		1     2     3      4      5      6      7
-+		GND   5V    SCLK   MOSI   MISO   /SS0   /SS1
-+		*/
-+		pinctrl_ecspi2: ecspi2grp {
-+			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x0
-+				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x0
-+				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x0
-+				MX53_PAD_CSI0_DAT11__GPIO5_29		0x0
-+				MX53_PAD_CSI0_DAT12__GPIO5_30		0x0
-+			>;
-+		};
-+
-+		/*
-+		WILC1000 wifi module pin header configuration:
-+		1     2     3      4      5      6      7
-+		GND   5V    SCLK   MOSI   MISO   /SS0   GPIO_IRQ
-+		*/
-+		pinctrl_wilc1000: wilc1000grp {
-+			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__ECSPI2_SCLK		0x0
-+				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x0
-+				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x0
-+				MX53_PAD_CSI0_DAT11__GPIO5_29		0x0
-+				MX53_PAD_CSI0_DAT12__GPIO5_30		0xc0
-+			>;
-+		};
-+
-+		/*
-+		I2C mode pin header configuration:
-+		1     2    3     4     5          6          7
-+		GND   5V   SDA   SCL   GPIO5[28]  GPIO5[29]  GPIO5[30]
-+		*/
-+		pinctrl_i2c1_pinheader: i2c1grp_pinheader {
-+			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__I2C1_SDA	0x0
-+				MX53_PAD_CSI0_DAT9__I2C1_SCL	0x0
-+				MX53_PAD_CSI0_DAT10__GPIO5_28	0xc0
-+				MX53_PAD_CSI0_DAT11__GPIO5_29	0xc0
-+				MX53_PAD_CSI0_DAT12__GPIO5_30	0xc0
-+			>;
-+		};
-+	};
-+};
-+
-+&uart1 {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&pinctrl_uart1>;
-+	status = "okay";
-+};
-+
-+&i2c1 {
-+	pinctrl-0 = <&pinctrl_i2c1_pmic>;
-+	status = "okay";
-+	ltc3589: pmic@34 {
-+		compatible = "lltc,ltc3589-2";
-+		reg = <0x34>;
-+		regulators {
-+			sw1_reg: sw1 {
-+				regulator-min-microvolt = <591930>;
-+				regulator-max-microvolt = <1224671>;
-+				lltc,fb-voltage-divider = <100000 158000>;
-+				regulator-ramp-delay = <7000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			sw2_reg: sw2 {
-+				regulator-min-microvolt = <704123>;
-+				regulator-max-microvolt = <1456803>;
-+				lltc,fb-voltage-divider = <180000 191000>;
-+				regulator-ramp-delay = <7000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			sw3_reg: sw3 {
-+				regulator-min-microvolt = <1341250>;
-+				regulator-max-microvolt = <2775000>;
-+				lltc,fb-voltage-divider = <270000 100000>;
-+				regulator-ramp-delay = <7000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			bb_out_reg: bb-out {
-+				regulator-min-microvolt = <3387341>;
-+				regulator-max-microvolt = <3387341>;
-+				lltc,fb-voltage-divider = <511000 158000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+			ldo1_reg: ldo1 {
-+				regulator-min-microvolt = <1306329>;
-+				regulator-max-microvolt = <1306329>;
-+				lltc,fb-voltage-divider = <100000 158000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			ldo2_reg: ldo2 {
-+				regulator-min-microvolt = <704123>;
-+				regulator-max-microvolt = <1456806>;
-+				lltc,fb-voltage-divider = <180000 191000>;
-+				regulator-ramp-delay = <7000>;
-+				regulator-boot-on;
-+				regulator-always-on;
-+			};
-+
-+			ldo3_reg: ldo3 {
-+				regulator-min-microvolt = <2800000>;
-+				regulator-max-microvolt = <2800000>;
-+				regulator-boot-on;
-+			};
-+
-+			ldo4_reg: ldo4 {
-+				regulator-min-microvolt = <1200000>;
-+				regulator-max-microvolt = <3200000>;
-+			};
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx53-usbarmory-gpio.dts b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
-new file mode 100644
-index 0000000..8d54dd2
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
-@@ -0,0 +1,62 @@
-+/*
-+ * USB armory MkI device tree file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-usbarmory-common.dtsi"
-+
-+&usbotg {
-+	dr_mode = "peripheral";
-+	status = "okay";
-+};
-+
-+&iomuxc {
-+	pinctrl-0 = <&pinctrl_gpio5>;
-+};
-+
-+&uart1 {
-+	status = "disabled";
-+};
-diff --git a/arch/arm/boot/dts/imx53-usbarmory-host.dts b/arch/arm/boot/dts/imx53-usbarmory-host.dts
-new file mode 100644
-index 0000000..d4e3b4c
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory-host.dts
-@@ -0,0 +1,54 @@
-+/*
-+ * USB armory MkI device tree file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-usbarmory-common.dtsi"
-+
-+&usbotg {
-+	dr_mode = "host";
-+	status = "okay";
-+};
-diff --git a/arch/arm/boot/dts/imx53-usbarmory-i2c.dts b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
-new file mode 100644
-index 0000000..158fbac
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
-@@ -0,0 +1,68 @@
-+/*
-+ * USB armory MkI device tree file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-usbarmory-common.dtsi"
-+
-+&usbotg {
-+	dr_mode = "peripheral";
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	status = "disabled";
-+};
-+
-+&iomuxc {
-+	pinctrl-0 = <&pinctrl_i2c1_pinheader>;
-+};
-+
-+&i2c1 {
-+	ltc3589: pmic@34 {
-+		status = "disabled";
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx53-usbarmory-spi.dts b/arch/arm/boot/dts/imx53-usbarmory-spi.dts
-new file mode 100644
-index 0000000..f26f7ec
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory-spi.dts
-@@ -0,0 +1,81 @@
-+/*
-+ * USB armory MkI device tree file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-usbarmory-common.dtsi"
-+
-+&usbotg {
-+	dr_mode = "peripheral";
-+	status = "okay";
-+};
-+
-+&uart1 {
-+	status = "disabled";
-+};
-+
-+&iomuxc {
-+	pinctrl-0 = <&pinctrl_ecspi2>;
-+};
-+
-+&ecspi2 {
-+	fsl,spi-num-chipselects = <2>;
-+	cs-gpios = <&gpio5 29 0>, <&gpio5 30 0>;
-+	status = "okay";
-+
-+	flash: m25p40@0 {
-+		#address-cells = <1>;
-+		#size-cells = <1>;
-+		compatible = "st,m25p40", "st,m25p";
-+		spi-max-frequency = <20000000>;
-+		reg = <0>;
-+
-+		partition@0 {
-+			label = "test-partition";
-+			reg = <0x0 0x80000>;
-+		};
-+	};
-+};
-diff --git a/arch/arm/boot/dts/imx53-usbarmory.dts b/arch/arm/boot/dts/imx53-usbarmory.dts
-new file mode 100644
-index 0000000..33719f7
---- /dev/null
-+++ b/arch/arm/boot/dts/imx53-usbarmory.dts
-@@ -0,0 +1,54 @@
-+/*
-+ * USB armory MkI device tree file
-+ * https://inversepath.com/usbarmory
-+ *
-+ * Copyright (C) 2015, Inverse Path
-+ * Andrej Rosano <andrej@inversepath.com>
-+ *
-+ * This file is dual-licensed: you can use it either under the terms
-+ * of the GPL or the X11 license, at your option. Note that this dual
-+ * licensing only applies to this file, and not this project as a
-+ * whole.
-+ *
-+ *  a) This file is free software; you can redistribute it and/or
-+ *     modify it under the terms of the GNU General Public License as
-+ *     published by the Free Software Foundation; either version 2 of the
-+ *     License, or (at your option) any later version.
-+ *
-+ *     This file is distributed in the hope that it will be useful,
-+ *     but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+ *     GNU General Public License for more details.
-+ *
-+ * Or, alternatively,
-+ *
-+ *  b) Permission is hereby granted, free of charge, to any person
-+ *     obtaining a copy of this software and associated documentation
-+ *     files (the "Software"), to deal in the Software without
-+ *     restriction, including without limitation the rights to use,
-+ *     copy, modify, merge, publish, distribute, sublicense, and/or
-+ *     sell copies of the Software, and to permit persons to whom the
-+ *     Software is furnished to do so, subject to the following
-+ *     conditions:
-+ *
-+ *     The above copyright notice and this permission notice shall be
-+ *     included in all copies or substantial portions of the Software.
-+ *
-+ *     THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-+ *     EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
-+ *     OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-+ *     NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
-+ *     HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-+ *     WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-+ *     FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
-+ *     OTHER DEALINGS IN THE SOFTWARE.
-+ */
-+
-+/dts-v1/;
-+
-+#include "imx53-usbarmory-common.dtsi"
-+
-+&usbotg {
-+	dr_mode = "peripheral";
-+	status = "okay";
-+};
--- 
-2.10.2
-
diff --git a/kernels/linux-libre-xen/0010-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch b/kernels/linux-libre-xen/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
index 9892d2dfc..8f6952f19 100644
--- a/kernels/linux-libre-xen/0010-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
+++ b/kernels/linux-libre-xen/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch
@@ -1,7 +1,7 @@
-From bbaf3b78f27ea3557ce35e4267398e215091b68a Mon Sep 17 00:00:00 2001
+From 21fd4defb20c41ae93e86c4a5e6adcb1afd36be9 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Thu, 11 Aug 2016 00:42:37 -0600
-Subject: [PATCH 10/13] exynos4412-odroid: set higher minimum buck2 regulator
+Subject: [PATCH 8/8] exynos4412-odroid: set higher minimum buck2 regulator
  voltage
 
 Set a higher minimum voltage to help reboot issue.
@@ -13,7 +13,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
-index 58ad48e7..f7c5571 100644
+index 8aa19ba..8e2d94e 100644
 --- a/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 +++ b/arch/arm/boot/dts/exynos4412-odroid-common.dtsi
 @@ -423,7 +423,7 @@
@@ -26,5 +26,5 @@ index 58ad48e7..f7c5571 100644
  				regulator-always-on;
  				regulator-boot-on;
 -- 
-2.10.2
+2.10.0
 
diff --git a/kernels/linux-libre-xen/0009-ARM-dts-imx6ul-pico-hobbit-Add-Wifi-support.patch b/kernels/linux-libre-xen/0009-ARM-dts-imx6ul-pico-hobbit-Add-Wifi-support.patch
deleted file mode 100644
index 653269f69..000000000
--- a/kernels/linux-libre-xen/0009-ARM-dts-imx6ul-pico-hobbit-Add-Wifi-support.patch
+++ /dev/null
@@ -1,63 +0,0 @@
-From aff9e86fd148f61a7c70333cf02b70189790df26 Mon Sep 17 00:00:00 2001
-From: Vanessa Maegima <vanessa.maegima@nxp.com>
-Date: Mon, 1 Aug 2016 09:54:14 -0300
-Subject: [PATCH 09/13] ARM: dts: imx6ul-pico-hobbit: Add Wifi support
-
-imx6ul-pico-hobbit has a bcm4339 wifi chip connected to usdhc2 port.
-
-Add support for the WL_REG_ON regulator, so that Wifi can be functional
-on this board.
-
-Signed-off-by: Vanessa Maegima <vanessa.maegima@nxp.com>
-Tested-by: Fabio Estevam <fabio.estevam@nxp.com>
----
- arch/arm/boot/dts/imx6ul-pico-hobbit.dts | 20 ++++++++++++++++++++
- 1 file changed, 20 insertions(+)
-
-diff --git a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
-index 86f68fa..d3dfa5f 100644
---- a/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
-+++ b/arch/arm/boot/dts/imx6ul-pico-hobbit.dts
-@@ -100,6 +100,18 @@
- 		gpio = <&gpio1 6 0>;
- 	};
- 
-+	reg_brcm: brcm-reg {
-+		compatible = "regulator-fixed";
-+		enable-active-high;
-+		gpio = <&gpio4 8 GPIO_ACTIVE_HIGH>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pinctrl_brcm_reg>;
-+		regulator-name = "brcm_reg";
-+		regulator-min-microvolt = <3300000>;
-+		regulator-max-microvolt = <3300000>;
-+		startup-delay-us = <200000>;
-+	};
-+
- 	sound {
- 		compatible = "fsl,imx-audio-sgtl5000";
- 		model = "imx6ul-sgtl5000";
-@@ -325,12 +337,20 @@
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&pinctrl_usdhc2>;
- 	no-1-8-v;
-+	non-removable;
- 	keep-power-in-suspend;
- 	wakeup-source;
-+	vmmc-supply = <&reg_brcm>;
- 	status = "okay";
- };
- 
- &iomuxc {
-+	pinctrl_brcm_reg: brcmreggrp {
-+		fsl,pins = <
-+			MX6UL_PAD_NAND_DATA06__GPIO4_IO08	0x10b0	/* WL_REG_ON */
-+		>;
-+	};
-+
- 	pinctrl_enet2: enet2grp {
- 		fsl,pins = <
- 			MX6UL_PAD_ENET1_TX_DATA1__ENET2_MDIO	0x1b0b0
--- 
-2.10.2
-
diff --git a/kernels/linux-libre-xen/0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch b/kernels/linux-libre-xen/0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch
deleted file mode 100644
index 3d39037f2..000000000
--- a/kernels/linux-libre-xen/0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From 7b64f74c06cacdba5eab9275f57df212540cad2e Mon Sep 17 00:00:00 2001
-From: Tony Lindgren <tony@atomide.com>
-Date: Fri, 30 Sep 2016 11:10:10 -0700
-Subject: [PATCH 11/13] usb: musb: Call pm_runtime from musb_gadget_queue
-
-If we're booting pandaboard using NFSroot over built-in g_ether, we
-can get the following after booting once and doing a warm reset:
-
-g_ether gadget: ecm_open
-g_ether gadget: notify connect true
-...
-WARNING: CPU: 0 PID: 1 at drivers/bus/omap_l3_noc.c:147
-l3_interrupt_handler+0x220/0x34c
-44000000.ocp:L3 Custom Error: MASTER MPU TARGET L4CFG (Read):
-Data Access in User mode du ring Functional access
-...
-
-Fix the issue by calling pm_runtime functions from
-musb_gadget_queue.
-
-Note that in the long run we should be able to queue the pending
-transfers if pm_runtime is not active, and flush the queue from
-pm_runtime_resume.
-
-Reported-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Tested-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
-Signed-off-by: Tony Lindgren <tony@atomide.com>
----
- drivers/usb/musb/musb_gadget.c | 4 ++++
- 1 file changed, 4 insertions(+)
-
-diff --git a/drivers/usb/musb/musb_gadget.c b/drivers/usb/musb/musb_gadget.c
-index 6d1e975..8ccc1b1 100644
---- a/drivers/usb/musb/musb_gadget.c
-+++ b/drivers/usb/musb/musb_gadget.c
-@@ -1255,6 +1255,7 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
- 
- 	map_dma_buffer(request, musb, musb_ep);
- 
-+	pm_runtime_get_sync(musb->controller);
- 	spin_lock_irqsave(&musb->lock, lockflags);
- 
- 	/* don't queue if the ep is down */
-@@ -1275,6 +1276,9 @@ static int musb_gadget_queue(struct usb_ep *ep, struct usb_request *req,
- 
- unlock:
- 	spin_unlock_irqrestore(&musb->lock, lockflags);
-+	pm_runtime_mark_last_busy(musb->controller);
-+	pm_runtime_put_autosuspend(musb->controller);
-+
- 	return status;
- }
- 
--- 
-2.10.2
-
diff --git a/kernels/linux-libre-xen/0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch b/kernels/linux-libre-xen/0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch
deleted file mode 100644
index 47581e739..000000000
--- a/kernels/linux-libre-xen/0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 842bdf96a2e7a63ece87458ad7ecf1ded6a40a12 Mon Sep 17 00:00:00 2001
-From: Andreas Kemnade <andreas@kemnade.info>
-Date: Mon, 22 Aug 2016 21:24:22 +0200
-Subject: [PATCH 12/13] phy-twl4030-usb: better handle musb_mailbox() failure
-
-setting twl->linkstat = MUSB_UNKNOWN upon error in musb_mailbox as
-introduced in
-commit 12b7db2bf8b8 ("usb: musb: Return error value from musb_mailbox")
-causes twl4030_usb_irq() to not detect a state change form cable connected
-to cable disconnected after such an error so that
-pm_runtime_put_autosuspend() will not be called and the usage counter
-gets unbalanced. Such errors happen e.g. if the omap2430 module is not
-(yet) loaded during plug/unplug events.
-
-This patch introduces a flag instead that indicates whether there is
-information for the musb_mailbox pending and calls musb_mailbox() if
-that flag is set.
-
-Signed-off-by: Andreas Kemnade <andreas@kemnade.info>
-Tested-by: Tony Lindgren <tony@atomide.com>
----
- drivers/phy/phy-twl4030-usb.c | 9 +++++++--
- 1 file changed, 7 insertions(+), 2 deletions(-)
-
-diff --git a/drivers/phy/phy-twl4030-usb.c b/drivers/phy/phy-twl4030-usb.c
-index d9b10a3..81067b4 100644
---- a/drivers/phy/phy-twl4030-usb.c
-+++ b/drivers/phy/phy-twl4030-usb.c
-@@ -172,6 +172,7 @@ struct twl4030_usb {
- 	int			irq;
- 	enum musb_vbus_id_status linkstat;
- 	bool			vbus_supplied;
-+	bool			musb_mailbox_pending;
- 
- 	struct delayed_work	id_workaround_work;
- };
-@@ -569,9 +570,12 @@ static irqreturn_t twl4030_usb_irq(int irq, void *_twl)
- 			pm_runtime_mark_last_busy(twl->dev);
- 			pm_runtime_put_autosuspend(twl->dev);
- 		}
-+		twl->musb_mailbox_pending = true;
-+	}
-+	if (twl->musb_mailbox_pending) {
- 		err = musb_mailbox(status);
--		if (err)
--			twl->linkstat = MUSB_UNKNOWN;
-+		if (!err)
-+			twl->musb_mailbox_pending = false;
- 	}
- 
- 	/* don't schedule during sleep - irq works right then */
-@@ -676,6 +680,7 @@ static int twl4030_usb_probe(struct platform_device *pdev)
- 	twl->irq		= platform_get_irq(pdev, 0);
- 	twl->vbus_supplied	= false;
- 	twl->linkstat		= MUSB_UNKNOWN;
-+	twl->musb_mailbox_pending = false;
- 
- 	twl->phy.dev		= twl->dev;
- 	twl->phy.label		= "twl4030";
--- 
-2.10.2
-
diff --git a/kernels/linux-libre-xen/0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch b/kernels/linux-libre-xen/0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch
deleted file mode 100644
index 4a99756a4..000000000
--- a/kernels/linux-libre-xen/0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From edbf64b26ba15e05cd15ea75bca263a5e748049f Mon Sep 17 00:00:00 2001
-From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Tue, 4 Oct 2016 22:15:41 -0600
-Subject: [PATCH 13/13] Revert "gpu: drm: omapdrm: dss-of: add missing
- of_node_put after calling of_parse_phandle"
-
-This reverts commit 2ab9f5879162499e1c4e48613287e3f59e593c4f.
----
- drivers/gpu/drm/omapdrm/dss/dss-of.c | 7 +++----
- 1 file changed, 3 insertions(+), 4 deletions(-)
-
-diff --git a/drivers/gpu/drm/omapdrm/dss/dss-of.c b/drivers/gpu/drm/omapdrm/dss/dss-of.c
-index e256d87..dfd4e96 100644
---- a/drivers/gpu/drm/omapdrm/dss/dss-of.c
-+++ b/drivers/gpu/drm/omapdrm/dss/dss-of.c
-@@ -125,16 +125,15 @@ u32 dss_of_port_get_port_number(struct device_node *port)
- 
- static struct device_node *omapdss_of_get_remote_port(const struct device_node *node)
- {
--	struct device_node *np, *np_parent;
-+	struct device_node *np;
- 
- 	np = of_parse_phandle(node, "remote-endpoint", 0);
- 	if (!np)
- 		return NULL;
- 
--	np_parent = of_get_next_parent(np);
--	of_node_put(np);
-+	np = of_get_next_parent(np);
- 
--	return np_parent;
-+	return np;
- }
- 
- struct device_node *
--- 
-2.10.2
-
diff --git a/kernels/linux-libre-xen/PKGBUILD b/kernels/linux-libre-xen/PKGBUILD
index 4304032e2..e3a73b296 100644
--- a/kernels/linux-libre-xen/PKGBUILD
+++ b/kernels/linux-libre-xen/PKGBUILD
@@ -57,12 +57,7 @@ source=("https://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/l
         '0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch'
         '0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch'
         '0007-set-default-cubietruck-led-triggers.patch'
-        '0008-USB-armory-support.patch'
-        '0009-ARM-dts-imx6ul-pico-hobbit-Add-Wifi-support.patch'
-        '0010-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch'
-        '0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch'
-        '0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch'
-        '0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch')
+        '0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch')
 sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca49452f9b1cc80b0826c7a4962dbe4937aecb697aa823b2543ba2cabc704816'
             'SKIP'
             'af86fb389518c1c3c4984e3a61f34ac8cb37d7b257afe59c39a9801745f97121f809378b885bffddaa16e88ca38e199a0ece955a1d3e6598da80bb47d5cc5ebb'
@@ -83,19 +78,14 @@ sha512sums=('885eb0a7fab45dc749acb4329b4330a43b704df2d5f2f5aac1811503c132ca53ca4
             'b8fe56e14006ab866970ddbd501c054ae37186ddc065bb869cf7d18db8c0d455118d5bda3255fb66a0dde38b544655cfe9040ffe46e41d19830b47959b2fb168'
             'd26059e27eb8608301ea93409f0aa11e8a3f6d2fcff1df045fe69eafda8a5bba141637097c37ee88dacfa74918ed26006b7ef9d24277dd60ea9333dba6782755'
             'SKIP'
-            'b465e902c387804d7ad7721cbd49d6c5d5b15cc321948fcaa620db3dfa9d3476b449cd7c3106ff2f30bc35e0250438464f95c69fecd393b78bb5aec102616891'
-            '26029098acbfd12ebc9201df86faa7f906bf37e9df6929ddd2851bcc700828c808331d95874189cfab2c4396e48f257f71c468db6ff367ca3ff8d391d664e7a0'
-            '7061ca97ae79c5fa22bdc46aab9f94e3d5079a6fe328816b8ec41c8df705ee8364b0452e3b780b5ebc5a1142e3dc41e0456bad2c9bfb877954f77795e028b07d'
-            '34e8f42c10d75a9a1c89d6264af1a3f0b33c136fcd46267bbc20c348ce464743c06fdc0ca2da95a1215bd6ca5e9db9130aa0d85c88280344367a9c035f010db6'
-            '2aca4f30c1fcc8032e511b9ee89ef9230d58e377e725e22fecc131e04ef93b0723e040539768cc7917f1be7067d24d371eac61536cc32ba0b404fe85c8657139'
-            '9b882ac5ae02355e0c306fa7b3d074df05415a17a02bdc6e7c2d4a8c36bd00987aacc54b5c0af3264f4ee7c3bd49bd5f08bb73d994f2db1b3d0883e52598cc28'
-            'ed9b1f86f41547da9862c3b0aef27ca3944141af36392ea8bc2ac22954c4cb4d593e222ebbdcfaf8d45c55e632d1eaa733a25048046ee2960cbe359e8794fa95'
-            'a8f577cad348ac190f6b3462870b5a4ceeea9b732408074a4a0caed12f5cddc2ea5de3a7c9292e7b1de256670acf43741a80ad57d1f7a5fd3f9d5d9a80e39c73'
-            '6fbb354cfa8c42406da016d300db39b831b4977f1bd33483045615c86ace2d570b9624946ef1ce2bc73cea4f849f7d692d8e81a7c8b173f5066afcb4b315810a'
-            '2392019b53c2d4003956dc925f7b1c54506bdf32a848579d846a9230ba6526fbd3aa9d69d2cabf5a9d7b0b0bf77d17b7e6f71b6793339a61d3d592cc00098eba'
-            'c2c5a6187f64401423ce4edc857f27957b244f1b1f9b86a19ec556e7d9c42d27bf032605f842cc1b0b2f4967ca739e535b7f12f3dd798d4d70a325c336384055'
-            'e15c3ff1cc17e964aa69f7d3bc0df878a267298d73066c883542bf8e4373b797d5080aa5a26d05c6d03ec864f6898899183bd76dffec71e9bcb160aeb51033e0'
-            'f91a68687e5191057ebb6fd0aebe0ed5be0148589d15f3e0c4363de7bf7160e29686d4a22725e69d7c5f546c523618b6fad9cfb3444cdc46eaa4a89bc3be237b')
+            'ccf18eb2c3d33a57871cbadd5ad825d2f2f489e69c54c7293b160abdc3e9e5c6a664ba7926a617d31affcf20b7ecb4e8de54fa78438c574aa1b257f686faade9'
+            '69f13bb2e353727acbe39034978729272511c6578aa2faf8c829e1bb89c22e769262289b76d93254314304ebd7547c45cdc8ba6afc278444a8fd09f71dff9757'
+            '47038a476ff90d7106e1ce2cf5dd3f2c356c75ab8cefc6901f8eddcbf7cd0f23c44f6ce96b2b3d57a6e3f30bdd5192cf3e75759277ab0ac6fbb179423f2431a0'
+            '75513d1d6dfeb6425763dc8fe8d7f607ddd11d2a8397230333a4e556b303ceb7e68bfdb26d0a10f4b557ef13adbf54c3aab00f5b493772a94b5cd87d143663c4'
+            '37df06631772200edc7e5a4450719155156a781e9a475383283627f6f1b8cbe94db6ba2e2fbc59107ea288846b56881b892e9b21d3d899b974fad4226c4def10'
+            '73916b59fd8f269ce2831d9a0710f503b9cd1004d94caf9e061ebff870a115cc8455409040574a609473e48c60b2f0b833c907327dacb085509e615c27dd463f'
+            'eef5d8161edcc9817832de2000ad30320507a1e16fc321fb2b97dd2d159825b8f924cd29e5a4ffa29c339c8727f106730e6b6858c50d8afe7a5000629507badd'
+            'b3aad9fd9292122fd3227f05d54742731bf4d6d57aaac680b34eca19597dfb56a7f54c7ad54f37cfc2ec7f622fbd90abe7f288f11f8eb98278ab07df32cf890a')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -135,12 +125,7 @@ prepare() {
     patch -p1 -i "${srcdir}/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch"
     patch -p1 -i "${srcdir}/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch"
     patch -p1 -i "${srcdir}/0007-set-default-cubietruck-led-triggers.patch"
-    patch -p1 -i "${srcdir}/0008-USB-armory-support.patch"
-    patch -p1 -i "${srcdir}/0009-ARM-dts-imx6ul-pico-hobbit-Add-Wifi-support.patch"
-    patch -p1 -i "${srcdir}/0010-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
-    patch -p1 -i "${srcdir}/0011-usb-musb-Call-pm_runtime-from-musb_gadget_queue.patch"
-    patch -p1 -i "${srcdir}/0012-phy-twl4030-usb-better-handle-musb_mailbox-failure.patch"
-    patch -p1 -i "${srcdir}/0013-Revert-gpu-drm-omapdrm-dss-of-add-missing-of_node_pu.patch"
+    patch -p1 -i "${srcdir}/0008-exynos4412-odroid-set-higher-minimum-buck2-regulator.patch"
   fi
 
   # add freedo as boot logo