minor arm cleanups, update rpi cam patch, add fix for dwc3 on rockchips

22 files changed, 239 insertions, 91 deletions

diff --git a/arm64-dts-rockchip-Update-DWC3-modules-on-RK3399-SoCs.patch b/arm64-dts-rockchip-Update-DWC3-modules-on-RK3399-SoCs.patch
new file mode 100644
index 000000000..c5ce675d4
--- /dev/null
+++ b/arm64-dts-rockchip-Update-DWC3-modules-on-RK3399-SoCs.patch
@@ -0,0 +1,145 @@
+From patchwork Thu Jun 13 16:27:45 2019
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+X-Patchwork-Id: 10992783
+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 3C69976
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Thu, 13 Jun 2019 16:31:35 +0000 (UTC)
+Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2A407202A5
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Thu, 13 Jun 2019 16:31:35 +0000 (UTC)
+Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
+	id 1E11D205F8; Thu, 13 Jun 2019 16:31:35 +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=-5.2 required=2.0 tests=BAYES_00,DKIM_SIGNED,
+	DKIM_VALID,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,UNPARSEABLE_RELAY
+	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 E8E5E26253
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Thu, 13 Jun 2019 16:31:32 +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:Cc:List-Subscribe:List-Help:List-Post:
+	List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To
+	:From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:
+	Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:
+	List-Owner; bh=DvpejaNT4eBhDns4FxJHLSG+zmWCjPWj3DUJGU1HA+0=; b=U5HR+BVOuAC/E8
+	nFHo3NNnf/apQ+ctinRwRfb2KfTsAUb7ZUpIl54fuCw/9GaxhMVGPvViCELEYZSqU3In+Fo3+hP3s
+	kMyQxkFXCOuAawwfHbC5O/B5rW4mu3/wtmY6WU8/7j0+z295Xf6bcbL61ViJl004E6RRiw+o3AvsX
+	k5tb581Re61dLl+MWGJETzSUGZZl9OzPmwJiQ2MrQltCsHWXJM4Q+PjSa/figIf9yD8w3MUbDmtfX
+	Cj28FmfT2DfWi2kNlitMG7EqEvpPnc51G2u3JVUOnj1/C2UkRjWqMkbyLlzDAnqntyXFKePRDd2Uq
+	I2tA62mw1OY4IxFiP+Qw==;
+Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
+	by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
+	id 1hbSdK-00080h-F1; Thu, 13 Jun 2019 16:31:26 +0000
+Received: from bhuna.collabora.co.uk ([46.235.227.227])
+ by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
+ id 1hbSZw-00036Y-Gr; Thu, 13 Jun 2019 16:27:58 +0000
+Received: from [127.0.0.1] (localhost [127.0.0.1])
+ (Authenticated sender: eballetbo) with ESMTPSA id 2E34F27D7A1
+From: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+To: devicetree@vger.kernel.org
+Subject: [PATCH] arm64: dts: rockchip: Update DWC3 modules on RK3399 SoCs
+Date: Thu, 13 Jun 2019 18:27:45 +0200
+Message-Id: <20190613162745.12195-1-enric.balletbo@collabora.com>
+X-Mailer: git-send-email 2.20.1
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
+X-CRM114-CacheID: sfid-20190613_092756_843034_D5C41B2D 
+X-CRM114-Status: GOOD (  10.09  )
+X-BeenThere: linux-arm-kernel@lists.infradead.org
+X-Mailman-Version: 2.1.29
+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>
+Cc: Mark Rutland <mark.rutland@arm.com>, Heiko Stuebner <heiko@sntech.de>,
+ Felipe Balbi <felipe.balbi@linux.intel.com>,
+ linux-rockchip@lists.infradead.org, Tony Xie <tony.xie@rock-chips.com>,
+ Viresh Kumar <viresh.kumar@linaro.org>, Randy Li <ayaka@soulik.info>,
+ linux-kernel@vger.kernel.org, Vicente Bergas <vicencb@gmail.com>,
+ Masahiro Yamada <yamada.masahiro@socionext.com>,
+ Rob Herring <robh+dt@kernel.org>,
+ Klaus Goger <klaus.goger@theobroma-systems.com>,
+ Matthias Brugger <matthias.bgg@gmail.com>,
+ Collabora Kernel ML <kernel@collabora.com>,
+ linux-arm-kernel@lists.infradead.org,
+ Christoph Muellner <christoph.muellner@theobroma-systems.com>
+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
+
+As per binding documentation [1], the DWC3 core should have the "ref",
+"bus_early" and "suspend" clocks. As explained in the binding, those
+clocks are required for new platforms but not for existing platforms
+before commit fe8abf332b8f ("usb: dwc3: support clocks and resets for
+DWC3 core").
+
+However, as those clocks are really treated as required, this ends with
+having some annoying messages when the "rockchip,rk3399-dwc3" is used:
+
+[    1.724107] dwc3 fe800000.dwc3: Failed to get clk 'ref': -2
+[    1.731893] dwc3 fe900000.dwc3: Failed to get clk 'ref': -2
+[    2.495937] dwc3 fe800000.dwc3: Failed to get clk 'ref': -2
+[    2.647239] dwc3 fe900000.dwc3: Failed to get clk 'ref': -2
+
+In order to remove those annoying messages, update the DWC3 hardware
+module node and add all the required clocks. With this change, both, the
+glue node and the DWC3 core node, have the clocks defined, but that's
+not really a problem and there isn't a side effect on do this. So, we
+can get rid of the annoying get clk error messages.
+
+[1] Documentation/devicetree/bindings/usb/dwc3.txt
+
+Signed-off-by: Enric Balletbo i Serra <enric.balletbo@collabora.com>
+---
+
+ arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+index 196ac9b78076..a15348d185ce 100644
+--- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi
++++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi
+@@ -414,6 +414,9 @@
+ 			compatible = "snps,dwc3";
+ 			reg = <0x0 0xfe800000 0x0 0x100000>;
+ 			interrupts = <GIC_SPI 105 IRQ_TYPE_LEVEL_HIGH 0>;
++			clocks = <&cru SCLK_USB3OTG0_REF>, <&cru ACLK_USB3OTG0>,
++				 <&cru SCLK_USB3OTG0_SUSPEND>;
++			clock-names = "ref", "bus_early", "suspend";
+ 			dr_mode = "otg";
+ 			phys = <&u2phy0_otg>, <&tcphy0_usb3>;
+ 			phy-names = "usb2-phy", "usb3-phy";
+@@ -447,6 +450,9 @@
+ 			compatible = "snps,dwc3";
+ 			reg = <0x0 0xfe900000 0x0 0x100000>;
+ 			interrupts = <GIC_SPI 110 IRQ_TYPE_LEVEL_HIGH 0>;
++			clocks = <&cru SCLK_USB3OTG1_REF>, <&cru ACLK_USB3OTG1>,
++				 <&cru SCLK_USB3OTG1_SUSPEND>;
++			clock-names = "ref", "bus_early", "suspend";
+ 			dr_mode = "otg";
+ 			phys = <&u2phy1_otg>, <&tcphy1_usb3>;
+ 			phy-names = "usb2-phy", "usb3-phy";
diff --git a/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch b/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
index 1492b5fd6..e7ca70ab3 100644
--- a/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
+++ b/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
@@ -1,22 +1,22 @@
-From patchwork Mon Jun 24 22:13:15 2019
+From patchwork Wed Jun 26 15:48:11 2019
 Content-Type: text/plain; charset="utf-8"
 MIME-Version: 1.0
 Content-Transfer-Encoding: 7bit
 X-Patchwork-Submitter: Stefan Wahren <wahrenst@gmx.net>
-X-Patchwork-Id: 11014257
+X-Patchwork-Id: 11018115
 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 AF9B913AF
+	by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0546514BB
 	for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+ Wed, 26 Jun 2019 15:49:02 +0000 (UTC)
 Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
-	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E48D288D0
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E6FEC288DC
 	for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+ Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
 Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
-	id 915A92890C; Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+	id DADF9288E5; Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on
 	pdx-wl-mail.web.codeaurora.org
 X-Spam-Level: 
@@ -27,71 +27,71 @@ 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 334AB288D0
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 73ADC288DC
 	for <patchwork-linux-arm@patchwork.kernel.org>;
- Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+ Wed, 26 Jun 2019 15:49:01 +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:Cc:List-Subscribe:
 	List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:Message-Id:Date:
 	Subject:To:From:Reply-To:Content-ID:Content-Description:Resent-Date:
 	Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:
-	References:List-Owner; bh=pZ4lWwxNSX3iSSGrbQoSUtMz7+GLTRWyjXRJWpId+5s=; b=De9
-	hICr3uVCMJ9HF64mqdARRKXLqBMi85tC4LHoOtzHM3RV+H9ci2Le55P7omHm7Yexo43W0Wko4kaPH
-	I7tMpiA/5CYW7ZAHjla3mxLEMLMSPFwYqBufuR1/uS3vK9+Hgo7oDVhN7Yn5qAtAZfY+8LT69pryi
-	8yetpp6upD56usJT/1aV92r4F07oF/sMdP7cAHOLGl30vKZPt3LQhfYranu0A4HFbzFdCbkjjGTdp
-	gGRUMaGkoQYiDmD4x5mDTsJX7czSSpRM11kcnxCmP6U6Hy47tXSNnaIFyFX7ZNQtYA2id9LKdq9jk
-	4ru0cwPcvfDiKLWysBsVJN7nPIacCYQ==;
+	References:List-Owner; bh=qjzvJkBweFVGZWCHd7cHawZMDpcLTzSf2CjoVEIv+0Q=; b=eu5
+	ABKzcpImxwkRcYCdHG/4eTgYM8nrpBaJqeKW2TNWEhNUjvnfU8TgkbD4nsIXkBXSb/riyKYzEcGJo
+	91zXHR6clQ6yf7eRtaHSX9IMfiwGPTC2YQvr6vQ+CrVJs+xDhlH/1V1+9myF4ySIX+mLOnm+w3pgi
+	j1JeP7vd7fpr8iyG29kaFoDH7FdC5Sw66TINVyaE5igT9yKcrFoAITGfRZevp1dd3uq5EKxs/+oo3
+	9BvpwHZ3Bdb+bWzFc9kS4udjL8V4+u7aesLq8tOOPLZab+W8ZW1iq4PHENzdHblrJyrK/2pGEECPx
+	bVAV7MIHqms4tvAAyXSlPai0wU/j12A==;
 Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
 	by bombadil.infradead.org with esmtp (Exim 4.92 #3 (Red Hat Linux))
-	id 1hfXIl-0000Kg-MK; Mon, 24 Jun 2019 22:19:03 +0000
-Received: from mout.gmx.net ([212.227.17.21])
+	id 1hgAAK-00030G-Ny; Wed, 26 Jun 2019 15:48:56 +0000
+Received: from mout.gmx.net ([212.227.17.20])
  by bombadil.infradead.org with esmtps (Exim 4.92 #3 (Red Hat Linux))
- id 1hfXIh-0000KK-QL
- for linux-arm-kernel@lists.infradead.org; Mon, 24 Jun 2019 22:19:01 +0000
+ id 1hgAAH-0002yg-2E; Wed, 26 Jun 2019 15:48:54 +0000
 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
- s=badeba3b8450; t=1561414736;
- bh=GysLsYTuZsd/CXGs4HdO1VCTJil5RrdvuS6/TiPl2bY=;
+ s=badeba3b8450; t=1561564113;
+ bh=mWLTbdtxGfwZ13vnfxlQDfv6DzwTGycBEng3zNk/XaE=;
  h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
- b=gU0KSa1e5eyFsVnSCujOiYDvflXyoskJ0tc60c59NJ4k7CL076dwvum1oH1DIzsmh
- kYOWRAvu4FZu33Bcxdtv84pgSNSHQt3P9oT0/hULw264uwuuzyjRqjnljK+4ObsjaK
- 3VE9Nt7wobpNaeXddwRKPy0VwPBPS9Cyi6Ype8YA=
+ b=KYHDR8XZmzxft+7qC8J8cyQ71BSi6JkTsAhWvd+vK2f+YjWqjT42uTfrjNGCcQfdV
+ Z9gkAVPhUJWqXcu/GipMjVfx/QmxN65eJI1oHCOZ/vhkhzCqY9CuiJjHWnxF6jmydK
+ 5QSqYnKAOWM3NXmd6pWkd6wlKwIFV9zX8+x8R0gE=
 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c
 Received: from localhost.localdomain ([37.4.249.111]) by mail.gmx.com
- (mrgmx103 [212.227.17.168]) with ESMTPSA (Nemesis) id
- 0MKYpv-1hguWc2RVf-001wNW; Tue, 25 Jun 2019 00:13:21 +0200
+ (mrgmx102 [212.227.17.168]) with ESMTPSA (Nemesis) id
+ 0LyS5K-1ibrK32soI-015u60; Wed, 26 Jun 2019 17:48:33 +0200
 From: Stefan Wahren <wahrenst@gmx.net>
 To: Eric Anholt <eric@anholt.net>,
  Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
  Madhumitha Prabakaran <madhumithabiw@gmail.com>
-Subject: [PATCH] staging: bcm2835-camera: Restore return behavior of
+Subject: [PATCH V2] staging: bcm2835-camera: Restore return behavior of
  ctrl_set_bitrate()
-Date: Tue, 25 Jun 2019 00:13:15 +0200
-Message-Id: <1561414395-12518-1-git-send-email-wahrenst@gmx.net>
+Date: Wed, 26 Jun 2019 17:48:11 +0200
+Message-Id: <1561564091-14248-1-git-send-email-wahrenst@gmx.net>
 X-Mailer: git-send-email 2.7.4
-X-Provags-ID: V03:K1:LGa8UAO+GzmbgvlLItsNffmxnvrhpUjzzhEbaoSn7FwAXOkBTQT
- CXW3GFoFMF7ihP2FNuGybonNAe4XC1IG1wlefi99zYppeICDE1DXNEfp72vJtW+hdWbIWTv
- rQGf9V1DQzVE6avn/XMprdK5kasTgjwFYL1ePyQdxClEBcHaYQFYCkmYu3B0wvQkayY3VwX
- I5OkkpT21gvRetaja00uw==
-X-UI-Out-Filterresults: notjunk:1;V03:K0:jQ7kLM3btHE=:Vw0mHeUG2/OLYWx2xsMv86
- BDj9ACSIdpZZdSkWv37UT7mHK3JlRySOYYM5m/IzfAyzlNxXvPH0NCmzMLpF7RVotI9/DU3MN
- sK7g5b3yd5sxlNf03d9ryZUUFRAlj2jydoVyVgTJzSvYhV34nomQaX3H8i3y2hWm0IIk5OMXK
- 2W48wL4meZ5yWH9Ixh5R3/XIuyvaa4ehoTOBhaSaNMJw6zMZdNid+HWdNCSQ3Qy0lb+qhrPRI
- +Aw/9ucDR4FkJYdUV5yYt4QhAmTY0sRxRWvTHRlqSr1+I++L5aT77BsWGKsbXq97GcpDLrEHF
- lbRPDeDeo0kL5i51A+gQ+0DzV38h/rQ7yz54At+uEHw/9AcnW9w4AkZitDqjHy9F9lJ2obV4P
- jGslvavwp3O4vJrISGoxpX/OuJFfPraVf3B2KNhBIw95jWA7R0fmAp10p1S+roCwkGKEDyuha
- /TVFLsCmVpe3/3vJyll11l2miG60XHLl0aShILfChHlnWWacTi9O8bQoU9XTigvALJBxYpjo+
- SqG1z9IYnUYpUx15qXt4hc6UJvCeCFG+Jz9B/QBPuxlmcylDZ/31PnF1GbqrwpBmYePNYBBtU
- 6nWLKLb/7VfmDxG/5VEaBgI0tt/DiXQ5owRmtV19r0sdzqeWRtUvdj3/TMMULZi28PHQfz7Q8
- nEbF/nUtSRUEZK/wCDWgEq4x2qfG9Yz1Kwi2l4KDsWFezbQtdH5H9UsyOYQiYZhztDskEIol7
- dtHt9qF75NElTmLOI9vXl/mYGvYfCj04DQqqVvTDxYncRewKBFWr603hweU/nY/IDsFs6F/cV
- BdBRS6XR/PxROK/NLOBscMDwwEw7qdKbc7Eqv7OTjynQ9yt1KcS7oIYXUyKrd4BvaQdFqMDrs
- Km3scWeKBdfeJaLKCLPitZYVTPG8PJwPgi5SqUMqgJkGbYxeUP+kgZmvXRz+vu35sYGftgV/t
- vo2FKmWeEtPyAbDBEbV6LgIA+tQkwk0M=
+X-Provags-ID: V03:K1:oGZaaF0VyX9aU1B2KlshIgSdbA6j0aZLN7PhhBatNb+3vHD/bim
+ IAE1eOdpYqQunHD6Pg0lTq7WJELowblFluMBHzPg8LdD02e6QUAOnsxpP9+ZsegmN4310bJ
+ qbWyOk73ZUf0L+ErExAilg9x9ygGjCdTujEDRrk0vloZc12lmdHMEA8VQs/4HDu6WGeOoac
+ M59q+7daHAsSTIgJrRUuA==
+X-UI-Out-Filterresults: notjunk:1;V03:K0:+5QZJxEbxD4=:fxpwesVoxYf61efHxmcTKK
+ BddiAtw8+v4csO9cTNV4qSFAebPmgWlPv8KyLXPbOQdcjOl72FUcevKvhsznxi/uv5leFw9uX
+ Sr99W78EPj3EmJmQT1KZ8GMPWcB/hQa1h/t4bhjHByFu4VQ2xaIdpsJfZlFcR2poK1E6dEFT6
+ jHlzWYjt2kP7anvsjMJvdSVILf9+ei6ysWz1aaMCKFLhxNUNmXH9onDdO8WOanGVr15zb+cVv
+ N4ecxzj0SonMoADsz1UJqgwb8Pi5/me809KQd8pQ/GhKDeLPNwQPXJMMhRbyPgmg5bJVCRUgp
+ MaMwDNiIn3qPl6t4jPx9uiSL5n47PAyt6vVlyufqp1lOr4EqgQFWp+2hknWJYJ8hzkBLgXrdZ
+ gfNGAtlqG9MdHsJds/KNtpjNvF3iCuOWcIyBEGAYKZL78LQggOcIFSlHn+KZ9JU2t9jGJHKF7
+ 0E7pkZuWJIQjaWnt7WTAiO/Pv3tNhKukGVQXG7OTxkwS3+BsXI+vBB+xtOP+syI1QFkP3h+5c
+ 9HVQLB7CA73bkyul1AwmrHNV+OqITaTatTPFXsDojt54X59pz2G3SkQI5z8JZ2aq40Z3vwI6u
+ lyMT+gPPFDx2aNm460FX8Gm+2BisA5xrkpjxb4KIDZvTRDCexntK3cadXRyX7GZQWc6poIcVf
+ atWNWiKYv6KN6vA+lc2Ffl5FM8p7BFtkX4GA0GZ/XhMTvCqDtgxBdQ4sevKJ4riNMAvRuswrM
+ BUrlhaRg3ElFPF3x+S73QaRmNmtv34L7puWW57WxrkKKSJS7Td0oZd1ktx6eAW1CA+I8RmOn3
+ A+rcm/ZfBf00TXqxsq3/t9h4mL3cP4KhBAxtyYg4z4yjuWt8AmXR6GfvTwCxk+qioygsV6KyY
+ 6yh532oUizARrL8gUwZBauRwgH5rk7e2BWINY86y8vr3nSBzocuIFAekTK42reIsJ+qq9OSD5
+ IcQroenV1LixMtStvb6CiyHMHMqpxb+Buu+0bdl5qjKcUB4JxBA6KWMPC6Orj+Yf/GKaQlk+k
+ VsgZBuZAUHsZFuULBdIsUg//MyQJ0q/13WL31BSqJX9SAMgHFgsGeDo4yAg4YSF2Mbh1EgZu7
+ a3+bklRX7SG3Ts=
 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 
-X-CRM114-CacheID: sfid-20190624_151900_149791_318B5C68 
-X-CRM114-Status: UNSURE (   9.24  )
-X-CRM114-Notice: Please train this message.
+X-CRM114-CacheID: sfid-20190626_084853_443115_5EF1DFC7 
+X-CRM114-Status: GOOD (  11.55  )
 X-BeenThere: linux-arm-kernel@lists.infradead.org
 X-Mailman-Version: 2.1.29
 Precedence: list
@@ -105,8 +105,11 @@ 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>
-Cc: devel@driverdev.osuosl.org, linux-rpi-kernel@lists.infradead.org,
- linux-arm-kernel@lists.infradead.org, Stefan Wahren <wahrenst@gmx.net>
+Cc: devel@driverdev.osuosl.org, Stefan Wahren <wahrenst@gmx.net>,
+ Dave Stevenson <dave.stevenson@raspberrypi.org>,
+ Dan Carpenter <dan.carpenter@oracle.com>,
+ linux-arm-kernel@lists.infradead.org,
+ linux-rpi-kernel@lists.infradead.org
 MIME-Version: 1.0
 Content-Type: text/plain; charset="us-ascii"
 Sender: "linux-arm-kernel" <linux-arm-kernel-bounces@lists.infradead.org>
@@ -116,7 +119,8 @@ X-Virus-Scanned: ClamAV using ClamSMTP
 
 The commit 52c4dfcead49 ("Staging: vc04_services: Cleanup in
 ctrl_set_bitrate()") changed the return behavior of ctrl_set_bitrate().
-This breaks probing of bcm2835-camera:
+We cannot do this because of a bug in the firmware, which breaks probing
+of bcm2835-camera:
 
     bcm2835-v4l2: mmal_init: failed to set all camera controls: -3
     Cleanup: Destroy video encoder
@@ -126,32 +130,55 @@ This breaks probing of bcm2835-camera:
     bcm2835-v4l2: bcm2835_mmal_probe: mmal init failed: -3
     bcm2835-camera: probe of bcm2835-camera failed with error -3
 
-So restore the old behavior and fix this issue.
+So restore the old behavior, add an explaining comment and a debug message
+to verify that the bug has been fixed in firmware.
 
 Fixes: 52c4dfcead49 ("Staging: vc04_services: Cleanup in ctrl_set_bitrate()")
 Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
+Acked-by: Dan Carpenter <dan.carpenter@oracle.com>
 ---
- drivers/staging/vc04_services/bcm2835-camera/controls.c | 8 +++++---
- 1 file changed, 5 insertions(+), 3 deletions(-)
+ .../staging/vc04_services/bcm2835-camera/controls.c   | 19 ++++++++++++++++---
+ 1 file changed, 16 insertions(+), 3 deletions(-)
+
+Changes in V2:
+- add an explaining comment as suggest by Dan and Dave
+- add a debug message to verify the firmware behavior
 
 --
 2.7.4
 
 diff --git a/drivers/staging/vc04_services/bcm2835-camera/controls.c b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-index d60e378..1c4c9e8 100644
+index d60e378..c251164 100644
 --- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
 +++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
-@@ -610,9 +610,11 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
+@@ -604,15 +604,28 @@ static int ctrl_set_bitrate(struct bm2835_mmal_dev *dev,
+ 			    struct v4l2_ctrl *ctrl,
+ 			    const struct bm2835_mmal_v4l2_ctrl *mmal_ctrl)
+ {
++	int ret;
+ 	struct vchiq_mmal_port *encoder_out;
+
+ 	dev->capture.encode_bitrate = ctrl->val;
 
  	encoder_out = &dev->component[MMAL_COMPONENT_VIDEO_ENCODE]->output[0];
 
 -	return vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
 -					     mmal_ctrl->mmal_id, &ctrl->val,
 -					     sizeof(ctrl->val));
-+	vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
-+				      mmal_ctrl->mmal_id, &ctrl->val,
-+				      sizeof(ctrl->val));
++	ret = vchiq_mmal_port_parameter_set(dev->instance, encoder_out,
++					    mmal_ctrl->mmal_id, &ctrl->val,
++					    sizeof(ctrl->val));
++
++	v4l2_dbg(1, bcm2835_v4l2_debug, &dev->v4l2_dev,
++		 "%s: After: mmal_ctrl:%p ctrl id:0x%x ctrl val:%d ret %d(%d)\n",
++		 __func__, mmal_ctrl, ctrl->id, ctrl->val, ret,
++		 (ret == 0 ? 0 : -EINVAL));
 +
++	/*
++	 * Older firmware versions (pre July 2019) have a bug in handling
++	 * MMAL_PARAMETER_VIDEO_BIT_RATE that result in the call
++	 * returning -MMAL_MSG_STATUS_EINVAL. So ignore errors from this call.
++	 */
 +	return 0;
  }
 
diff --git a/configs/fedora/generic/CONFIG_MSM_GCC_8994 b/configs/fedora/generic/arm/CONFIG_MSM_GCC_8994
index b4515acea..b4515acea 100644
--- a/configs/fedora/generic/CONFIG_MSM_GCC_8994
+++ b/configs/fedora/generic/arm/CONFIG_MSM_GCC_8994
diff --git a/configs/fedora/generic/CONFIG_MSM_GCC_8998 b/configs/fedora/generic/arm/CONFIG_MSM_GCC_8998
index 31a52c0e1..31a52c0e1 100644
--- a/configs/fedora/generic/CONFIG_MSM_GCC_8998
+++ b/configs/fedora/generic/arm/CONFIG_MSM_GCC_8998
diff --git a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP b/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
deleted file mode 100644
index 88cf51247..000000000
--- a/configs/fedora/generic/arm/CONFIG_PCIE_ROCKCHIP
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_PCIE_ROCKCHIP is not set
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_88PM800 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_88PM800
deleted file mode 100644
index 98ea8db42..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_MFD_88PM800
+++ /dev/null
@@ -1 +0,0 @@
-CONFIG_MFD_88PM800=m
diff --git a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_88PM800 b/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
deleted file mode 100644
index 68e334db0..000000000
--- a/configs/fedora/generic/arm/armv7/armv7/CONFIG_REGULATOR_88PM800
+++ /dev/null
@@ -1 +0,0 @@
-# CONFIG_REGULATOR_88PM800 is not set
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index dceae8a7e..09b0dc7b4 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -4389,7 +4389,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index 438b59ef7..25398e15c 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -4369,7 +4369,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX_NWL=y
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
diff --git a/kernel-armv7hl-debug.config b/kernel-armv7hl-debug.config
index 43039452d..ba671f3c3 100644
--- a/kernel-armv7hl-debug.config
+++ b/kernel-armv7hl-debug.config
@@ -3356,7 +3356,7 @@ CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_MFD_88PM800=m
+# CONFIG_MFD_88PM800 is not set
 CONFIG_MFD_88PM805=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -4505,7 +4505,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4975,7 +4974,6 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_88PM800 is not set
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
diff --git a/kernel-armv7hl-lpae-debug.config b/kernel-armv7hl-lpae-debug.config
index dc9b82797..06b928317 100644
--- a/kernel-armv7hl-lpae-debug.config
+++ b/kernel-armv7hl-lpae-debug.config
@@ -4341,7 +4341,6 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
diff --git a/kernel-armv7hl-lpae.config b/kernel-armv7hl-lpae.config
index 0c0fe444d..b9c5c1d4d 100644
--- a/kernel-armv7hl-lpae.config
+++ b/kernel-armv7hl-lpae.config
@@ -4322,7 +4322,6 @@ CONFIG_PCIE_ECRC=y
 CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 # CONFIG_PCIE_XILINX is not set
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
diff --git a/kernel-armv7hl.config b/kernel-armv7hl.config
index 2b65964e1..10da3c33d 100644
--- a/kernel-armv7hl.config
+++ b/kernel-armv7hl.config
@@ -3338,7 +3338,7 @@ CONFIG_MESON_SARADC=m
 CONFIG_MESON_SM=y
 CONFIG_MESON_WATCHDOG=m
 CONFIG_MESSAGE_LOGLEVEL_DEFAULT=4
-CONFIG_MFD_88PM800=m
+# CONFIG_MFD_88PM800 is not set
 CONFIG_MFD_88PM805=m
 # CONFIG_MFD_88PM860X is not set
 # CONFIG_MFD_AAT2870_CORE is not set
@@ -4486,7 +4486,6 @@ CONFIG_PCIEPORTBUS=y
 CONFIG_PCIE_PTM=y
 CONFIG_PCIE_QCOM=y
 # CONFIG_PCIE_ROCKCHIP_HOST is not set
-# CONFIG_PCIE_ROCKCHIP is not set
 CONFIG_PCIE_XILINX=y
 # CONFIG_PCI_FTPCI100 is not set
 # CONFIG_PCI_GOOLPC is not set
@@ -4955,7 +4954,6 @@ CONFIG_REGMAP_SPI=y
 CONFIG_REGMAP_SPMI=m
 CONFIG_REGMAP=y
 # CONFIG_REGULATOR_88PG86X is not set
-# CONFIG_REGULATOR_88PM800 is not set
 CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_AD5398=m
 CONFIG_REGULATOR_ANATOP=m
diff --git a/kernel-i686-debug.config b/kernel-i686-debug.config
index c8fd7f684..5a2cf9ca3 100644
--- a/kernel-i686-debug.config
+++ b/kernel-i686-debug.config
@@ -3312,8 +3312,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-i686.config b/kernel-i686.config
index 41cb3cca1..20bb2ce2b 100644
--- a/kernel-i686.config
+++ b/kernel-i686.config
@@ -3293,8 +3293,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-ppc64le-debug.config b/kernel-ppc64le-debug.config
index 19fce1e42..16409acf7 100644
--- a/kernel-ppc64le-debug.config
+++ b/kernel-ppc64le-debug.config
@@ -3045,8 +3045,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_BITMAP_SELFTEST=y
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-ppc64le.config b/kernel-ppc64le.config
index d248e8882..5b0c3f69c 100644
--- a/kernel-ppc64le.config
+++ b/kernel-ppc64le.config
@@ -3024,8 +3024,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_BITMAP_SELFTEST=y
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-s390x-debug.config b/kernel-s390x-debug.config
index 9bb9f41e8..96824ecdd 100644
--- a/kernel-s390x-debug.config
+++ b/kernel-s390x-debug.config
@@ -3019,8 +3019,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-s390x.config b/kernel-s390x.config
index 77669218f..f4eb17728 100644
--- a/kernel-s390x.config
+++ b/kernel-s390x.config
@@ -2998,8 +2998,6 @@ CONFIG_MQ_IOSCHED_KYBER=y
 # CONFIG_MS_BLOCK is not set
 CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-x86_64-debug.config b/kernel-x86_64-debug.config
index 77375f724..4da580b9c 100644
--- a/kernel-x86_64-debug.config
+++ b/kernel-x86_64-debug.config
@@ -3360,8 +3360,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel-x86_64.config b/kernel-x86_64.config
index 5b977709d..c737eb8ac 100644
--- a/kernel-x86_64.config
+++ b/kernel-x86_64.config
@@ -3341,8 +3341,6 @@ CONFIG_MSDOS_FS=m
 CONFIG_MSDOS_PARTITION=y
 CONFIG_MSI_LAPTOP=m
 CONFIG_MSI_WMI=m
-# CONFIG_MSM_GCC_8994 is not set
-# CONFIG_MSM_GCC_8998 is not set
 CONFIG_MSPRO_BLOCK=m
 CONFIG_MT7601U=m
 CONFIG_MT7603E=m
diff --git a/kernel.spec b/kernel.spec
index 68faab8ed..0961c7ee6 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -551,6 +551,9 @@ Patch304: ACPI-irq-Workaround-firmware-issue-on-X-Gene-based-m400.patch
 # https://patchwork.kernel.org/project/linux-mmc/list/?submitter=71861
 Patch305: arm-sdhci-esdhc-imx-fixes.patch
 
+# Fix accepted for 5.3 https://patchwork.kernel.org/patch/10992783/
+Patch306: arm64-dts-rockchip-Update-DWC3-modules-on-RK3399-SoCs.patch
+
 # Raspberry Pi bits
 Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch