linux-libre-knock-4.3.3_gnu-2: update config and patches for armv7h; fix hangs on older intel hardware

12 files changed, 315 insertions, 87 deletions

diff --git a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
index db4f9565b..37a08e2b1 100644
--- a/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
+++ b/kernels/linux-libre-knock/0001-ARM-atags-add-support-for-Marvell-s-u-boot.patch
@@ -1,7 +1,7 @@
-From 3f6a51e3dfaa871a8a114753c666adc1442f2496 Mon Sep 17 00:00:00 2001
+From 7c75672c751c1a9001f39bbe76c7ee092b4e6a29 Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:59:28 +0100
-Subject: [PATCH 1/8] ARM: atags: add support for Marvell's u-boot
+Subject: [PATCH 1/9] 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.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch b/kernels/linux-libre-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch
new file mode 100644
index 000000000..241b1012e
--- /dev/null
+++ b/kernels/linux-libre-knock/0001-disabling-primary-plane-in-the-noatomic-case.patch
@@ -0,0 +1,56 @@
+From 634b3a4a476e96816d5d6cd5bb9f8900a53f56ba Mon Sep 17 00:00:00 2001
+From: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Date: Mon, 23 Nov 2015 10:25:28 +0100
+Subject: drm/i915: Do a better job at disabling primary plane in the noatomic
+ case.
+
+When disable_noatomic is called plane_mask is not correct yet, and
+plane_state->visible = true is left as true after disabling the primary
+plane.
+
+Other planes are already disabled as part of crtc sanitization, only the
+primary is left active. But the plane_mask is not updated here. It gets
+updated during fb takeover in modeset_gem_init, or set to the new value
+on resume.
+
+This means that to disable the primary plane 1 << drm_plane_index(primary)
+needs to be used.
+
+Afterwards because the crtc is no longer active it's forbidden to keep
+plane_state->visible set, or a WARN_ON in
+intel_plane_atomic_calc_changes triggers. There are other code points
+that rely on accurate plane_state->visible too, so make sure the bool is
+cleared.
+
+The other planes are already disabled in intel_sanitize_crtc, so they
+don't have to be handled here.
+
+Cc: stable@vger.kernel.org #v4.3, v4.2?
+Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92655
+Tested-by: Tomas Mezzadra <tmezzadra@gmail.com>
+Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
+Reviewed-by: Daniel Vetter <daniel.vetter@ffwll.ch>
+Link: http://patchwork.freedesktop.org/patch/msgid/5652DB88.9070208@linux.intel.com
+(cherry picked from commit 54a4196188eab82e6f0a5f05716626e9f18b8fb6)
+Signed-off-by: Jani Nikula <jani.nikula@intel.com>
+
+diff --git a/drivers/gpu/drm/i915/intel_display.c b/drivers/gpu/drm/i915/intel_display.c
+index 22e86d2..62211ab 100644
+--- a/drivers/gpu/drm/i915/intel_display.c
++++ b/drivers/gpu/drm/i915/intel_display.c
+@@ -6309,9 +6309,11 @@ static void intel_crtc_disable_noatomic(struct drm_crtc *crtc)
+ 	if (to_intel_plane_state(crtc->primary->state)->visible) {
+ 		intel_crtc_wait_for_pending_flips(crtc);
+ 		intel_pre_disable_primary(crtc);
++
++		intel_crtc_disable_planes(crtc, 1 << drm_plane_index(crtc->primary));
++		to_intel_plane_state(crtc->primary->state)->visible = false;
+ 	}
+ 
+-	intel_crtc_disable_planes(crtc, crtc->state->plane_mask);
+ 	dev_priv->display.crtc_disable(crtc);
+ 	intel_crtc->active = false;
+ 	intel_update_watermarks(crtc);
+-- 
+cgit v0.10.2
+
diff --git a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
index b44834c27..ddf3690f1 100644
--- a/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
+++ b/kernels/linux-libre-knock/0002-ARM-atags-fdt-retrieve-MAC-addresses-from-Marvell-bo.patch
@@ -1,7 +1,7 @@
-From 693aa021add61922682c5cf6f5678f04fe7b94ef Mon Sep 17 00:00:00 2001
+From 1fea82d0497ae305d2110585af7f57c81e0375df Mon Sep 17 00:00:00 2001
 From: Willy Tarreau <w@xxxxxx>
 Date: Sun, 2 Dec 2012 19:56:58 +0100
