Merge remote-tracking branch 'origin/master'kernel-4.7.0-0.rc0.git4.1.vanilla.knurd.1.fc24

8 files changed, 34 insertions, 671 deletions

diff --git a/Fix-tegra-to-use-stdout-path-for-serial-console.patch b/Fix-tegra-to-use-stdout-path-for-serial-console.patch
deleted file mode 100644
index 80a2d1b95..000000000
--- a/Fix-tegra-to-use-stdout-path-for-serial-console.patch
+++ /dev/null
@@ -1,318 +0,0 @@
-From 15b8caef5f380d9465876478ff5e365bc6afa5b6 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Sun, 6 Mar 2016 10:59:13 +0000
-Subject: [PATCH] Fix tegra to use stdout-path for serial console
-
----
- arch/arm/boot/dts/tegra114-dalmore.dts         | 4 ++++
- arch/arm/boot/dts/tegra124-jetson-tk1.dts      | 4 ++++
- arch/arm/boot/dts/tegra124-nyan.dtsi           | 4 ++++
- arch/arm/boot/dts/tegra124-venice2.dts         | 4 ++++
- arch/arm/boot/dts/tegra20-harmony.dts          | 4 ++++
- arch/arm/boot/dts/tegra20-iris-512.dts         | 4 ++++
- arch/arm/boot/dts/tegra20-medcom-wide.dts      | 4 ++++
- arch/arm/boot/dts/tegra20-paz00.dts            | 4 ++++
- arch/arm/boot/dts/tegra20-seaboard.dts         | 4 ++++
- arch/arm/boot/dts/tegra20-tamonten.dtsi        | 4 ++++
- arch/arm/boot/dts/tegra20-trimslice.dts        | 4 ++++
- arch/arm/boot/dts/tegra20-ventana.dts          | 4 ++++
- arch/arm/boot/dts/tegra20-whistler.dts         | 4 ++++
- arch/arm/boot/dts/tegra30-apalis-eval.dts      | 4 ++++
- arch/arm/boot/dts/tegra30-beaver.dts           | 4 ++++
- arch/arm/boot/dts/tegra30-cardhu.dtsi          | 4 ++++
- arch/arm/boot/dts/tegra30-colibri-eval-v3.dts  | 4 ++++
- arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 5 ++++-
- arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi | 4 ++++
- 19 files changed, 76 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/tegra114-dalmore.dts b/arch/arm/boot/dts/tegra114-dalmore.dts
-index 8b7aa0d..b5748ee 100644
---- a/arch/arm/boot/dts/tegra114-dalmore.dts
-+++ b/arch/arm/boot/dts/tegra114-dalmore.dts
-@@ -18,6 +18,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x80000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra124-jetson-tk1.dts b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
-index 66b4451..abf046a 100644
---- a/arch/arm/boot/dts/tegra124-jetson-tk1.dts
-+++ b/arch/arm/boot/dts/tegra124-jetson-tk1.dts
-@@ -15,6 +15,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x0 0x80000000 0x0 0x80000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra124-nyan.dtsi b/arch/arm/boot/dts/tegra124-nyan.dtsi
-index ec1aa64..e2cd39e 100644
---- a/arch/arm/boot/dts/tegra124-nyan.dtsi
-+++ b/arch/arm/boot/dts/tegra124-nyan.dtsi
-@@ -8,6 +8,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x0 0x80000000 0x0 0x80000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra124-venice2.dts b/arch/arm/boot/dts/tegra124-venice2.dts
-index cfbdf42..604f4b7 100644
---- a/arch/arm/boot/dts/tegra124-venice2.dts
-+++ b/arch/arm/boot/dts/tegra124-venice2.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x0 0x80000000 0x0 0x80000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-harmony.dts b/arch/arm/boot/dts/tegra20-harmony.dts
-index b926a07..4b73c76 100644
---- a/arch/arm/boot/dts/tegra20-harmony.dts
-+++ b/arch/arm/boot/dts/tegra20-harmony.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-iris-512.dts b/arch/arm/boot/dts/tegra20-iris-512.dts
-index 1dd7d7b..bb56dfe 100644
---- a/arch/arm/boot/dts/tegra20-iris-512.dts
-+++ b/arch/arm/boot/dts/tegra20-iris-512.dts
-@@ -11,6 +11,10 @@
- 		serial1 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	host1x@50000000 {
- 		hdmi@54280000 {
- 			status = "okay";
-diff --git a/arch/arm/boot/dts/tegra20-medcom-wide.dts b/arch/arm/boot/dts/tegra20-medcom-wide.dts
-index 9b87526..34c6588 100644
---- a/arch/arm/boot/dts/tegra20-medcom-wide.dts
-+++ b/arch/arm/boot/dts/tegra20-medcom-wide.dts
-@@ -10,6 +10,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	pwm@7000a000 {
- 		status = "okay";
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-paz00.dts b/arch/arm/boot/dts/tegra20-paz00.dts
-index ed7e100..81a10a9 100644
---- a/arch/arm/boot/dts/tegra20-paz00.dts
-+++ b/arch/arm/boot/dts/tegra20-paz00.dts
-@@ -14,6 +14,10 @@
- 		serial1 = &uartc;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x20000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-seaboard.dts b/arch/arm/boot/dts/tegra20-seaboard.dts
-index aea8994..0aed748 100644
---- a/arch/arm/boot/dts/tegra20-seaboard.dts
-+++ b/arch/arm/boot/dts/tegra20-seaboard.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-tamonten.dtsi b/arch/arm/boot/dts/tegra20-tamonten.dtsi
-index 13d4e61..025e9e8 100644
---- a/arch/arm/boot/dts/tegra20-tamonten.dtsi
-+++ b/arch/arm/boot/dts/tegra20-tamonten.dtsi
-@@ -10,6 +10,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x20000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-trimslice.dts b/arch/arm/boot/dts/tegra20-trimslice.dts
-index d99af4e..69d25ca 100644
---- a/arch/arm/boot/dts/tegra20-trimslice.dts
-+++ b/arch/arm/boot/dts/tegra20-trimslice.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-ventana.dts b/arch/arm/boot/dts/tegra20-ventana.dts
-index 04c58e9..c61533a 100644
---- a/arch/arm/boot/dts/tegra20-ventana.dts
-+++ b/arch/arm/boot/dts/tegra20-ventana.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra20-whistler.dts b/arch/arm/boot/dts/tegra20-whistler.dts
-index 340d811..bd76585 100644
---- a/arch/arm/boot/dts/tegra20-whistler.dts
-+++ b/arch/arm/boot/dts/tegra20-whistler.dts
-@@ -13,6 +13,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x00000000 0x20000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra30-apalis-eval.dts b/arch/arm/boot/dts/tegra30-apalis-eval.dts
-index f2879cf..b914bcb 100644
---- a/arch/arm/boot/dts/tegra30-apalis-eval.dts
-+++ b/arch/arm/boot/dts/tegra30-apalis-eval.dts
-@@ -17,6 +17,10 @@
- 		serial3 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	pcie-controller@00003000 {
- 		status = "okay";
- 
-diff --git a/arch/arm/boot/dts/tegra30-beaver.dts b/arch/arm/boot/dts/tegra30-beaver.dts
-index 3dede39..1eca3b2 100644
---- a/arch/arm/boot/dts/tegra30-beaver.dts
-+++ b/arch/arm/boot/dts/tegra30-beaver.dts
-@@ -12,6 +12,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x80000000 0x7ff00000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra30-cardhu.dtsi b/arch/arm/boot/dts/tegra30-cardhu.dtsi
-index bb1ca15..de9d6cc 100644
---- a/arch/arm/boot/dts/tegra30-cardhu.dtsi
-+++ b/arch/arm/boot/dts/tegra30-cardhu.dtsi
-@@ -35,6 +35,10 @@
- 		serial1 = &uartc;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		reg = <0x80000000 0x40000000>;
- 	};
-diff --git a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
-index 3ff019f..93e1ffd 100644
---- a/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
-+++ b/arch/arm/boot/dts/tegra30-colibri-eval-v3.dts
-@@ -15,6 +15,10 @@
- 		serial2 = &uartd;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	host1x@50000000 {
- 		dc@54200000 {
- 			rgb {
-diff --git a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
-index 62f33fc..3c0b4d7 100644
---- a/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
-+++ b/arch/arm64/boot/dts/nvidia/tegra132-norrin.dts
-@@ -10,9 +10,12 @@
- 	aliases {
- 		rtc0 = "/i2c@0,7000d000/as3722@40";
- 		rtc1 = "/rtc@0,7000e000";
-+		serial0 = &uarta;
- 	};
- 
--	chosen { };
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
- 
- 	memory {
- 		device_type = "memory";
-diff --git a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
-index ece0dec..73ba582 100644
---- a/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
-+++ b/arch/arm64/boot/dts/nvidia/tegra210-p2530.dtsi
-@@ -9,6 +9,10 @@
- 		serial0 = &uarta;
- 	};
- 
-+	chosen {
-+		stdout-path = "serial0:115200n8";
-+	};
-+
- 	memory {
- 		device_type = "memory";
- 		reg = <0x0 0x80000000 0x0 0xc0000000>;
--- 
-2.5.0
-
diff --git a/config-arm-generic b/config-arm-generic
index 4bb634ff6..dfbab76cc 100644
--- a/config-arm-generic
+++ b/config-arm-generic
@@ -165,6 +165,7 @@ CONFIG_SND_HDA_TEGRA=m
 
 # CONFIG_ARM_TEGRA20_CPUFREQ is not set
 # CONFIG_MFD_NVEC is not set
+# CONFIG_PHY_TEGRA_XUSB is not set
 
 # Virt
 CONFIG_PARAVIRT=y
@@ -362,6 +363,7 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_CFI_ADV_OPTIONS is not set
 CONFIG_MTD_PHYSMAP=m
 CONFIG_MTD_PHYSMAP_OF=m
+CONFIG_MTD_PHYSMAP_OF_VERSATILE=y
 # CONFIG_MTD_PHYSMAP_COMPAT is not set
 # CONFIG_MTD_LPDDR2_NVM is not set
 
diff --git a/config-arm64 b/config-arm64
index 1e84f5899..5c338d7fa 100644
--- a/config-arm64
+++ b/config-arm64
@@ -28,6 +28,7 @@ CONFIG_ARCH_XGENE=y
 # CONFIG_ARCH_VULCAN is not set
 # CONFIG_ARCH_ZYNQMP is not set
 # CONFIG_ARCH_UNIPHIER is not set
+# CONFIG_ARCH_LG1K is not set
 
 # Erratum
 CONFIG_ARM64_ERRATUM_826319=y
diff --git a/config-generic b/config-generic
index 70731ecda..21ac74dae 100644
--- a/config-generic
+++ b/config-generic
@@ -3491,6 +3491,9 @@ CONFIG_VIDEO_TM6000_DVB=m
 # CONFIG_VIDEO_VIVID is not set
 CONFIG_VIDEO_USBTV=m
 # CONFIG_VIDEO_AU0828_RC is not set
+CONFIG_VIDEO_TW686X=m
+# Staging version?
+# CONFIG_VIDEO_TW686X_KH is not set
 
 CONFIG_USB_VIDEO_CLASS=m
 CONFIG_USB_VIDEO_CLASS_INPUT_EVDEV=y
@@ -5429,6 +5432,7 @@ CONFIG_RING_BUFFER_BENCHMARK=m
 CONFIG_FUNCTION_TRACER=y
 CONFIG_STACK_TRACER=y
 # CONFIG_FUNCTION_GRAPH_TRACER is not set
+# CONFIG_HIST_TRIGGERS is not set
 
 CONFIG_KPROBES=y
 CONFIG_KPROBE_EVENT=y
diff --git a/geekbox-v4-device-tree-support.patch b/geekbox-v4-device-tree-support.patch
index 77c1e5c28..11f30e7b2 100644
--- a/geekbox-v4-device-tree-support.patch
+++ b/geekbox-v4-device-tree-support.patch
@@ -1,26 +1,24 @@
-From 4d321bf15d2d5e5b1b674f2a26a1c5202090a800 Mon Sep 17 00:00:00 2001
+From 277aa4c25655e8f746f02879d26298772244958a Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
 Date: Thu, 17 Mar 2016 15:19:04 +0000
 Subject: [PATCH] geekbox v4 patchset
 
 ---
- Documentation/devicetree/bindings/arm/rockchip.txt |   9 +
- arch/arm64/boot/dts/rockchip/Makefile              |   2 +
- arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |   2 +-
- .../dts/rockchip/rk3368-geekbox-landingship.dts    |  57 ++++
- arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts    | 319 +++++++++++++++++++++
- arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |   2 +-
- 6 files changed, 389 insertions(+), 2 deletions(-)
+ Documentation/devicetree/bindings/arm/rockchip.txt |  9 ++++
+ arch/arm64/boot/dts/rockchip/Makefile              |  1 +
+ arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi       |  2 +-
+ .../dts/rockchip/rk3368-geekbox-landingship.dts    | 57 ++++++++++++++++++++++
+ arch/arm64/boot/dts/rockchip/rk3368-r88.dts        |  2 +-
+ 5 files changed, 69 insertions(+), 2 deletions(-)
  create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
- create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
 
 diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
-index 078c14f..ae84f4e 100644
+index 715d960..7cfadac 100644
 --- a/Documentation/devicetree/bindings/arm/rockchip.txt
 +++ b/Documentation/devicetree/bindings/arm/rockchip.txt
-@@ -87,6 +87,15 @@ Rockchip platforms device tree bindings
- 		     "google,veyron-speedy-rev3", "google,veyron-speedy-rev2",
- 		     "google,veyron-speedy", "google,veyron", "rockchip,rk3288";
+@@ -95,6 +95,15 @@ Rockchip platforms device tree bindings
+     Required root node properties:
+       - compatible = "mqmaker,miqi", "rockchip,rk3288";
  
 +- GeekBuying GeekBox:
 +    Required root node properties:
@@ -35,21 +33,21 @@ index 078c14f..ae84f4e 100644
      Required root node properties:
        - compatible = "rockchip,rk3368-evb-act8846", "rockchip,rk3368";
 diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
-index e3f0b5f..201bcd9 100644
+index 7037a16..e002ebe 100644
 --- a/arch/arm64/boot/dts/rockchip/Makefile
 +++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -1,4 +1,6 @@
+@@ -1,5 +1,6 @@
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
 +dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox-landingship.dtb
  dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
+ dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
  
- always		:= $(dtb-y)
 diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-index 8c219cc..e4ceb53 100644
+index fff8b19..bd4f2cf 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
 +++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-@@ -48,7 +48,7 @@
+@@ -49,7 +49,7 @@
  		stdout-path = "serial2:115200n8";
  	};
  
@@ -121,336 +119,11 @@ index 0000000..a28ace9
 +&i2c2 {
 +	status = "okay";
 +};
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
-new file mode 100644
-index 0000000..46cdddf
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox.dts
-@@ -0,0 +1,319 @@
-+/*
-+ * Copyright (c) 2016 Andreas Färber
-+ *
-+ * 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 "rk3368.dtsi"
-+#include <dt-bindings/input/input.h>
-+
-+/ {
-+	model = "GeekBox";
-+	compatible = "geekbuying,geekbox", "rockchip,rk3368";
-+
-+	chosen {
-+		stdout-path = "serial2:115200n8";
-+	};
-+
-+	memory@0 {
-+		device_type = "memory";
-+		reg = <0x0 0x0 0x0 0x80000000>;
-+	};
-+
-+	ext_gmac: gmac-clk {
-+		compatible = "fixed-clock";
-+		clock-frequency = <125000000>;
-+		clock-output-names = "ext_gmac";
-+		#clock-cells = <0>;
-+	};
-+
-+	ir: ir-receiver {
-+		compatible = "gpio-ir-receiver";
-+		gpios = <&gpio3 30 GPIO_ACTIVE_LOW>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&ir_int>;
-+	};
-+
-+	keys: gpio-keys {
-+		compatible = "gpio-keys";
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pwr_key>;
-+
-+		power {
-+			gpios = <&gpio0 2 GPIO_ACTIVE_LOW>;
-+			label = "GPIO Power";
-+			linux,code = <KEY_POWER>;
-+			wakeup-source;
-+		};
-+	};
-+
-+	leds: gpio-leds {
-+		compatible = "gpio-leds";
-+
-+		blue {
-+			gpios = <&gpio2 2 GPIO_ACTIVE_HIGH>;
-+			label = "geekbox:blue:led";
-+			default-state = "on";
-+		};
-+
-+		red {
-+			gpios = <&gpio2 3 GPIO_ACTIVE_HIGH>;
-+			label = "geekbox:red:led";
-+			default-state = "off";
-+		};
-+	};
-+
-+	vcc_sys: vcc-sys-regulator {
-+		compatible = "regulator-fixed";
-+		regulator-name = "vcc_sys";
-+		regulator-min-microvolt = <5000000>;
-+		regulator-max-microvolt = <5000000>;
-+		regulator-always-on;
-+		regulator-boot-on;
-+	};
-+};
-+
-+&emmc {
-+	status = "okay";
-+	bus-width = <8>;
-+	cap-mmc-highspeed;
-+	clock-frequency = <150000000>;
-+	disable-wp;
-+	keep-power-in-suspend;
-+	non-removable;
-+	num-slots = <1>;
-+	vmmc-supply = <&vcc_io>;
-+	vqmmc-supply = <&vcc18_flash>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_clk>, <&emmc_cmd>, <&emmc_bus8>;
-+};
-+
-+&gmac {
-+	status = "okay";
-+	phy-supply = <&vcc_lan>;
-+	phy-mode = "rgmii";
-+	clock_in_out = "input";
-+	assigned-clocks = <&cru SCLK_MAC>;
-+	assigned-clock-parents = <&ext_gmac>;
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&rgmii_pins>;
-+	tx_delay = <0x30>;
-+	rx_delay = <0x10>;
-+};
-+
-+&i2c0 {
-+	status = "okay";
-+
-+	rk808: pmic@1b {
-+		compatible = "rockchip,rk808";
-+		reg = <0x1b>;
-+		pinctrl-names = "default";
-+		pinctrl-0 = <&pmic_int>, <&pmic_sleep>;
-+		interrupt-parent = <&gpio0>;
-+		interrupts = <5 IRQ_TYPE_LEVEL_LOW>;
-+		rockchip,system-power-controller;
-+		vcc1-supply = <&vcc_sys>;
-+		vcc2-supply = <&vcc_sys>;
-+		vcc3-supply = <&vcc_sys>;
-+		vcc4-supply = <&vcc_sys>;
-+		vcc6-supply = <&vcc_sys>;
-+		vcc7-supply = <&vcc_sys>;
-+		vcc8-supply = <&vcc_io>;
-+		vcc9-supply = <&vcc_sys>;
-+		vcc10-supply = <&vcc_sys>;
-+		vcc11-supply = <&vcc_sys>;
-+		vcc12-supply = <&vcc_io>;
-+		clock-output-names = "xin32k", "rk808-clkout2";
-+		#clock-cells = <1>;
-+
-+		regulators {
-+			vdd_cpu: DCDC_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <700000>;
-+				regulator-max-microvolt = <1500000>;
-+				regulator-name = "vdd_cpu";
-+			};
-+
-+			vdd_log: DCDC_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <700000>;
-+				regulator-max-microvolt = <1500000>;
-+				regulator-name = "vdd_log";
-+			};
-+
-+			vcc_ddr: DCDC_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_ddr";
-+			};
-+
-+			vcc_io: DCDC_REG4 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc_io";
-+			};
-+
-+			vcc18_flash: LDO_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18_flash";
-+			};
-+
-+			vcc33_lcd: LDO_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <3300000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vcc33_lcd";
-+			};
-+
-+			vdd_10: LDO_REG3 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-name = "vdd_10";
-+			};
-+
-+			vcca_18: LDO_REG4 {
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcca_18";
-+			};
-+
-+			vccio_sd: LDO_REG5 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <3300000>;
-+				regulator-name = "vccio_sd";
-+			};
-+
-+			vdd10_lcd: LDO_REG6 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1000000>;
-+				regulator-max-microvolt = <1000000>;
-+				regulator-name = "vdd10_lcd";
-+			};
-+
-+			vcc_18: LDO_REG7 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc_18";
-+			};
-+
-+			vcc18_lcd: LDO_REG8 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-min-microvolt = <1800000>;
-+				regulator-max-microvolt = <1800000>;
-+				regulator-name = "vcc18_lcd";
-+			};
-+
-+			vcc_sd: SWITCH_REG1 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_sd";
-+			};
-+
-+			vcc_lan: SWITCH_REG2 {
-+				regulator-always-on;
-+				regulator-boot-on;
-+				regulator-name = "vcc_lan";
-+			};
-+		};
-+	};
-+};
-+
-+&pinctrl {
-+	ir {
-+		ir_int: ir-int {
-+			rockchip,pins = <3 30 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	keys {
-+		pwr_key: pwr-key {
-+			rockchip,pins = <0 2 RK_FUNC_GPIO &pcfg_pull_none>;
-+		};
-+	};
-+
-+	pmic {
-+		pmic_sleep: pmic-sleep {
-+			rockchip,pins = <0 0 RK_FUNC_2 &pcfg_pull_none>;
-+		};
-+
-+		pmic_int: pmic-int {
-+			rockchip,pins = <0 5 RK_FUNC_GPIO &pcfg_pull_up>;
-+		};
-+	};
-+};
-+
-+&tsadc {
-+	status = "okay";
-+	rockchip,hw-tshut-mode = <0>; /* CRU */
-+	rockchip,hw-tshut-polarity = <1>; /* high */
-+};
-+
-+&uart2 {
-+	status = "okay";
-+};
-+
-+&usb_host0_ehci {
-+	status = "okay";
-+};
-+
-+&usb_otg {
-+	status = "okay";
-+};
-+
-+&wdt {
-+	status = "okay";
-+};
 diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-index 104cbee..9548129 100644
+index b56b720..5ea68c4 100644
 --- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
 +++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-@@ -51,7 +51,7 @@
+@@ -52,7 +52,7 @@
  		stdout-path = "serial2:115200n8";
  	};
  
@@ -460,5 +133,5 @@ index 104cbee..9548129 100644
  		reg = <0x0 0x0 0x0 0x40000000>;
  	};
 -- 
-2.5.0
+2.5.5
 
diff --git a/gitrev b/gitrev
index 8c6b6aeb3..3b79c3867 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-0b7962a6c4a37ef3cbb25d976af7b9ec4ce8ad01
+2600a46ee0ed57c0e0a382c2a37ebac64d374d20
diff --git a/kernel.spec b/kernel.spec
index 98f655f14..0e508fdb5 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -77,7 +77,7 @@ Summary: The Linux kernel
 # The rc snapshot level
 %define rcrev 0
 # The git snapshot level
-%define gitrev 3
+%define gitrev 4
 # Set rpm version accordingly
 %define rpmversion 4.%{upstream_sublevel}.0
 %endif
@@ -528,9 +528,6 @@ Patch426: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch
 # http://patchwork.ozlabs.org/patch/587554/
 Patch430: ARM-tegra-usb-no-reset.patch
 
-# http://www.spinics.net/lists/linux-tegra/msg25152.html
-Patch431: Fix-tegra-to-use-stdout-path-for-serial-console.patch
-
 Patch432: arm-i.MX6-Utilite-device-dtb.patch
 
 # mvebu DSA switch fixes
@@ -2162,6 +2159,10 @@ fi
 #
 # 
 %changelog
+* Thu May 19 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git4.1
+- Linux v4.6-5028-g2600a46
+- trace, audit, input, media, scsi, armsoc merges
+
 * Wed May 18 2016 Laura Abbott <labbott@redhat.com> - 4.7.0-0.rc0.git3.1
 - Linux v4.6-3623-g0b7962a
 - ata, regulator, gpio, HID, livepatching, networking, dm, block, vfs, fs,
diff --git a/sources b/sources
index aba95baad..ab2baebf7 100644
--- a/sources
+++ b/sources
@@ -1,3 +1,3 @@
 d2927020e24a76da4ab482a8bc3e9ef3  linux-4.6.tar.xz
 fd23b14b9d474c3dfacb6e8ee82d3a51  perf-man-4.6.tar.gz
-a3fb92fb10d4f6c55784379085f5fbad  patch-4.6-git3.xz
+be912d5f22aba6286ac2e205e2ce1202  patch-4.6-git4.xz