Merge remote-tracking branch 'origin/stabilization' into stabilization

3 files changed, 0 insertions, 246 deletions

diff --git a/bcm283x-mmc-bcm2835.patch b/bcm283x-mmc-bcm2835.patch
index d9591b438..f3b395db8 100644
--- a/bcm283x-mmc-bcm2835.patch
+++ b/bcm283x-mmc-bcm2835.patch
@@ -1786,111 +1786,6 @@ index 7c48028..519a55c 100644
  CONFIG_NEW_LEDS=y
  CONFIG_LEDS_CLASS=y
  CONFIG_LEDS_GPIO=y
-From patchwork Wed Mar  8 09:19:10 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v4,6/7] arm: dts: bcm283x: switch from &sdhci to &sdhost
-From: Gerd Hoffmann <kraxel@redhat.com>
-X-Patchwork-Id: 9610687
-Message-Id: <1488964751-22763-11-git-send-email-kraxel@redhat.com>
-To: linux-rpi-kernel@lists.infradead.org
-Cc: mark.rutland@arm.com, stefan.wahren@i2se.com, ulf.hansson@linaro.org,
- f.fainelli@gmail.com, sbranden@broadcom.com, devicetree@vger.kernel.org, 
- rjui@broadcom.com, lee@kernel.org, will.deacon@arm.com,
- linux@armlinux.org.uk, 
- linux-kernel@vger.kernel.org, eric@anholt.net, robh+dt@kernel.org,
- bcm-kernel-feedback-list@broadcom.com, Gerd Hoffmann <kraxel@redhat.com>, 
- catalin.marinas@arm.com, linux-mmc@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-Date: Wed,  8 Mar 2017 10:19:10 +0100
-
-sdcard access with the sdhost controller is faster.
-
-Read access (dd with 64k blocks on rpi2):
-   CONFIG_MMC_SDHCI_IPROC: 11-12 MB/s
-   CONFIG_MMC_BCM2835:     19-20 MB/s
-
-Differences on write access are pretty much in the noise.
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Acked-by: Eric Anholt <eric@anholt.net>
----
- arch/arm/boot/dts/bcm2835-rpi.dtsi | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index 8b95832..e36c392 100644
---- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
-+++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-@@ -65,13 +65,13 @@
- &sdhci {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&emmc_gpio48>;
--	status = "okay";
- 	bus-width = <4>;
- };
- 
- &sdhost {
- 	pinctrl-names = "default";
- 	pinctrl-0 = <&sdhost_gpio48>;
-+	status = "okay";
- 	bus-width = <4>;
- };
- 
-From patchwork Wed Mar  8 09:19:11 2017
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-Subject: [v4,7/7] arm64: dts: bcm2837: add &sdhci and &sdhost
-From: Gerd Hoffmann <kraxel@redhat.com>
-X-Patchwork-Id: 9610637
-Message-Id: <1488964751-22763-12-git-send-email-kraxel@redhat.com>
-To: linux-rpi-kernel@lists.infradead.org
-Cc: mark.rutland@arm.com, stefan.wahren@i2se.com, ulf.hansson@linaro.org,
- f.fainelli@gmail.com, sbranden@broadcom.com, devicetree@vger.kernel.org, 
- rjui@broadcom.com, lee@kernel.org, will.deacon@arm.com,
- linux@armlinux.org.uk, 
- linux-kernel@vger.kernel.org, eric@anholt.net, robh+dt@kernel.org,
- bcm-kernel-feedback-list@broadcom.com, Gerd Hoffmann <kraxel@redhat.com>, 
- catalin.marinas@arm.com, linux-mmc@vger.kernel.org,
- linux-arm-kernel@lists.infradead.org
-Date: Wed,  8 Mar 2017 10:19:11 +0100
-
-For the raspberry pi 3 we'll need both sdhci (handles sdio wifi) and
-sdhost (handles sdcard).
-
-Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-Acked-by: Eric Anholt <eric@anholt.net>
----
- arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts | 17 +++++++++++++++++
- 1 file changed, 17 insertions(+)
-
-diff --git a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-index c309633..972f14d 100644
---- a/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-+++ b/arch/arm64/boot/dts/broadcom/bcm2837-rpi-3-b.dts
-@@ -22,3 +22,20 @@
- &uart1 {
- 	status = "okay";
- };
-+
-+/* SDHCI is used to control the SDIO for wireless */
-+&sdhci {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&emmc_gpio34>;
-+	status = "okay";
-+	bus-width = <4>;
-+	non-removable;
-+};
-+
-+/* SDHOST is used to drive the SD card */
-+&sdhost {
-+	pinctrl-names = "default";
-+	pinctrl-0 = <&sdhost_gpio48>;
-+	status = "okay";
-+	bus-width = <4>;
-+};
 From patchwork Sat Mar 25 13:17:00 2017
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
diff --git a/geekbox-v4-device-tree-support.patch b/geekbox-v4-device-tree-support.patch
deleted file mode 100644
index 54f2bbe7e..000000000
--- a/geekbox-v4-device-tree-support.patch
+++ /dev/null
@@ -1,138 +0,0 @@
-From 11aa129d33635fb33304b6e9b945e502f5ba707a 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              |  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
-
-diff --git a/Documentation/devicetree/bindings/arm/rockchip.txt b/Documentation/devicetree/bindings/arm/rockchip.txt
-index 55f388f..989a039 100644
---- a/Documentation/devicetree/bindings/arm/rockchip.txt
-+++ b/Documentation/devicetree/bindings/arm/rockchip.txt
-@@ -99,6 +99,15 @@ Rockchip platforms device tree bindings
-     Required root node properties:
-       - compatible = "rockchip,rk1108-evb", "rockchip,rk1108";
- 
-+- GeekBuying GeekBox:
-+    Required root node properties:
-+      - compatible = "geekbuying,geekbox", "rockchip,rk3368";
-+
-+- GeekBuying Landingship with GeekBox module:
-+    Required root node properties:
-+      - compatible = "geekbuying,geekbox-landingship",
-+		     "geekbuying,geekbox", "rockchip,rk3368";
-+
- - Rockchip RK3368 evb:
-     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 87669f6..9aec54e 100644
---- a/arch/arm64/boot/dts/rockchip/Makefile
-+++ b/arch/arm64/boot/dts/rockchip/Makefile
-@@ -1,6 +1,7 @@
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-evb-act8846.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-orion-r68-meta.dtb
-+dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-geekbox-landingship.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-px5-evb.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3368-r88.dtb
- dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-evb.dtb
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-index fff8b19..bd4f2cf 100644
---- a/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-evb.dtsi
-@@ -49,7 +49,7 @@
- 		stdout-path = "serial2:115200n8";
- 	};
- 
--	memory {
-+	memory@0 {
- 		device_type = "memory";
- 		reg = <0x0 0x0 0x0 0x40000000>;
- 	};
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
-new file mode 100644
-index 0000000..a28ace9
---- /dev/null
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-geekbox-landingship.dts
-@@ -0,0 +1,57 @@
-+/*
-+ * 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.
-+ */
-+
-+#include "rk3368-geekbox.dts"
-+
-+/ {
-+	model = "GeekBox on Landingship";
-+	compatible = "geekbuying,geekbox-landingship",
-+		     "geekbuying,geekbox", "rockchip,rk3368";
-+};
-+
-+&i2c1 {
-+	status = "disabled";
-+};
-+
-+&i2c2 {
-+	status = "okay";
-+};
-diff --git a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-index eed1ef6..18e2b77 100644
---- a/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-+++ b/arch/arm64/boot/dts/rockchip/rk3368-r88.dts
-@@ -52,7 +52,7 @@
- 		stdout-path = "serial2:115200n8";
- 	};
- 
--	memory {
-+	memory@0 {
- 		device_type = "memory";
- 		reg = <0x0 0x0 0x0 0x40000000>;
- 	};
--- 
-2.7.4
-
diff --git a/kernel.spec b/kernel.spec
index ba33601a8..7a8995dc9 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -511,9 +511,6 @@ Patch002: 0001-iio-Use-event-header-from-kernel-tree.patch
 # a tempory patch for QCOM hardware enablement. Will be gone by end of 2016/F-26 GA
 Patch420: qcom-QDF2432-tmp-errata.patch
 
-# http://www.spinics.net/lists/arm-kernel/msg490981.html
-Patch421: geekbox-v4-device-tree-support.patch
-
 # http://www.spinics.net/lists/linux-tegra/msg26029.html
 Patch422: usb-phy-tegra-Add-38.4MHz-clock-table-entry.patch