-Subject: [PATCH 2/8] ARM: atags/fdt: retrieve MAC addresses from Marvell boot
+Subject: [PATCH 2/9] 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
@@ -43,5 +43,5 @@ index 9448aa0..ac7b6ae 100644
  	}
  
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
index 2d573ca04..a5fc05c6d 100644
--- a/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
+++ b/kernels/linux-libre-knock/0003-SMILE-Plug-device-tree-file.patch
@@ -1,7 +1,7 @@
-From c09c0e15623ad939dbc5483d48adce41085bf2aa Mon Sep 17 00:00:00 2001
+From 58707640a58c98688345a01cc4aaab5e9a5302ae Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:41:19 -0600
-Subject: [PATCH 3/8] SMILE Plug device tree file
+Subject: [PATCH 3/9] 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 246473a..5586e7a 100644
+index bb8fa02..4a41a60 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -672,6 +672,7 @@ dtb-$(CONFIG_MACH_ARMADA_370) += \
+@@ -699,6 +699,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.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
index fa7a719e4..6a6b04148 100644
--- a/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
+++ b/kernels/linux-libre-knock/0004-fix-mvsdio-eMMC-timing.patch
@@ -1,7 +1,7 @@
-From d0899762087c6ff5c8a9b522d4f2fe1f9d527b5f Mon Sep 17 00:00:00 2001
+From 279ad74e38e3c692eab7c59fae909fe22ea5d1dd Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
 Date: Fri, 5 Sep 2014 15:43:56 -0600
-Subject: [PATCH 4/8] fix mvsdio eMMC timing
+Subject: [PATCH 4/9] 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 a448498..14441a6 100644
  		host->clock = ios->clock;
  		host->ns_per_clk = 1000000000 / (host->base_clock / (m+1));
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
index b8d64bfe4..6ab41a175 100644
--- a/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
+++ b/kernels/linux-libre-knock/0005-net-smsc95xx-Allow-mac-address-to-be-set-as-a-parame.patch
@@ -1,7 +1,7 @@
-From f51bebf4094d0263c125b38b761a0eb2e3bbdbd8 Mon Sep 17 00:00:00 2001
+From dad3e39a200b3f91e5e4790fe95cdbfc27a18673 Mon Sep 17 00:00:00 2001
 From: popcornmix <popcornmix@gmail.com>
 Date: Tue, 18 Feb 2014 01:43:50 -0300
-Subject: [PATCH 5/8] net/smsc95xx: Allow mac address to be set as a parameter
+Subject: [PATCH 5/9] net/smsc95xx: Allow mac address to be set as a parameter
 
 ---
  drivers/net/usb/smsc95xx.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++
