Merge remote-tracking branch 'origin/stabilization' into stabilization-user-thl-vanilla-fedora

20 files changed, 917 insertions, 175 deletions

diff --git a/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch b/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
index e845e0070..b6e28b78e 100644
--- a/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+++ b/bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
@@ -1,24 +1,26 @@
-From 624e057827435de39274c34e20c2d937cb9d4ac3 Mon Sep 17 00:00:00 2001
+From 050af591beda9f84693d92b2c38416ea31630608 Mon Sep 17 00:00:00 2001
 From: Peter Robinson <pbrobinson@gmail.com>
-Date: Thu, 31 May 2018 19:08:12 +0100
+Date: Thu, 10 Jan 2019 03:15:33 +0000
 Subject: [PATCH] bcm2835: cpufreq: add CPU frequency control driver
 
 Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
 ---
- arch/arm/boot/dts/bcm2835-rpi.dtsi |   7 ++
- arch/arm/boot/dts/bcm2837.dtsi     |  33 +++++++
- drivers/clk/bcm/Kconfig            |   8 ++
- drivers/clk/bcm/Makefile           |   1 +
- drivers/clk/bcm/clk-raspberrypi.c  | 138 +++++++++++++++++++++++++++++
- 5 files changed, 187 insertions(+)
+ arch/arm/boot/dts/bcm2835-rpi.dtsi         |   7 ++
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts |   7 ++
+ arch/arm/boot/dts/bcm2837.dtsi             |  58 +++++++++
+ arch/arm/boot/dts/bcm283x.dtsi             |   2 +-
+ drivers/clk/bcm/Kconfig                    |   8 ++
+ drivers/clk/bcm/Makefile                   |   1 +
+ drivers/clk/bcm/clk-raspberrypi.c          | 138 +++++++++++++++++++++
+ 7 files changed, 220 insertions(+), 1 deletion(-)
  create mode 100644 drivers/clk/bcm/clk-raspberrypi.c
 
 diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
-index 6c3cfaa77f3d..e6d1627ec421 100644
+index 29f970f864dc..6d0f43957af4 100644
 --- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
 +++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
 @@ -35,6 +35,13 @@
- 			reg = <0x7e00b840 0xf>;
+ 			reg = <0x7e00b840 0x3c>;
  			interrupts = <0 2>;
  		};
 +
@@ -31,47 +33,72 @@ index 6c3cfaa77f3d..e6d1627ec421 100644
  	};
  };
  
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+index 42bb09044cc7..3333c080696c 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+@@ -106,3 +106,10 @@
+ 	pinctrl-0 = <&uart1_gpio14>;
+ 	status = "okay";
+ };
++
++&cpu0_opp_table {
++	opp@1400000000 {
++		opp-hz = /bits/ 64 <1400000000>;
++		clock-latency-ns = <355000>;
++	};
++};
 diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
-index 7704bb029605..c24176282a1f 100644
+index beb6c502dadc..1590d94b618e 100644
 --- a/arch/arm/boot/dts/bcm2837.dtsi
 +++ b/arch/arm/boot/dts/bcm2837.dtsi
-@@ -38,6 +38,9 @@
+@@ -1,4 +1,5 @@
+ #include "bcm283x.dtsi"
++#include <dt-bindings/thermal/thermal.h>
+ 
+ / {
+ 	compatible = "brcm,bcm2837";
+@@ -44,6 +45,10 @@
  			reg = <0>;
  			enable-method = "spin-table";
  			cpu-release-addr = <0x0 0x000000d8>;
 +			clocks = <&arm_clk>;
 +			clock-names = "cpu";
 +			operating-points-v2 = <&cpu0_opp_table>;
++			#cooling-cells = <2>;
  		};
  
  		cpu1: cpu@1 {
-@@ -46,6 +49,9 @@
+@@ -52,6 +57,10 @@
  			reg = <1>;
  			enable-method = "spin-table";
  			cpu-release-addr = <0x0 0x000000e0>;
 +			clocks = <&arm_clk>;
 +			clock-names = "cpu";
 +			operating-points-v2 = <&cpu0_opp_table>;
++			#cooling-cells = <2>;
  		};
  
  		cpu2: cpu@2 {
-@@ -54,6 +60,9 @@
+@@ -60,6 +69,10 @@
  			reg = <2>;
  			enable-method = "spin-table";
  			cpu-release-addr = <0x0 0x000000e8>;
 +			clocks = <&arm_clk>;
 +			clock-names = "cpu";
 +			operating-points-v2 = <&cpu0_opp_table>;
++			#cooling-cells = <2>;
  		};
  
  		cpu3: cpu@3 {
-@@ -62,6 +71,30 @@
+@@ -68,6 +81,31 @@
  			reg = <3>;
  			enable-method = "spin-table";
  			cpu-release-addr = <0x0 0x000000f0>;
 +			clocks = <&arm_clk>;
 +			clock-names = "cpu";
 +			operating-points-v2 = <&cpu0_opp_table>;
++			#cooling-cells = <2>;
 +		};
 +	};
 +
@@ -96,6 +123,46 @@ index 7704bb029605..c24176282a1f 100644
  		};
  	};
  };