@@ -91,5 +91,5 @@ index 26423ad..e29a323 100644
  	if (smsc95xx_read_eeprom(dev, EEPROM_MAC_OFFSET, ETH_ALEN,
  			dev->net->dev_addr) == 0) {
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch b/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
index c05d584ea..63cd5b038 100644
--- a/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
+++ b/kernels/linux-libre-knock/0006-ARM-TLV320AIC23-SoC-Audio-Codec-Fix-errors-reported-.patch
@@ -1,7 +1,7 @@
-From be369dba2e0a95d54cc858b5d8ecada13baf328a Mon Sep 17 00:00:00 2001
+From 7e8b6c3551ea6a2b4e9201188a5fb79c5970f114 Mon Sep 17 00:00:00 2001
 From: dobatog <dobatog@gmail.com>
 Date: Thu, 26 Feb 2015 12:32:27 +0100
-Subject: [PATCH 6/8] ARM: TLV320AIC23 SoC Audio Codec: Fix errors reported
+Subject: [PATCH 6/9] 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:
@@ -45,5 +45,5 @@ index cd8c02b..95e6b11 100644
  	/* input mux */
  	{"Capture Source", "Line", "Line Input"},
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch b/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
index bbe7e04d1..f11ac2737 100644
--- a/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
+++ b/kernels/linux-libre-knock/0007-set-default-cubietruck-led-triggers.patch
@@ -1,7 +1,7 @@
-From f141851ab061abfc770b9a0540ee6f6c87e863c0 Mon Sep 17 00:00:00 2001
+From 31e04e014a3f8cc88b3755be8aa44a4d2051f53a Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sun, 14 Jun 2015 13:20:25 -0600
-Subject: [PATCH 7/8] set default cubietruck led triggers
+Date: Sat, 14 Feb 2015 12:32:27 +0100
+Subject: [PATCH 7/9] set default cubietruck led triggers
 
 Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
 ---
@@ -9,7 +9,7 @@ Signed-off-by: Kevin Mihelich <kevin@archlinuxarm.org>
  1 file changed, 2 insertions(+)
 
 diff --git a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
-index 4611e2f..5739f2b 100644
+index e6b0192..fff91d3 100644
 --- a/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 +++ b/arch/arm/boot/dts/sun7i-a20-cubietruck.dts
 @@ -70,6 +70,7 @@
@@ -29,5 +29,5 @@ index 4611e2f..5739f2b 100644
  	};
  
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0008-USB-armory-support.patch b/kernels/linux-libre-knock/0008-USB-armory-support.patch
index 13b415604..14e8e2530 100644
--- a/kernels/linux-libre-knock/0008-USB-armory-support.patch
+++ b/kernels/linux-libre-knock/0008-USB-armory-support.patch
@@ -1,40 +1,46 @@
-From ac49b5026524acf13cbdeef8d5f72257aef3e31d Mon Sep 17 00:00:00 2001
+From 0bef4c3483f1a30f027ae375e1c04a2e6be91150 Mon Sep 17 00:00:00 2001
 From: Kevin Mihelich <kevin@archlinuxarm.org>
-Date: Sat, 7 Mar 2015 16:51:15 -0700
-Subject: [PATCH 8/8] USB armory support
+Date: Sat, 7 Feb 2015 12:32:27 +0100
+Subject: [PATCH 8/9] USB armory support
 
 ---
- arch/arm/boot/dts/Makefile                    |   3 +
- arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 209 ++++++++++++++++++++++++++
- arch/arm/boot/dts/imx53-usbarmory-gpio.dts    |  26 ++++
- arch/arm/boot/dts/imx53-usbarmory-host.dts    |  18 +++
- arch/arm/boot/dts/imx53-usbarmory.dts         |  18 +++
- 5 files changed, 274 insertions(+)
+ arch/arm/boot/dts/Makefile                    |   5 +
+ arch/arm/boot/dts/imx53-usbarmory-common.dtsi | 241 ++++++++++++++++++++++++++
+ arch/arm/boot/dts/imx53-usbarmory-gpio.dts    |  26 +++
+ arch/arm/boot/dts/imx53-usbarmory-host.dts    |  18 ++
+ arch/arm/boot/dts/imx53-usbarmory-i2c.dts     |  32 ++++
+ arch/arm/boot/dts/imx53-usbarmory-spi.dts     |  45 +++++
+ arch/arm/boot/dts/imx53-usbarmory.dts         |  18 ++
+ 7 files changed, 385 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 5586e7a..d54f5f7 100644
+index 4a41a60..a2df2c2 100644
 --- a/arch/arm/boot/dts/Makefile
 +++ b/arch/arm/boot/dts/Makefile
-@@ -264,6 +264,9 @@ dtb-$(CONFIG_SOC_IMX53) += \
+@@ -268,6 +268,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..c7cbd84
+index 0000000..b73c399
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-common.dtsi
-@@ -0,0 +1,209 @@
+@@ -0,0 +1,241 @@
 +/*
 + * USB armory MkI device tree include file
 + * http://inversepath.com/usbarmory
@@ -112,16 +118,6 @@ index 0000000..c7cbd84
 +	pinctrl-names = "default";
 +
 +	imx53-usbarmory {
-+		pinctrl_pinheader: pinheadergrp {
-+			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
-+			>;
-+		};
-+
 +		led_pin_gpio4_27: led_gpio4_27@0 {
 +			fsl,pins = <
 +				MX53_PAD_DISP0_DAT6__GPIO4_27 0x80000000
@@ -139,26 +135,67 @@ index 0000000..c7cbd84
 +			>;
 +		};
 +
-+		pinctrl_i2c1: i2c1grp {
++		pinctrl_i2c1_pmic: i2c1grp_pmic {
 +			fsl,pins = <
-+				MX53_PAD_CSI0_DAT8__I2C1_SDA	0xc0000000
-+				MX53_PAD_CSI0_DAT9__I2C1_SCL	0xc0000000
++				MX53_PAD_EIM_D21__I2C1_SCL	0xc0000000
++				MX53_PAD_EIM_D28__I2C1_SDA	0xc0000000
 +			>;
 +		};
 +
++		/*
++		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
++				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		0x80000000
++				MX53_PAD_CSI0_DAT9__ECSPI2_MOSI		0x80000000
++				MX53_PAD_CSI0_DAT10__ECSPI2_MISO	0x80000000
++				MX53_PAD_CSI0_DAT11__GPIO5_29		0x80000000
++				MX53_PAD_CSI0_DAT12__GPIO5_30		0x80000000
++			>;
++		};
++
++		/*
++		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	0xc0000000
++				MX53_PAD_CSI0_DAT9__I2C1_SCL	0xc0000000
++				MX53_PAD_CSI0_DAT10__GPIO5_28	0x80000000
++				MX53_PAD_CSI0_DAT11__GPIO5_29	0x80000000
++				MX53_PAD_CSI0_DAT12__GPIO5_30	0x80000000
 +			>;
 +		};
 +	};
@@ -175,10 +212,11 @@ index 0000000..c7cbd84
 +};
 +
 +&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>;
@@ -246,7 +284,7 @@ index 0000000..c7cbd84
 +};
 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..bf85ffa
+index 0000000..a27c759
 --- /dev/null
 +++ b/arch/arm/boot/dts/imx53-usbarmory-gpio.dts
 @@ -0,0 +1,26 @@
@@ -270,7 +308,7 @@ index 0000000..bf85ffa
 +};
 +
 +&iomuxc {
-+	pinctrl-0 = <&pinctrl_pinheader>;
++	pinctrl-0 = <&pinctrl_gpio5>;
 +};
 +
 +&uart1 {
@@ -300,6 +338,95 @@ index 0000000..ea2ea45
 +	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..c66bbb5
+--- /dev/null
++++ b/arch/arm/boot/dts/imx53-usbarmory-i2c.dts
+@@ -0,0 +1,32 @@
++/*
++ * USB armory MkI device mode device tree file
++ * http://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/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..414d641
+--- /dev/null
++++ b/arch/arm/boot/dts/imx53-usbarmory-spi.dts
+@@ -0,0 +1,45 @@
++/*
++ * USB armory MkI device mode device tree file
++ * http://inversepath.com/usbarmory
++ *
++ * Copyright (C) 2015, Inverse Path
++ * Andrej Rosano <andrej@inversepath.com>
++ *
++ * Licensed under GPLv2
++ */
++
++/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..902a73b
@@ -325,5 +452,5 @@ index 0000000..902a73b
 +	status = "okay";
 +};
 -- 
-2.4.5
+2.6.4
 