+@@ -84,6 +122,26 @@
+ 
+ &cpu_thermal {
+ 	coefficients = <(-538)	412000>;
++
++	trips {
++		cpu_alert0: cpu-alert0 {
++			temperature	= <70000>;
++			hysteresis	= <0>;
++			type		= "passive";
++		};
++	};
++
++	cooling-maps {
++		map0 {
++			trip = <&cpu_alert0>;
++			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++		};
++
++		map1 {
++			trip = <&cpu_crit>;
++			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
++		};
++	};
+ };
+ 
+ /* enable thermal sensor with the correct compatible property set */
+diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
+index 31b29646b14c..2def0684d198 100644
+--- a/arch/arm/boot/dts/bcm283x.dtsi
++++ b/arch/arm/boot/dts/bcm283x.dtsi
+@@ -38,7 +38,7 @@
+ 			thermal-sensors = <&thermal>;
+ 
+ 			trips {
+-				cpu-crit {
++				cpu_crit: cpu-crit {
+ 					temperature	= <80000>;
+ 					hysteresis	= <0>;
+ 					type		= "critical";
 diff --git a/drivers/clk/bcm/Kconfig b/drivers/clk/bcm/Kconfig
 index 4c4bd85f707c..e40bd19da22b 100644
 --- a/drivers/clk/bcm/Kconfig
@@ -269,128 +336,5 @@ index 000000000000..046efc822a59
 +MODULE_DESCRIPTION("Raspberry Pi CPU clock driver");
 +MODULE_LICENSE("GPL v2");
 -- 
-2.17.0
-
-From 40a82f71737891581dcbe45331d15a29dd3e7805 Mon Sep 17 00:00:00 2001
-From: Peter Robinson <pbrobinson@gmail.com>
-Date: Mon, 4 Jun 2018 09:14:10 +0100
-Subject: [PATCH 7/7] add 1.4 ghz OPP for the 3B+
-
-Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
----
- arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-index 4adb85e66be3..aaefb078f391 100644
---- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-+++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
-@@ -106,3 +106,10 @@
- 	pinctrl-0 = <&uart1_gpio14>;
- 	status = "okay";
- };
-+
-+&cpu0_opp_table {
-+	opp@1400000000 {
-+		opp-hz = /bits/ 64 <1400000000>;
-+		clock-latency-ns = <355000>;
-+	};
-+};
--- 
-2.17.1
+2.20.1
 
-From d00bd46b40001d3500b8a7207dcfe1d66600e47e Mon Sep 17 00:00:00 2001
-From: Stefan Wahren <stefan.wahren@i2se.com>
-Date: Wed, 26 Sep 2018 21:13:22 +0200
-Subject: [PATCH] ARM: bcm2837: Use CPU0 as cooling device
-
-Signed-off-by: Stefan Wahren <stefan.wahren@i2se.com>
----
- arch/arm/boot/dts/bcm2837.dtsi | 25 +++++++++++++++++++++++++
- arch/arm/boot/dts/bcm283x.dtsi |  2 +-
- 2 files changed, 26 insertions(+), 1 deletion(-)
-
-diff --git a/arch/arm/boot/dts/bcm2837.dtsi b/arch/arm/boot/dts/bcm2837.dtsi
-index 9cfc553..1590d94 100644
---- a/arch/arm/boot/dts/bcm2837.dtsi
-+++ b/arch/arm/boot/dts/bcm2837.dtsi
-@@ -1,4 +1,5 @@
- #include "bcm283x.dtsi"
-+#include <dt-bindings/thermal/thermal.h>
- 
- / {
- 	compatible = "brcm,bcm2837";
-@@ -47,6 +48,7 @@
- 			clocks = <&arm_clk>;
- 			clock-names = "cpu";
- 			operating-points-v2 = <&cpu0_opp_table>;
-+			#cooling-cells = <2>;
- 		};
- 
- 		cpu1: cpu@1 {
-@@ -58,6 +60,7 @@
- 			clocks = <&arm_clk>;
- 			clock-names = "cpu";
- 			operating-points-v2 = <&cpu0_opp_table>;
-+			#cooling-cells = <2>;
- 		};
- 
- 		cpu2: cpu@2 {
-@@ -69,6 +72,7 @@
- 			clocks = <&arm_clk>;
- 			clock-names = "cpu";
- 			operating-points-v2 = <&cpu0_opp_table>;
-+			#cooling-cells = <2>;
- 		};
- 
- 		cpu3: cpu@3 {
-@@ -80,6 +84,7 @@
- 			clocks = <&arm_clk>;
- 			clock-names = "cpu";
- 			operating-points-v2 = <&cpu0_opp_table>;
-+			#cooling-cells = <2>;
- 		};
- 	};
- 
-@@ -117,6 +122,26 @@
- 
- &cpu_thermal {
- 	coefficients = <(-538)	412000>;
-+
-+	trips {
-+		cpu_alert0: cpu-alert0 {
-+			temperature	= <70000>;
-+			hysteresis	= <0>;
-+			type		= "passive";
-+		};
-+	};
-+
-+	cooling-maps {
-+		map0 {
-+			trip = <&cpu_alert0>;
-+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+		};
-+
-+		map1 {
-+			trip = <&cpu_crit>;
-+			cooling-device = <&cpu0 THERMAL_NO_LIMIT THERMAL_NO_LIMIT>;
-+		};
-+	};
- };
- 
- /* enable thermal sensor with the correct compatible property set */
-diff --git a/arch/arm/boot/dts/bcm283x.dtsi b/arch/arm/boot/dts/bcm283x.dtsi
-index 31b2964..2def068 100644
---- a/arch/arm/boot/dts/bcm283x.dtsi
-+++ b/arch/arm/boot/dts/bcm283x.dtsi
-@@ -38,7 +38,7 @@
- 			thermal-sensors = <&thermal>;
- 
- 			trips {
--				cpu-crit {
-+				cpu_crit: cpu-crit {
- 					temperature	= <80000>;
- 					hysteresis	= <0>;
- 					type		= "critical";
--- 
-2.7.4
diff --git a/bcm2836-Improve-VCHIQ-cache-line-size-handling.patch b/bcm2836-Improve-VCHIQ-cache-line-size-handling.patch
new file mode 100644
index 000000000..8d74fb6e2
--- /dev/null
+++ b/bcm2836-Improve-VCHIQ-cache-line-size-handling.patch
@@ -0,0 +1,630 @@
+From patchwork Mon Sep 17 08:22:22 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Phil Elwell <phil@raspberrypi.org>
+X-Patchwork-Id: 10602175
+Return-Path: 
+ <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
+Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
+ [172.30.200.125])
+	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 25D5E1508
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:24:30 +0000 (UTC)
+Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 16B1D26256
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:24:30 +0000 (UTC)
+Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
+	id 0AA1627F86; Mon, 17 Sep 2018 08:24:30 +0000 (UTC)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
+	pdx-wl-mail.web.codeaurora.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 8457326256
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:24:29 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
+	Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help:
+	List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To:
+	Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=hI/rkOHYLw6EFdgFyOZP5dMv2/ZTgGadMbPyZJmLpTc=; b=eZHlangjy/aXd9
+	xXj4Z+LS7RpoPK1fkoc37gkSBmRem5J0cSGe991FI/y452vB6mqT7ufhiTvGIeEmWU8A6cLGRABQP
+	fF4tvI39ztdvL2mHtLdNC9JRvYtw4haVuS5/LpkOoRCb5+ASym0RhvhxRCNVHAQLkg63aHTmHxU/P
+	uxSfy8T9cJwM8xXEQf8t6o88URzbsLQpXak2x6RRD5gdMWl2qIRCGuM8aLcVRVWdW2X8Zgom/L8Md
+	DAqYno1/RLlowIplhQvoSfTgoT+If2IZF3aYXp7neKn/ztdpZ+Usk8z3R4LyQvpG/NS8/LNRDkOez
+	MJhH2HBomJzgPwW4yiyw==;
+Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
+	id 1g1opO-0005xT-Iz; Mon, 17 Sep 2018 08:24:18 +0000
+Received: from merlin.infradead.org ([2001:8b0:10b:1231::1])
+ by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1ooJ-0005Wn-90
+ for linux-arm-kernel@bombadil.infradead.org; Mon, 17 Sep 2018 08:23:11 +0000
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+ d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date:
+ Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type:
+ Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
+ Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
+ List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
+ bh=709kHRsgmnXd9YV1xoNMc1/aV4Xi/GYEdBYatqJnxII=; b=3Fh7sAF30uEjFVIokmsPp9aFa
+ dnvHs47JPnGnrZ6drQ65LjwPaLp7mZWUnnLRsx8NCIJXbG8ja4rz7ubFLekczmXpMp7kx+vp4GLX+
+ MQZ6Fkd8khgYkVyWVZJwvZXyjMJCLU40cSfPH+rwj2aE4Bsjkrm3gyYqTucdIaWGrmIKEddpvvUoj
+ gijSvNPe4wZ6F3B/OxGyQwY68rQ8e16MWFdQvF+m8r6hAzk1PjQfgh1U22DXRea5oDFVVfV8uFGPF
+ Mt87EyYei0srCrhHGpb1PeHXO4n7UkdGrKHItd7RQfQn9B29yw6yQMSMaEo9zTbpf7a9OgKbJ/jMB
+ jVfQIRXhg==;
+Received: from mx07-00252a01.pphosted.com ([62.209.51.214])
+ by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1ooA-0001aP-0d
+ for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2018 08:23:06 +0000
+Received: from pps.filterd (m0102628.ppops.net [127.0.0.1])
+ by mx07-00252a01.pphosted.com (8.16.0.23/8.16.0.23) with SMTP id
+ w8H8MU0C024133
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:43 +0100
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org;
+ h=from : to :
+ subject : date : message-id : in-reply-to : references; s=pp;
+ bh=709kHRsgmnXd9YV1xoNMc1/aV4Xi/GYEdBYatqJnxII=;
+ b=Xy9adKj2YJ9erCG8FVPBExmDtGihy6MDZ/iSf4J3SdOeXy+Tqf4iDg6DBLJrc17+DYOk
+ G7CpjQSLgraxnF1YGiBjgk7pOimnv39woGoyX6fVY97L4t3lDbf4qdMx5siW/3Wfb4BU
+ jZE1OTowh/4aV9sVCdmLLieaS2SnQWrTI5QW6RGOSZzrSdNfSsEi7T0w0PH8jfIpleHP
+ 2o/WRY6P/3U12dgkEOk4dEejQTGAopzYJl9ZJkUZoFXMMimrgxn/J86Eh/Cd7hs4AOrb
+ xFl1QVFffBgVvD4oE094vl/C9gV0F3HHfRc5pTHAvAbXOzLJYQMHkX9c/zXfJ3J/Xgha kQ==
+Received: from mail-wr1-f72.google.com (mail-wr1-f72.google.com
+ [209.85.221.72])
+ by mx07-00252a01.pphosted.com with ESMTP id 2mgw8f0va0-1
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK)
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:43 +0100
+Received: by mail-wr1-f72.google.com with SMTP id g36-v6so22631044wrd.9
+ for <linux-arm-kernel@lists.infradead.org>;
+ Mon, 17 Sep 2018 01:22:43 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=raspberrypi.org; s=google;
+ h=from:to:subject:date:message-id:in-reply-to:references;
+ bh=709kHRsgmnXd9YV1xoNMc1/aV4Xi/GYEdBYatqJnxII=;
+ b=N6MpqvnqTnIPagi/9P59zuTXf0ho+gbFCEE6jfQYmzcdvGoA5THdZKUVyUyOX+BS5t
+ eodxpyGpb7CZ4wOo/o6Gg/rml2t1OQ3McKMh2t8zP26ITR+L61GLqWseLJt4831yEDE0
+ UE9392fae7t3SnVjq5ojbSmGWMRNPc0RYHT3A08TP+lUsupeI0yuw3+oY1DDFKYdC31E
+ FZfnvjUPjwkGYJo6GVCeyMQIhoWxGMmUkqPOq28WK9woffToeS69koX6AVl7azJ7qAWX
+ xuaAHTyYyjDl3Of9y5GaqPjjoQQd1tY4nz9aW6mLh5QsEx834C3Jg9va8kLQ3Y0gCpAD
+ nVSw==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
+ :references;
+ bh=709kHRsgmnXd9YV1xoNMc1/aV4Xi/GYEdBYatqJnxII=;
+ b=UJHCKLVGminvg0HfeF13uwKYBy5wKpeLZSvZL+F/oep/12zVz6wR9ufer+HQRCOsNc
+ siZjpaTDiMgdv9cYcAmrrkxWWpRQzIqAbvhxk73vxddpr0ymwbHKkm6ycri21KEnHCEu
+ Cm9LpGslmcXtDXM2p83EQx73T9M4SM8Qsa9Zly+qHI8BKHKRm/H52GMXGRgPVtmbzs15
+ jPb8LBJJiOuBCjjVdWAX3hCjkNOprR4NSGQRNvXjVn+UEjwMVdLdbZpqng33DHOtt27Z
+ peJhxLbEg0NXj6QAPEpzUL2L6brBxJga2F3oJsn7i/lCqKn3ndxvvcRMRHF7QXcEMw/K
+ H2Vw==
+X-Gm-Message-State: APzg51BHcGp99CKU3y/yJll0mWOB/Vkm9WUEqJHCnHDNn8NqTqSE+qpp
+ BgRFpPPLsY2z+3zNd1Bo9dcXQ2dwAO3db9d5vWJQOeZIn3UJUznPvSNKIqrOJWogsHoKeiWPzzP
+ ZSwJFaNOx3FkEva8I1tFQde3LPWn6d+1zM3c=
+X-Received: by 2002:a5d:4512:: with SMTP id
+ s18-v6mr18187206wrq.82.1537172562500;
+ Mon, 17 Sep 2018 01:22:42 -0700 (PDT)
+X-Google-Smtp-Source: 
+ ANB0VdaiFK6VovMmRM+tnynuIhV35l0Bwr9uiQksEgfZzBhqOIqpV+djM4jUW5g+o6bqN2HLKChxyA==
+X-Received: by 2002:a5d:4512:: with SMTP id
+ s18-v6mr18187191wrq.82.1537172562269;
+ Mon, 17 Sep 2018 01:22:42 -0700 (PDT)
+Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:14e2:e2a0:5538:c448])
+ by smtp.gmail.com with ESMTPSA id
+ 198-v6sm7938315wmm.0.2018.09.17.01.22.40
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+ Mon, 17 Sep 2018 01:22:41 -0700 (PDT)
+From: Phil Elwell <phil@raspberrypi.org>
+To: Rob Herring <robh+dt@kernel.org>, Stefan Wahren <stefan.wahren@i2se.com>,
+ Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
+ Phil Elwell <phil@raspberrypi.org>, devicetree@vger.kernel.org,
+ linux-rpi-kernel@lists.infradead.org,
+ Russell King <linux@armlinux.org.uk>, Arnd Bergmann <arnd@arndb.de>,
+ linux-arm-kernel@lists.infradead.org,
+ bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org
+Subject: [PATCH v3 2/4] dt-bindings: soc: Document "brcm,bcm2836-vchiq"
+Date: Mon, 17 Sep 2018 09:22:22 +0100
+Message-Id: <1537172544-104852-3-git-send-email-phil@raspberrypi.org>
+X-Mailer: git-send-email 2.7.4
+In-Reply-To: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+References: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, ,
+ definitions=2018-09-17_04:, , signatures=0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20180917_042302_769007_3F16157B 
+X-CRM114-Status: GOOD (  17.25  )
+X-BeenThere: linux-arm-kernel@lists.infradead.org
+X-Mailman-Version: 2.1.21
+Precedence: list
+List-Id: <linux-arm-kernel.lists.infradead.org>
+List-Unsubscribe: 
+ <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
+List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
+List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
+List-Subscribe: 
+ <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
+Errors-To: 
+ linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
+X-Virus-Scanned: ClamAV using ClamSMTP
+
+"brcm,bcm2836-vchiq" should be used on BCM2836 and BCM2837 to ensure
+correct operation.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+Reviewed-by: Rob Herring <robh@kernel.org>
+---
+ Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
+index 8dd7b3a..f331316 100644
+--- a/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
++++ b/Documentation/devicetree/bindings/soc/bcm/brcm,bcm2835-vchiq.txt
+@@ -2,7 +2,8 @@ Broadcom VCHIQ firmware services
+ 
+ Required properties:
+ 
+-- compatible:	Should be "brcm,bcm2835-vchiq"
++- compatible:	Should be "brcm,bcm2835-vchiq" on BCM2835, otherwise
++		"brcm,bcm2836-vchiq".
+ - reg:		Physical base address and length of the doorbell register pair
+ - interrupts:	The interrupt number
+ 		  See bindings/interrupt-controller/brcm,bcm2835-armctrl-ic.txt
+
+From patchwork Mon Sep 17 08:22:23 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Phil Elwell <phil@raspberrypi.org>
+X-Patchwork-Id: 10602173
+Return-Path: 
+ <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
+Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
+ [172.30.200.125])
+	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id D23951508
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:23:48 +0000 (UTC)
+Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C0A5E2624C
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:23:48 +0000 (UTC)
+Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
+	id B494527861; Mon, 17 Sep 2018 08:23:48 +0000 (UTC)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
+	pdx-wl-mail.web.codeaurora.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 1D12F2624C
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:23:48 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
+	Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help:
+	List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To:
+	Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=Dwk4nV4syz12H5Joro54dzb4xRRZnm1pVXSS97zokG4=; b=u5ArKClp9m4rAw
+	X79KW+OdEYkjnJvDRiwHiXrIROhy9KqfwhQncB4G5DZxtVfKFiVHnbqXHk8f+WwX2BxPbMEDIZOoc
+	d/sIjVXlkW2RQBS8mgxjJc/92fmYqW9/xgsXF7mDz2uJxYTeH8ilqLG3yTIoPiLE5V/m/0kWlWp3q
+	/KS6alhirFx2v2lPNAF1/anBJRHtfMp2mLjK5fepthSwL2KNN9T+GIoluCeXKH4ikWTtZcT5t+2lt
+	XvOmzLVgOMhD2/Auupmh1bFAMoyLpk2N90IK/Vn5aR+SqwRV4VRriyUdSQbJw2lwXyeAnwHe8ioGW
+	qBY1kd4d9lahXdnwvbzw==;
+Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
+	id 1g1ooi-0005gd-Sz; Mon, 17 Sep 2018 08:23:37 +0000
+Received: from merlin.infradead.org ([2001:8b0:10b:1231::1])
+ by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1ooH-0005Wn-28
+ for linux-arm-kernel@bombadil.infradead.org; Mon, 17 Sep 2018 08:23:09 +0000
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+ d=infradead.org; s=merlin.20170209; h=References:In-Reply-To:Message-Id:Date:
+ Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type:
+ Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
+ Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
+ List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
+ bh=ibdA85hf8c1CV6AjnoansL0OLKCQv7xqz6Dd4T0WwYE=; b=kq+r4aiTxCfQb9ANr0fYzAHvh
+ lwPy2MDuD58jFZXIeBlNCsd16UJwPv79X/C3PeK3VurkqtA220rndJ9rlFyuIpW9bLx3VbvMEV66i
+ 5rlJCpBanJtL6W4bcOStoNBRts5IAjzWQJTP9xh8kRTZDj94HG4Ud3Y0F4wp5tuZQin9aAmRGN8Ri
+ nmxwqj4K2AedWncDcfJnbYUO+pj83RlLIV83Vc/wjwafr/HmLSJKxO2tbFMlyK8w+GzokVKDQX8Yl
+ VgzPvvpGFN/PEjHxbxhUwTUXoN9OX3veCrdZfeuLeb936VjAEY2dO4qe4n7V+8suIGWPYczcUYmuC
+ QroUCrfeA==;
+Received: from mx08-00252a01.pphosted.com ([91.207.212.211])
+ by merlin.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1ooA-0001aR-1H
+ for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2018 08:23:06 +0000
+Received: from pps.filterd (m0102629.ppops.net [127.0.0.1])
+ by mx08-00252a01.pphosted.com (8.16.0.23/8.16.0.23) with SMTP id
+ w8H8MTQR002592
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:44 +0100
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org;
+ h=from : to :
+ subject : date : message-id : in-reply-to : references; s=pp;
+ bh=ibdA85hf8c1CV6AjnoansL0OLKCQv7xqz6Dd4T0WwYE=;
+ b=GtNw2X7QyIdzLVw/dWm9pE7hxGpCS4f3A39/M126HfBvf3b/h8TyqiZ5r1xXNu1o9Wd3
+ a2PR3ZAYL9vJWqRw6GR+hqIrLbBPmuIUnKjv8ZSuL5nSma4EaGZ4SA/pkRVoZxtzYHra
+ rerPDiIpuY/ZJzkrl5gRela6dKKMafJ9WjDHfRBe3MvraBmSmcjNbl1pwZrD9SxlL/QW
+ kekUM8ISQzaZK1yS9nEOJT4jgoDgQjg67qTdqfASV0IxT+hhlwHX/oj97E2XJuVGMchY
+ B2tw7aEpcV+/B3prEEpXPg8I4gulq4au2IOL1G+ZjuMFtB3mnxuhJZTvOTlVOORC1tbY Nw==
+Received: from mail-wr1-f71.google.com (mail-wr1-f71.google.com
+ [209.85.221.71])
+ by mx08-00252a01.pphosted.com with ESMTP id 2mgxu78uf3-1
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK)
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:44 +0100
+Received: by mail-wr1-f71.google.com with SMTP id u12-v6so22608270wrc.1
+ for <linux-arm-kernel@lists.infradead.org>;
+ Mon, 17 Sep 2018 01:22:44 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=raspberrypi.org; s=google;
+ h=from:to:subject:date:message-id:in-reply-to:references;
+ bh=ibdA85hf8c1CV6AjnoansL0OLKCQv7xqz6Dd4T0WwYE=;
+ b=Ewr6H6F8danbpfF2j56EFM3zyem/V1DjZTwpShb9UOMB0mer0DV08yzmFnZxhT+OOS
+ iqoecQdIpCRdwPKRDBo1CPy9uJQSgSactKa+YAxnGQ3bAn8TvBe1SxqnObHXRrr9Wdex
+ vzH2VGHbyGIW4tRzrTTiy4+lWlzyzezOWUWOdGfvLyt+3olku3ExUQ1UtyJQFXgOIE1R
+ gXVZBPyr7+K/To7iaDyFtqE0HKSZ1zXT2JB5RwTSe7gbppZL/cMQbodQuEeCtTJN2Mk3
+ zfn2WL7jhFw2HMZBcR9hYfm37jh9HUSDndHoMuuAtumDBy6dr9jC/ixxOwJOJIpCgaN+
+ QVgA==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
+ :references;
+ bh=ibdA85hf8c1CV6AjnoansL0OLKCQv7xqz6Dd4T0WwYE=;
+ b=hylNUUSKnRzE949ctU309ZwJfktn+WfvEgLQRIDt5xeqAZoZdx14jr9qf4/8FwGgK1
+ KNXH04/CM9pCLsnsLTBwXsZUKGObYp+zPhwGqPG2Sn4w6GRZLnZfSxqJFtToDvnicem+
+ +WjrwVDTrfO2GxBk7Wd5YepQQner7x41sdIXZwztEYG9PiRaBQu6XTUq/RqreaF4Ep3E
+ n7LHVlGVhd8ddG/cRHR5UmyZS/QMzp39y7R8HoA8pT69lIysf8wjq3n4j+ZILtxBhbz0
+ WC5ke8PdnUvBNBkrS0WiqyW+YFkzjGy9rgJsW1/fW8S5YE98OwM9R1e/8skJk7yeXuj4
+ +XzQ==
+X-Gm-Message-State: APzg51CndvGPCiDwRG1VW95iu6AVszC736A5IE7L/fnOGMl2pWRj7/Fm
+ 1a3HQ+l8htKBn3H5iyJlVsCKEev/tJDKXQKvW0QAq7QzJOvGY65OOWI9FtwM61BlqiwUbZVyRo7
+ 8qx9VkB7JEDmE/hFbCckOPQoLp3jICDMdKbU=
+X-Received: by 2002:adf:d110:: with SMTP id
+ a16-v6mr18039010wri.17.1537172563663;
+ Mon, 17 Sep 2018 01:22:43 -0700 (PDT)
+X-Google-Smtp-Source: 
+ ANB0VdZFtXkQhEgNJzup0M4370Voxs3V0q2pn+S3MhlOPzoOK4M7r4b5z74IaruMtYvv09TFVUAizg==
+X-Received: by 2002:adf:d110:: with SMTP id
+ a16-v6mr18038988wri.17.1537172563384;
+ Mon, 17 Sep 2018 01:22:43 -0700 (PDT)
+Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:14e2:e2a0:5538:c448])
+ by smtp.gmail.com with ESMTPSA id
+ 198-v6sm7938315wmm.0.2018.09.17.01.22.42
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+ Mon, 17 Sep 2018 01:22:42 -0700 (PDT)
+From: Phil Elwell <phil@raspberrypi.org>
+To: Rob Herring <robh+dt@kernel.org>, Stefan Wahren <stefan.wahren@i2se.com>,
+ Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
+ Phil Elwell <phil@raspberrypi.org>, devicetree@vger.kernel.org,
+ linux-rpi-kernel@lists.infradead.org,
+ Russell King <linux@armlinux.org.uk>, Arnd Bergmann <arnd@arndb.de>,
+ linux-arm-kernel@lists.infradead.org,
+ bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org
+Subject: [PATCH v3 3/4] ARM: dts: bcm283x: Correct vchiq compatible string
+Date: Mon, 17 Sep 2018 09:22:23 +0100
+Message-Id: <1537172544-104852-4-git-send-email-phil@raspberrypi.org>
+X-Mailer: git-send-email 2.7.4
+In-Reply-To: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+References: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, ,
+ definitions=2018-09-17_04:, , signatures=0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20180917_042302_770260_E7C4CFD2 
+X-CRM114-Status: GOOD (  22.09  )
+X-BeenThere: linux-arm-kernel@lists.infradead.org
+X-Mailman-Version: 2.1.21
+Precedence: list
+List-Id: <linux-arm-kernel.lists.infradead.org>
+List-Unsubscribe: 
+ <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
+List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
+List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
+List-Subscribe: 
+ <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
+Errors-To: 
+ linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
+X-Virus-Scanned: ClamAV using ClamSMTP
+
+To allow VCHIQ to determine the correct cache line size, use the new
+"brcm,bcm2836-vchiq" compatible string on BCM2836 and BCM2837.
+
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+---
+ arch/arm/boot/dts/bcm2835-rpi.dtsi         | 2 +-
+ arch/arm/boot/dts/bcm2836-rpi-2-b.dts      | 2 +-
+ arch/arm/boot/dts/bcm2836-rpi.dtsi         | 6 ++++++
+ arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts | 2 +-
+ arch/arm/boot/dts/bcm2837-rpi-3-b.dts      | 2 +-
+ arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi     | 2 +-
+ 6 files changed, 11 insertions(+), 5 deletions(-)
+ create mode 100644 arch/arm/boot/dts/bcm2836-rpi.dtsi
+
+diff --git a/arch/arm/boot/dts/bcm2835-rpi.dtsi b/arch/arm/boot/dts/bcm2835-rpi.dtsi
+index cb2d6d7..215d8cc 100644
+--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
+@@ -30,7 +30,7 @@
+ 			#power-domain-cells = <1>;
+ 		};
+ 
+-		mailbox@7e00b840 {
++		vchiq: mailbox@7e00b840 {
+ 			compatible = "brcm,bcm2835-vchiq";
+ 			reg = <0x7e00b840 0xf>;
+ 			interrupts = <0 2>;
+diff --git a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+index 2fef70a..ac4408b 100644
+--- a/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
++++ b/arch/arm/boot/dts/bcm2836-rpi-2-b.dts
+@@ -1,7 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2836.dtsi"
+-#include "bcm2835-rpi.dtsi"
++#include "bcm2836-rpi.dtsi"
+ #include "bcm283x-rpi-smsc9514.dtsi"
+ #include "bcm283x-rpi-usb-host.dtsi"
+ 
+diff --git a/arch/arm/boot/dts/bcm2836-rpi.dtsi b/arch/arm/boot/dts/bcm2836-rpi.dtsi
+new file mode 100644
+index 0000000..c4c858b
+--- /dev/null
++++ b/arch/arm/boot/dts/bcm2836-rpi.dtsi
+@@ -0,0 +1,6 @@
++// SPDX-License-Identifier: GPL-2.0
++#include "bcm2835-rpi.dtsi"
++
++&vchiq {
++	compatible = "brcm,bcm2836-vchiq", "brcm,bcm2835-vchiq";
++};
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+index 4adb85e..eca36e3 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b-plus.dts
+@@ -1,7 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2837.dtsi"
+-#include "bcm2835-rpi.dtsi"
++#include "bcm2836-rpi.dtsi"
+ #include "bcm283x-rpi-lan7515.dtsi"
+ #include "bcm283x-rpi-usb-host.dtsi"
+ 
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+index c318bcb..a0ba0f6 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
++++ b/arch/arm/boot/dts/bcm2837-rpi-3-b.dts
+@@ -1,7 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2837.dtsi"
+-#include "bcm2835-rpi.dtsi"
++#include "bcm2836-rpi.dtsi"
+ #include "bcm283x-rpi-smsc9514.dtsi"
+ #include "bcm283x-rpi-usb-host.dtsi"
+ 
+diff --git a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+index 7b7ab6a..4a89a18 100644
+--- a/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
++++ b/arch/arm/boot/dts/bcm2837-rpi-cm3.dtsi
+@@ -1,7 +1,7 @@
+ // SPDX-License-Identifier: GPL-2.0
+ /dts-v1/;
+ #include "bcm2837.dtsi"
+-#include "bcm2835-rpi.dtsi"
++#include "bcm2836-rpi.dtsi"
+ 
+ / {
+ 	memory {
+
+From patchwork Mon Sep 17 08:22:24 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Phil Elwell <phil@raspberrypi.org>
+X-Patchwork-Id: 10602203
+Return-Path: 
+ <linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org>
+Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org
+ [172.30.200.125])
+	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8BB93161F
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:42:23 +0000 (UTC)
+Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7A55A29656
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:42:23 +0000 (UTC)
+Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
+	id 6DE622965F; Mon, 17 Sep 2018 08:42:23 +0000 (UTC)
+X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
+	pdx-wl-mail.web.codeaurora.org
+X-Spam-Level: 
+X-Spam-Status: No, score=-2.9 required=2.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+	(using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits))
+	(No client certificate requested)
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 5FB1B2965B
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 17 Sep 2018 08:42:22 +0000 (UTC)
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+	d=lists.infradead.org; s=bombadil.20170209; h=Sender:
+	Content-Transfer-Encoding:Content-Type:MIME-Version:List-Subscribe:List-Help:
+	List-Post:List-Archive:List-Unsubscribe:List-Id:References:In-Reply-To:
+	Message-Id:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description:
+	Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:
+	List-Owner; bh=GuNa2jLaGytz4ltfeP+rSU0xZrseSNcWWmSj86ZTl7w=; b=i1naZIjCR6DgCG
+	1T5cmZMM6Dkok0WN1avKEjHIKv18FXg4nMVuJeEEzdq5Dx4du3mbMHBWS9oC+QHZy9bTpHQRgiS0G
+	Q6fvfZ7PYJUVWOzEgbkdyOL0OMiOVsYTJsMXoeii0MFMvmzFpelJ2KgEqJ/Ly+PRHPmHQ3WP9s7N5
+	xE4orUgiIcIHSbMkCm42twuXZMgaMgQktA+jlnAaslK7PJtzMC1PHx2uCTbZdIVNTJFqkwgjqxmSW
+	RH4f8jSTGWYwOlv5CgspS2YU753VETDvD0LTGDSrn737lsC94uI99f6ciaMZaUcS4SuRzuvjSvKPA
+	pZ2TrSAmQre1Rp/jVeOw==;
+Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.90_1 #2 (Red Hat Linux))
+	id 1g1p6f-00060f-0R; Mon, 17 Sep 2018 08:42:09 +0000
+Received: from casper.infradead.org ([2001:8b0:10b:1236::1])
+ by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1p6b-0005u0-RH
+ for linux-arm-kernel@bombadil.infradead.org; Mon, 17 Sep 2018 08:42:05 +0000
+DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
+ d=infradead.org; s=casper.20170209; h=References:In-Reply-To:Message-Id:Date:
+ Subject:To:From:Sender:Reply-To:Cc:MIME-Version:Content-Type:
+ Content-Transfer-Encoding:Content-ID:Content-Description:Resent-Date:
+ Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id:
+ List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive;
+ bh=QMjgiTHZdBCZgWe6tYJjcntUGfqPQLNuRPhn6Dczv+g=; b=UJ3cMzmNQRhXaXlxWFwla6An2
+ CWzMn1wzzr/CyRZ2G8YLZdvUEGpVRlTqAtk/xGbT7xO80oWONflxUNqlNTxj4v3QZkEMtsr5eg0bD
+ bnEnzF3OS0dexb5Aro0bZajhgrMlaIaa5FBVndBgK1KeW4vEiE4D10APgXJMZ4gzO5PvO3pba7J0g
+ XNDk7JzB7D/dSQXmKkb+EuUwalT2v/YJzFtIc+T3vR4/wvxhXFZmJL2dmzQMduHoVJtsIFvC1HfzF
+ 5GnY5y85CTU2Fx2s4JNOHe2vAGXI9lnUPf2szvyFhGQIVH7QC9y4zOsbG0iP36VEcuhbGnA3I5K7S
+ 8Kc2knjrQ==;
+Received: from mx07-00252a01.pphosted.com ([62.209.51.214])
+ by casper.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux))
+ id 1g1oo4-0004nO-7f
+ for linux-arm-kernel@lists.infradead.org; Mon, 17 Sep 2018 08:22:58 +0000
+Received: from pps.filterd (m0102628.ppops.net [127.0.0.1])
+ by mx07-00252a01.pphosted.com (8.16.0.23/8.16.0.23) with SMTP id
+ w8H8MUCZ024134
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:45 +0100
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=raspberrypi.org;
+ h=from : to :
+ subject : date : message-id : in-reply-to : references; s=pp;
+ bh=QMjgiTHZdBCZgWe6tYJjcntUGfqPQLNuRPhn6Dczv+g=;
+ b=kZDNcIT02Qz8gHVo/pKHHsMKpNIeLNzW7d/g6n+A4XN0KAnqNvf2mO96pMHKNygRT76b
+ cq81PbSI1ssh2L6Bd86zcSWNDq3UuoZl93qtK6YY8fqevti7XVKKtwh4qQ561BL8oE6W
+ gorwuXGsxEpeer6/+1/r0Ookzhz4EiQkGcd/l3IP+T4XkHJgX6tZ/GTSRbDXzuxZ7WxL
+ 7Kh+zMjHW5FAV2xmyYnFEVvI5DFnD34QM4lLrw/v6fLDp1ZvcLH2psBo8wv9fd01ZnMp
+ 3gVnEu8QX+NWIq+9qJ6o8MajSNhGWU4WmTD2fiqfmxFBnCTWp5Y2ZfphwVsflhlnThtE Jw==
+Received: from mail-wr1-f70.google.com (mail-wr1-f70.google.com
+ [209.85.221.70])
+ by mx07-00252a01.pphosted.com with ESMTP id 2mgw8f0vac-1
+ (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128 verify=OK)
+ for <linux-arm-kernel@lists.infradead.org>; Mon, 17 Sep 2018 09:22:45 +0100
+Received: by mail-wr1-f70.google.com with SMTP id j22-v6so22020561wre.7
+ for <linux-arm-kernel@lists.infradead.org>;
+ Mon, 17 Sep 2018 01:22:45 -0700 (PDT)
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=raspberrypi.org; s=google;
+ h=from:to:subject:date:message-id:in-reply-to:references;
+ bh=QMjgiTHZdBCZgWe6tYJjcntUGfqPQLNuRPhn6Dczv+g=;
+ b=elxMUa+c3RtqQfnv+0aAH+u3stbGHUflCzNxSDLQUfmD/iHnq9vSqSRX+7+TLNBhXc
+ iPDm6AigQoDgevY1qgR0cUf1kufwlFKka3QyyWdEH/eEZHs6b3W+U9NtjyUReMMOZh3Q
+ gFrMrgzwIryQOKgcBg41hFqqv6lUEqVuTx3oC0n7U66JoJ1TRjY8muSPp8KWfB+Tsbtv
+ XVDBeKa5HGzRKlxSI3/RSvmivz+7aUQW6wNy0+gZd3+COdPiyiRhbtT2Xwx98JZY12HT
+ WlWqHTLkcG6jAKJP2dnqgvYGZ/eennHF34Tn37xHLjy4cahYo/ngTwQgPprJIaoIPcL+
+ X/Dg==
+X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
+ d=1e100.net; s=20161025;
+ h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to
+ :references;
+ bh=QMjgiTHZdBCZgWe6tYJjcntUGfqPQLNuRPhn6Dczv+g=;
+ b=fVU6VgVpx/HstvLa9bPQVfHGZqO1SgQW8pSfbPxol5HYqweh3jT/ykuYXG8BAGW6Ig
+ Mdhu3RzBV4wPReCMEgte6BWd94TWyWKxGq6l6xrOi3LXbUMPtIqox3kv3PfLLVxk3SMv
+ sHWyp/kAkue+K5Ye6FnfgpJzJmCaJAvJ1UQpLPzF+5KG7GFYmuwAe65l68b8xBldLvz+
+ CvnQ71gdsZIZ7CUzPRBN9OZhlZJWZXMPb3LdD6Q482+/PVWLFANU1O5l2/h50Y/dV+a1
+ YalREMpfnz+tsZcpGEfzdxCpboHeDv/G6q+VotAhcrihrAMNK9BJZ16gTRMcwcYgPQWw
+ qRSg==
+X-Gm-Message-State: APzg51DXrb2imPBCoJ+q/BYRCyqhMqStk08VprXg9IQ1KTzmptp77XVd
+ R/mMPJ35LsOos7CoFmh/yWMJEB3GLYTLSiMzQFz8+7GxMs7H9M8ocW2aOTth0aTDS70XXH/nioS
+ kW34F6tKDeWUp44rQD8ZgUpyJVb2hPfBbovQ=
+X-Received: by 2002:adf:d20a:: with SMTP id
+ g10-v6mr18280267wri.66.1537172564529;
+ Mon, 17 Sep 2018 01:22:44 -0700 (PDT)
+X-Google-Smtp-Source: 
+ ANB0VdY6Rp3hgeCMs9pw3a4a2+uvxxamVoyGcr3pIn6rx5kgmM+Aufcx5tRocSXQJqw45FaPg01X8g==
+X-Received: by 2002:adf:d20a:: with SMTP id
+ g10-v6mr18280254wri.66.1537172564348;
+ Mon, 17 Sep 2018 01:22:44 -0700 (PDT)
+Received: from buildbot.pitowers.org ([2a00:2381:fdf7:14:14e2:e2a0:5538:c448])
+ by smtp.gmail.com with ESMTPSA id
+ 198-v6sm7938315wmm.0.2018.09.17.01.22.43
+ (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128);
+ Mon, 17 Sep 2018 01:22:43 -0700 (PDT)
+From: Phil Elwell <phil@raspberrypi.org>
+To: Rob Herring <robh+dt@kernel.org>, Stefan Wahren <stefan.wahren@i2se.com>,
+ Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
+ Phil Elwell <phil@raspberrypi.org>, devicetree@vger.kernel.org,
+ linux-rpi-kernel@lists.infradead.org,
+ Russell King <linux@armlinux.org.uk>, Arnd Bergmann <arnd@arndb.de>,
+ linux-arm-kernel@lists.infradead.org,
+ bcm-kernel-feedback-list@broadcom.com, devel@driverdev.osuosl.org
+Subject: [PATCH v3 4/4] ARM: dts: bcm283x: Correct mailbox register sizes
+Date: Mon, 17 Sep 2018 09:22:24 +0100
+Message-Id: <1537172544-104852-5-git-send-email-phil@raspberrypi.org>
+X-Mailer: git-send-email 2.7.4
+In-Reply-To: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+References: <1537172544-104852-1-git-send-email-phil@raspberrypi.org>
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, ,
+ definitions=2018-09-17_04:, , signatures=0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20180917_092256_305871_71340799 
+X-CRM114-Status: GOOD (  19.05  )
+X-BeenThere: linux-arm-kernel@lists.infradead.org
+X-Mailman-Version: 2.1.21
+Precedence: list
+List-Id: <linux-arm-kernel.lists.infradead.org>
+List-Unsubscribe: 
+ <http://lists.infradead.org/mailman/options/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=unsubscribe>
+List-Archive: <http://lists.infradead.org/pipermail/linux-arm-kernel/>
+List-Post: <mailto:linux-arm-kernel@lists.infradead.org>
+List-Help: <mailto:linux-arm-kernel-request@lists.infradead.org?subject=help>
+List-Subscribe: 
+ <http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
+ <mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
+MIME-Version: 1.0
+Content-Type: text/plain; charset="us-ascii"
+Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
+Errors-To: 
+ linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
+X-Virus-Scanned: ClamAV using ClamSMTP
+
+The size field in a Device Tree "reg" property is encoded in bytes, not
+words.
+
+Fixes: 614fa22119d6 ("ARM: dts: bcm2835: Add VCHIQ node to the Raspberry Pi boards. (v3)")
+Signed-off-by: Phil Elwell <phil@raspberrypi.org>
+Acked-by: Stefan Wahren <stefan.wahren@i2se.com>
+---
+ 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 215d8cc..29f970f 100644
+--- a/arch/arm/boot/dts/bcm2835-rpi.dtsi
++++ b/arch/arm/boot/dts/bcm2835-rpi.dtsi
+@@ -32,7 +32,7 @@
+ 
+ 		vchiq: mailbox@7e00b840 {
+ 			compatible = "brcm,bcm2835-vchiq";
+-			reg = <0x7e00b840 0xf>;
++			reg = <0x7e00b840 0x3c>;
+ 			interrupts = <0 2>;
+ 		};
+ 	};
diff --git a/bcm2837-dts-add-Raspberry-Pi-3-A.patch b/bcm2837-dts-add-Raspberry-Pi-3-A.patch
index 38eb40b8c..705fca6cb 100644
--- a/bcm2837-dts-add-Raspberry-Pi-3-A.patch
+++ b/bcm2837-dts-add-Raspberry-Pi-3-A.patch
@@ -267,7 +267,7 @@ index 0000000..b2df7cf
 +// SPDX-License-Identifier: GPL-2.0
 +/dts-v1/;
 +#include "bcm2837.dtsi"