diff --git a/kernels/linux-libre-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch b/kernels/linux-libre-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch
new file mode 100644
index 000000000..af564c2a3
--- /dev/null
+++ b/kernels/linux-libre-knock/0009-ARM-dts-dove-add-Dove-divider-clocks.patch
@@ -0,0 +1,34 @@
+From 1fdf53fafef2ccc0684a3b655e716b9921642197 Mon Sep 17 00:00:00 2001
+From: Russell King <rmk+kernel@arm.linux.org.uk>
+Date: Sun, 6 Dec 2015 23:28:37 +0000
+Subject: [PATCH 9/9] ARM: dts: dove: add Dove divider clocks
+
+Add the Dove divider clocks to the Dove dtsi file.
+
+Acked-by: Andrew Lunn <andrew@lunn.ch>
+Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
+Signed-off-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
+---
+ arch/arm/boot/dts/dove.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm/boot/dts/dove.dtsi b/arch/arm/boot/dts/dove.dtsi
+index 1791216..ea36a26 100644
+--- a/arch/arm/boot/dts/dove.dtsi
++++ b/arch/arm/boot/dts/dove.dtsi
+@@ -459,6 +459,12 @@
+ 					#clock-cells = <1>;
+ 				};
+ 
++				divider_clk: core-clock@0064 {
++					compatible = "marvell,dove-divider-clock";
++					reg = <0x0064 0x8>;
++					#clock-cells = <1>;
++				};
++
+ 				pinctrl: pin-ctrl@0200 {
+ 					compatible = "marvell,dove-pinctrl";
+ 					reg = <0x0200 0x14>,
+-- 
+2.6.4
+
diff --git a/kernels/linux-libre-knock/PKGBUILD b/kernels/linux-libre-knock/PKGBUILD
index c9246b820..c637ad8e0 100644
--- a/kernels/linux-libre-knock/PKGBUILD
+++ b/kernels/linux-libre-knock/PKGBUILD
@@ -20,7 +20,7 @@ _replacesoldmodules=() # '%' gets replaced with _kernelname
 _srcname=linux-${_pkgbasever%-*}
 _archpkgver=${_pkgver%-*}
 pkgver=${_pkgver//-/_}
-pkgrel=1
+pkgrel=2
 rcnrel=armv7-x1
 arch=('i686' 'x86_64' 'armv7h')
 url="https://gnunet.org/knock"
@@ -49,6 +49,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         # standard config files for mkinitcpio ramdisk
         'linux.preset'
         'change-default-console-loglevel.patch'
+        '0001-disabling-primary-plane-in-the-noatomic-case.patch'
         '0001-drm-radeon-Make-the-driver-load-without-the-firmwares.patch'
         '0002-usb-serial-gadget-no-TTY-hangup-on-USB-disconnect-WI.patch'
         # armv7h patches
@@ -61,7 +62,8 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_pkgbasever}/li
         '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')
+        '0008-USB-armory-support.patch'
+        '0009-ARM-dts-dove-add-Dove-divider-clocks.patch')
 sha256sums=('1d280ae2730eb6c9b8c7e920cac2e8111c8db02c498db0c142860a84106cc169'
             'SKIP'
             '4e5d062db675a304a1b7bb99a9d2eb1ff617fd31fac9b28df059444b5a98b1d5'
@@ -76,21 +78,23 @@ sha256sums=('1d280ae2730eb6c9b8c7e920cac2e8111c8db02c498db0c142860a84106cc169'
             'SKIP'
             '9ffafb50e8b6161a08ffaa8ac074e60f7df15e9cc20f8b63f93914638161f9b0'
             'bccd089a58f5180991db01fe1a4782355b987fc788766619cff973d33a0e4fcf'
-            '8787384a2eea0e71c64278e9e3e9ec29df61bfcee60afad6d5f9f43e97964746'
+            '8fc56fddc4f1218fcd3cec584fb09eb06e30983d309d5ace00881fe94665caff'
             'f0d90e756f14533ee67afda280500511a62465b4f76adcc5effa95a40045179c'
             '1256b241cd477b265a3c2d64bdc19ffe3c9bbcee82ea3994c590c2c76e767d99'
+            'abdd04bd6beecb7c961130a68d71e6332bd260462eeaa2f4f8e634de813dcc4d'
             '61370b766e0c60b407c29d2c44b3f55fc352e9049c448bc8fcddb0efc53e42fc'
             '3d3266bd082321dccf429cc2200d1a4d870d2031546f9f591b6dfbb698294808'
             '74cdff6bfa54fe96f7d443524881041ba04516944e9132fd0c3e7bad88945596'
             'SKIP'
-            '2654680bc8f677f647bca6e2b367693bf73ffb2edc21e3757a329375355a335d'
-            '842e4f483fa36c0e7dbe18ad46d78223008989cce097e5bef1e14450280f5dfe'
-            '810697eec07faa60acb59b97df291e5f2e9428e86ae54e5ef90a6e4b2d0844ab'
-            'c743e41975260aab3176b6f473707c8d8371cb89575e1c128bddb3bd74030b8b'
-            'abc9593a479b9bb677112fa1d6502c8165d27d0854a712e1662374e4bafb96a0'
-            'd068215561ce769439901da0118e251c624de58fe414cc2166fbf972f76dd1a7'
-            'ac0fb2180560652f94bebb3c09baef3c34785b539cae541df175ebec6989d79c'
-            'c23c3bf29fd557fe2e9ca72e65cd0f1e790b771b4568d0732388d7d420cefd6a')
+            'a851312b26800a7e189b34547d5d4b2b62a18874f07335ac6f426c32b47c3817'
+            '486976f36e1919eac5ee984cb9a8d23a972f23f22f8344eda47b487ea91047f4'
+            '6dadc17ea56d93ec0f1d0c3c98c25a7863e9ba3c4af50dc411d630a1bcc98f08'
+            '9c5d6d035c9a7103f19804c2284291d461d4b848cccd3ec07272bde68ba29513'
+            '6644705cd73c55056b5fed91cfb3199c1114b088d96dbd3c29358cd49863aeba'
+            '08d0aa76393ea2d1a853d0ea9b02aa616224ac915473ab057bb98285212bc994'
+            '1cb502674bf7a1ea79b359d1613fe891ba37f6aa64f5f5eca309d46ba01ab417'
+            '05bf1d8f94feab06bdd9fd958bc9bde4d1249a0cdeb8d3d3e16e6fac6dc5baed'
+            '5e1b8b1e9b3243a5ab315481c39b1b88f28923148659dcc0ac7ed78d9ba4f072')
 validpgpkeys=(
               '474402C8C582DAFBE389C427BCB7CF877E7D47A7' # Alexandre Oliva
               'C92BAA713B8D53D3CAE63FC9E6974752F9704456' # André Silva
@@ -129,6 +133,7 @@ prepare() {
     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-dove-add-Dove-divider-clocks.patch"
   fi
 
   # add freedo as boot logo
@@ -143,6 +148,10 @@ prepare() {
   # (relevant patch sent upstream: https://lkml.org/lkml/2011/7/26/227)
   patch -p1 -i "${srcdir}/change-default-console-loglevel.patch"
 
+  # fix #46968
+  # hangs on older intel hardware
+  patch -Np1 -i "${srcdir}/0001-disabling-primary-plane-in-the-noatomic-case.patch"
+
   # make the radeon driver load without the firmwares
   # http://www.fsfla.org/pipermail/linux-libre/2015-August/003098.html
   if [ "${CARCH}" = "x86_64" ] || [ "${CARCH}" = "i686" ]; then ## This patch is only needed for x86 computers, so we disable it for others
diff --git a/kernels/linux-libre-knock/config.armv7h b/kernels/linux-libre-knock/config.armv7h
index 048b4eb2f..1e444050f 100644
--- a/kernels/linux-libre-knock/config.armv7h
+++ b/kernels/linux-libre-knock/config.armv7h
@@ -1,6 +1,6 @@
 #
 # Automatically generated file; DO NOT EDIT.
-# Linux/arm 4.3.0-gnu-1-knock Kernel Configuration
+# Linux/arm 4.3.3-gnu-1-knock Kernel Configuration
 #
 CONFIG_ARM=y
 CONFIG_ARM_HAS_SG_CHAIN=y
@@ -789,7 +789,20 @@ CONFIG_QORIQ_CPUFREQ=y
 #
 # CPU Idle
 #
-# CONFIG_CPU_IDLE is not set
+CONFIG_CPU_IDLE=y
+CONFIG_CPU_IDLE_GOV_LADDER=y
+CONFIG_CPU_IDLE_GOV_MENU=y
+CONFIG_DT_IDLE_STATES=y
+
+#
+# ARM CPU Idle Drivers
+#
+CONFIG_ARM_CPUIDLE=y
+# CONFIG_ARM_BIG_LITTLE_CPUIDLE is not set
+# CONFIG_ARM_HIGHBANK_CPUIDLE is not set
+# CONFIG_ARM_ZYNQ_CPUIDLE is not set
+# CONFIG_ARM_EXYNOS_CPUIDLE is not set
+# CONFIG_ARM_MVEBU_V7_CPUIDLE is not set
 CONFIG_ARCH_NEEDS_CPU_IDLE_COUPLED=y
 
 #
@@ -3044,7 +3057,7 @@ CONFIG_SERIAL_EARLYCON=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_DEPRECATED_OPTIONS=y
 CONFIG_SERIAL_8250_CONSOLE=y
-CONFIG_SERIAL_8250_DMA=y
+# CONFIG_SERIAL_8250_DMA is not set
 CONFIG_SERIAL_8250_PCI=y
 CONFIG_SERIAL_8250_NR_UARTS=6
 CONFIG_SERIAL_8250_RUNTIME_UARTS=6
@@ -4584,6 +4597,8 @@ CONFIG_DRM_IMX_TVE=m
 CONFIG_DRM_IMX_LDB=m
 CONFIG_DRM_IMX_IPUV3=m
 CONFIG_DRM_IMX_HDMI=m
+CONFIG_DRM_ETNAVIV=m
+# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 
 #
 # Frame buffer Devices
@@ -4782,15 +4797,12 @@ CONFIG_SND_DRIVERS=y
 # CONFIG_SND_AC97_POWER_SAVE is not set
 CONFIG_SND_PCI=y
 # CONFIG_SND_AD1889 is not set
-# CONFIG_SND_ALS300 is not set
-# CONFIG_SND_ALI5451 is not set
 # CONFIG_SND_ATIIXP is not set
 # CONFIG_SND_ATIIXP_MODEM is not set
 # CONFIG_SND_AU8810 is not set
 # CONFIG_SND_AU8820 is not set
 # CONFIG_SND_AU8830 is not set
 # CONFIG_SND_AW2 is not set
-# CONFIG_SND_AZT3328 is not set
 # CONFIG_SND_BT87X is not set
 # CONFIG_SND_CA0106 is not set
 # CONFIG_SND_CMIPCI is not set
@@ -4812,22 +4824,16 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_INDIGODJ is not set
 # CONFIG_SND_INDIGOIOX is not set
 # CONFIG_SND_INDIGODJX is not set
-# CONFIG_SND_EMU10K1 is not set
-# CONFIG_SND_EMU10K1X is not set
 # CONFIG_SND_ENS1370 is not set
 # CONFIG_SND_ENS1371 is not set
-# CONFIG_SND_ES1938 is not set
-# CONFIG_SND_ES1968 is not set
 # CONFIG_SND_FM801 is not set
 # CONFIG_SND_HDSP is not set
 # CONFIG_SND_HDSPM is not set
-# CONFIG_SND_ICE1712 is not set
 # CONFIG_SND_ICE1724 is not set
 # CONFIG_SND_INTEL8X0 is not set
 # CONFIG_SND_INTEL8X0M is not set
 # CONFIG_SND_KORG1212 is not set
 # CONFIG_SND_LOLA is not set
-# CONFIG_SND_MAESTRO3 is not set
 # CONFIG_SND_MIXART is not set
 # CONFIG_SND_NM256 is not set
 # CONFIG_SND_PCXHR is not set
@@ -4836,8 +4842,6 @@ CONFIG_SND_PCI=y
 # CONFIG_SND_RME96 is not set
 # CONFIG_SND_RME9652 is not set
 # CONFIG_SND_SE6X is not set
-# CONFIG_SND_SONICVIBES is not set
-# CONFIG_SND_TRIDENT is not set
 # CONFIG_SND_VIA82XX is not set
 # CONFIG_SND_VIA82XX_MODEM is not set
 # CONFIG_SND_VIRTUOSO is not set
@@ -6027,8 +6031,6 @@ CONFIG_FB_TFT_WATTEROTT=m
 CONFIG_FB_FLEX=m
 CONFIG_FB_TFT_FBTFT_DEVICE=m
 # CONFIG_MOST is not set
-CONFIG_DRM_ETNAVIV=m
-# CONFIG_DRM_ETNAVIV_REGISTER_LOGGING is not set
 CONFIG_CHROME_PLATFORMS=y
 CONFIG_CROS_EC_CHARDEV=y
 CONFIG_CROS_EC_PROTO=y