-+#include "bcm2835-rpi.dtsi"
++#include "bcm2836-rpi.dtsi"
 +#include "bcm283x-rpi-usb-host.dtsi"
 +
 +/ {
diff --git a/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH b/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH
new file mode 100644
index 000000000..f0e84d22f
--- /dev/null
+++ b/configs/fedora/generic/CONFIG_USB_ROLE_SWITCH
@@ -0,0 +1 @@
+CONFIG_USB_ROLE_SWITCH=m
diff --git a/efi-lockdown.patch b/efi-lockdown.patch
index 4f84f4715..2fbc40e63 100644
--- a/efi-lockdown.patch
+++ b/efi-lockdown.patch
@@ -1721,3 +1721,149 @@ index 13b01351dd1c..4daec17b8215 100644
 -- 
 2.14.3
 
+From patchwork Wed Nov 21 12:05:10 2018
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Vasily Gorbik <gor@linux.ibm.com>
+X-Patchwork-Id: 1015495
+Return-Path: <SRS0=ejdu=OA=vger.kernel.org=linux-kernel-owner@kernel.org>
+Received: from mail.kernel.org (mail.kernel.org [198.145.29.99])
+	by smtp.lore.kernel.org (Postfix) with ESMTP id AF80FC04EBA
+	for <linux-kernel@archiver.kernel.org>; Wed, 21 Nov 2018 12:05:25 +0000 (UTC)
+Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
+	by mail.kernel.org (Postfix) with ESMTP id 80EA921479
+	for <linux-kernel@archiver.kernel.org>; Wed, 21 Nov 2018 12:05:25 +0000 (UTC)
+DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 80EA921479
+Authentication-Results: mail.kernel.org;
+ dmarc=fail (p=none dis=none) header.from=linux.ibm.com
+Authentication-Results: mail.kernel.org;
+ spf=none smtp.mailfrom=linux-kernel-owner@vger.kernel.org
+Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
+        id S1730155AbeKUWjb (ORCPT
+        <rfc822;linux-kernel@archiver.kernel.org>);
+        Wed, 21 Nov 2018 17:39:31 -0500
+Received: from mx0b-001b2d01.pphosted.com ([148.163.158.5]:33574 "EHLO
+        mx0a-001b2d01.pphosted.com" rhost-flags-OK-OK-OK-FAIL)
+        by vger.kernel.org with ESMTP id S1729128AbeKUWjb (ORCPT
+        <rfc822;linux-kernel@vger.kernel.org>);
+        Wed, 21 Nov 2018 17:39:31 -0500
+Received: from pps.filterd (m0098420.ppops.net [127.0.0.1])
+        by mx0b-001b2d01.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id
+ wALBx6kw056071
+        for <linux-kernel@vger.kernel.org>; Wed, 21 Nov 2018 07:05:22 -0500
+Received: from e06smtp02.uk.ibm.com (e06smtp02.uk.ibm.com [195.75.94.98])
+        by mx0b-001b2d01.pphosted.com with ESMTP id 2nw5p847fp-1
+        (version=TLSv1.2 cipher=AES256-GCM-SHA384 bits=256 verify=NOT)
+        for <linux-kernel@vger.kernel.org>; Wed, 21 Nov 2018 07:05:22 -0500
+Received: from localhost
+        by e06smtp02.uk.ibm.com with IBM ESMTP SMTP Gateway: Authorized Use
+ Only! Violators will be prosecuted
+        for <linux-kernel@vger.kernel.org> from <gor@linux.ibm.com>;
+        Wed, 21 Nov 2018 12:05:20 -0000
+Received: from b06cxnps4075.portsmouth.uk.ibm.com (9.149.109.197)
+        by e06smtp02.uk.ibm.com (192.168.101.132) with IBM ESMTP SMTP Gateway:
+ Authorized Use Only! Violators will be prosecuted;
+        (version=TLSv1/SSLv3 cipher=AES256-GCM-SHA384 bits=256/256)
+        Wed, 21 Nov 2018 12:05:17 -0000
+Received: from b06wcsmtp001.portsmouth.uk.ibm.com
+ (b06wcsmtp001.portsmouth.uk.ibm.com [9.149.105.160])
+        by b06cxnps4075.portsmouth.uk.ibm.com (8.14.9/8.14.9/NCO v10.0) with
+ ESMTP id wALC5GXF60817580
+        (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256
+ verify=FAIL);
+        Wed, 21 Nov 2018 12:05:16 GMT
+Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1])
+        by IMSVA (Postfix) with ESMTP id 4EB1CA4060;
+        Wed, 21 Nov 2018 12:05:16 +0000 (GMT)
+Received: from b06wcsmtp001.portsmouth.uk.ibm.com (unknown [127.0.0.1])
+        by IMSVA (Postfix) with ESMTP id 0C844A405F;
+        Wed, 21 Nov 2018 12:05:16 +0000 (GMT)
+Received: from localhost (unknown [9.152.212.229])
+        by b06wcsmtp001.portsmouth.uk.ibm.com (Postfix) with ESMTPS;
+        Wed, 21 Nov 2018 12:05:15 +0000 (GMT)
+Date: Wed, 21 Nov 2018 13:05:10 +0100
+From: Vasily Gorbik <gor@linux.ibm.com>
+To: David Howells <dhowells@redhat.com>,
+        James Morris <jmorris@namei.org>
+Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>,
+        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
+        linux-kernel@vger.kernel.org, linux-security-module@vger.kernel.org
+Subject: [PATCH next-lockdown 1/1] debugfs: avoid EPERM when no open file
+ operation defined
+References: <4136.1522452584@warthog.procyon.org.uk>
+ <cover.thread-bfac1b.your-ad-here.call-01542799656-ext-6093@work.hours>
+MIME-Version: 1.0
+Content-Type: text/plain; charset=utf-8
+Content-Disposition: inline
+In-Reply-To: 
+ <cover.thread-bfac1b.your-ad-here.call-01542799656-ext-6093@work.hours>
+X-TM-AS-GCONF: 00
+x-cbid: 18112112-0008-0000-0000-000002963F3F
+X-IBM-AV-DETECTION: SAVI=unused REMOTE=unused XFE=unused
+x-cbparentid: 18112112-0009-0000-0000-000022006F52
+Message-Id: 
+ <patch-1.thread-bfac1b.git-bfac1b60354c.your-ad-here.call-01542799656-ext-6093@work.hours>
+X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:,,
+ definitions=2018-11-21_05:,,
+ signatures=0
+X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0
+ priorityscore=1501
+ malwarescore=0 suspectscore=1 phishscore=0 bulkscore=0 spamscore=0
+ clxscore=1015 lowpriorityscore=0 mlxscore=0 impostorscore=0
+ mlxlogscore=999 adultscore=0 classifier=spam adjust=0 reason=mlx
+ scancount=1 engine=8.0.1-1810050000 definitions=main-1811210107
+Sender: linux-kernel-owner@vger.kernel.org
+Precedence: bulk
+List-ID: <linux-kernel.vger.kernel.org>
+X-Mailing-List: linux-kernel@vger.kernel.org
+
+With "debugfs: Restrict debugfs when the kernel is locked down"
+return code "r" is unconditionally set to -EPERM, which stays like that
+until function return if no "open" file operation defined, effectivelly
+resulting in "Operation not permitted" for all such files despite kernel
+lock down status or CONFIG_LOCK_DOWN_KERNEL being enabled.
+
+In particular this breaks 2 debugfs files on s390:
+/sys/kernel/debug/s390_hypfs/diag_304
+/sys/kernel/debug/s390_hypfs/diag_204
+
+To address that set EPERM return code only when debugfs_is_locked_down
+returns true.
+
+Fixes: 3fc322605158 ("debugfs: Restrict debugfs when the kernel is locked down")
+Signed-off-by: Vasily Gorbik <gor@linux.ibm.com>
+---
+ fs/debugfs/file.c | 10 ++++++----
+ 1 file changed, 6 insertions(+), 4 deletions(-)
+
+diff --git a/fs/debugfs/file.c b/fs/debugfs/file.c
+index 51cb894c21f2..89c86faaa02a 100644
+--- a/fs/debugfs/file.c
++++ b/fs/debugfs/file.c
+@@ -167,9 +167,10 @@ static int open_proxy_open(struct inode *inode, struct file *filp)
+ 
+ 	real_fops = debugfs_real_fops(filp);
+ 
+-	r = -EPERM;
+-	if (debugfs_is_locked_down(inode, filp, real_fops))
++	if (debugfs_is_locked_down(inode, filp, real_fops)) {
++		r = -EPERM;
+ 		goto out;
++	}
+ 
+ 	real_fops = fops_get(real_fops);
+ 	if (!real_fops) {
+@@ -296,9 +297,10 @@ static int full_proxy_open(struct inode *inode, struct file *filp)
+ 		return r == -EIO ? -ENOENT : r;
+ 
+ 	real_fops = debugfs_real_fops(filp);
+-	r = -EPERM;
+-	if (debugfs_is_locked_down(inode, filp, real_fops))
++	if (debugfs_is_locked_down(inode, filp, real_fops)) {
++		r = -EPERM;
+ 		goto out;
++	}
+ 
+ 	real_fops = fops_get(real_fops);
+ 	if (!real_fops) {
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index 588f083b4..890023950 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -1311,7 +1311,7 @@ CONFIG_DM9102=m
 CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 CONFIG_DMA_CMA=y
-# CONFIG_DMADEVICES_DEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -5722,6 +5722,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6131,7 +6132,7 @@ CONFIG_THUNDER_NIC_VF=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6149,8 +6150,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -6596,6 +6597,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index c01b783d5..b7cd8d3ff 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -5699,6 +5699,7 @@ CONFIG_SND_SOC_ROCKCHIP_RT5645=m
 CONFIG_SND_SOC_ROCKCHIP_SPDIF=m
 # CONFIG_SND_SOC_RT5616 is not set
 # CONFIG_SND_SOC_RT5631 is not set
+CONFIG_SND_SOC_RT5663=m
 CONFIG_SND_SOC_SDM845=m
 CONFIG_SND_SOC_SGTL5000=m
 CONFIG_SND_SOC_SIMPLE_AMPLIFIER=m
@@ -6108,7 +6109,7 @@ CONFIG_THUNDER_NIC_VF=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6126,8 +6127,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -6573,6 +6574,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 44f51077d..cf49df530 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -1355,7 +1355,7 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
-# CONFIG_DMADEVICES_DEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -6522,7 +6522,7 @@ CONFIG_TI_ADC081C=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6552,8 +6552,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -7032,6 +7032,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index e4fbb7c01..92638576b 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -1299,7 +1299,7 @@ CONFIG_DMA_API_DEBUG=y
 CONFIG_DMA_BCM2835=m
 # CONFIG_DMA_CACHE_RWFO is not set
 CONFIG_DMA_CMA=y
-# CONFIG_DMADEVICES_DEBUG is not set
+CONFIG_DMADEVICES_DEBUG=y
 # CONFIG_DMADEVICES_VDEBUG is not set
 CONFIG_DMADEVICES=y
 CONFIG_DMA_ENGINE=y
@@ -6129,7 +6129,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6151,8 +6151,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -6605,6 +6605,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 8c2e07209..898685d32 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -6107,7 +6107,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6129,8 +6129,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -6583,6 +6583,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index fab4c54fc..be307c23f 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -6500,7 +6500,7 @@ CONFIG_TI_ADC081C=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6530,8 +6530,8 @@ CONFIG_TINYDRM_ILI9225=m
 CONFIG_TINYDRM_ILI9341=m
 CONFIG_TINYDRM_MI0283QT=m
 CONFIG_TINYDRM_MIPI_DBI=m
-# CONFIG_TINYDRM_REPAPER is not set
-# CONFIG_TINYDRM_ST7586 is not set
+CONFIG_TINYDRM_REPAPER=m
+CONFIG_TINYDRM_ST7586=m
 CONFIG_TINYDRM_ST7735R=m
 CONFIG_TIPC_DIAG=m
 CONFIG_TIPC=m
@@ -7010,6 +7010,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index 2f693d370..1a5ac441b 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3375,7 +3375,6 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5722,7 +5721,7 @@ CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6127,6 +6126,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 8a0f0bb0d..848216a95 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3355,7 +3355,6 @@ CONFIG_MTD_OF_PARTS=m
 # CONFIG_MTD_OOPS is not set
 # CONFIG_MTD_PARTITIONED_MASTER is not set
 # CONFIG_MTD_PHRAM is not set
-CONFIG_MTD_PHYSMAP_OF=m
 # CONFIG_MTD_PLATRAM is not set
 # CONFIG_MTD_PMC551 is not set
 # CONFIG_MTD_RAM is not set
@@ -5700,7 +5699,7 @@ CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6105,6 +6104,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 72a8ec4bb..f7592cf3d 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -5399,7 +5399,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -5805,6 +5805,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index edde73588..869f5b345 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -5375,7 +5375,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -5781,6 +5781,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 340b04383..0c057562f 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -5289,7 +5289,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -5693,6 +5693,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index be6f88d5b..1e6becce9 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -5265,7 +5265,7 @@ CONFIG_THRUSTMASTER_FF=y
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -5669,6 +5669,7 @@ CONFIG_USB_PWC=m
 CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 0e095cc62..346502597 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -5767,7 +5767,7 @@ CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6173,6 +6173,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 900a80275..3e4002f73 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -5745,7 +5745,7 @@ CONFIG_THUNDERBOLT_NET=m
 # CONFIG_TI_ADC084S021 is not set
 # CONFIG_TI_ADC108S102 is not set
 # CONFIG_TI_ADC12138 is not set
-# CONFIG_TI_ADC128S052 is not set
+CONFIG_TI_ADC128S052=m
 # CONFIG_TI_ADC161S626 is not set
 CONFIG_TI_ADS1015=m
 # CONFIG_TI_ADS7950 is not set
@@ -6151,6 +6151,7 @@ CONFIG_USB_RAINSHADOW_CEC=m
 # CONFIG_USB_RAREMONO is not set
 # CONFIG_USB_RIO500 is not set
 CONFIG_USB_ROLES_INTEL_XHCI=m
+CONFIG_USB_ROLE_SWITCH=m
 CONFIG_USB_RTL8150=m
 CONFIG_USB_RTL8152=m
 CONFIG_USB_S2255=m
diff --git a/kernel.spec b/kernel.spec
index 6c339d83e..bf3cc864f 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -594,14 +594,13 @@ Patch305: qcom-msm89xx-fixes.patch
 # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
 Patch306: arm-sdhci-esdhc-imx-fixes.patch
 
-Patch330: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
-
-Patch331: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
+Patch330: bcm283x-drm-vc4-set-is_yuv-to-false-when-num_planes-1.patch
 
 # https://patchwork.kernel.org/patch/10686407/
-Patch332: raspberrypi-Fix-firmware-calls-with-large-buffers.patch
+Patch331: raspberrypi-Fix-firmware-calls-with-large-buffers.patch
 
 # Improve raspberry pi camera and analog audio
+Patch332: bcm2836-Improve-VCHIQ-cache-line-size-handling.patch
 Patch333: bcm2835-vc04_services-Improve-driver-load-unload.patch
 
 # Initall support for the 3A+
@@ -613,6 +612,8 @@ Patch335: bcm2835-mmc-Several-fixes-for-bcm2835-driver.patch
 # https://patchwork.kernel.org/patch/10741809/
 Patch336: bcm2835-mmc-sdhci-iproc-handle-mmc_of_parse-errors-during-probe.patch
 
+Patch339: bcm2835-cpufreq-add-CPU-frequency-control-driver.patch
+
 # Patches enabling device specific brcm firmware nvram
 # https://www.spinics.net/lists/linux-wireless/msg178827.html
 Patch340: brcmfmac-Remove-firmware-loading-code-duplication.patch
@@ -1915,6 +1916,12 @@ fi
 #
 #
 %changelog
+* Wed Jan  9 2019 Peter Robinson <pbrobinson@fedoraproject.org>
+- Updates for Raspberry Pi
+
+* Wed Jan 09 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 4.20.1-200
+- Linux v4.20.1
+
 * Wed Jan 09 2019 Justin M. Forbes <jforbes@fedoraproject.org>
 - Fix CVE-2019-3701 (rhbz 1663729 1663730)