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

8 files changed, 170 insertions, 3 deletions

diff --git a/arm64-qcom-pinctrl-support-for-ACPI.patch b/arm64-qcom-pinctrl-support-for-ACPI.patch
index 4548d4036..a904b4789 100644
--- a/arm64-qcom-pinctrl-support-for-ACPI.patch
+++ b/arm64-qcom-pinctrl-support-for-ACPI.patch
@@ -270,7 +270,7 @@ index c97f20fca5fd..98a438dba711 100644
 +	return ret;
  }
  
-+#if CONFIG_ACPI
++#ifdef CONFIG_ACPI
 +static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = {
 +	{ "QCOM0217"},
 +	{ },
diff --git a/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch b/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
new file mode 100644
index 000000000..1492b5fd6
--- /dev/null
+++ b/bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
@@ -0,0 +1,158 @@
+From patchwork Mon Jun 24 22:13:15 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
+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
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1])
+	by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9E48D288D0
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 24 Jun 2019 22:19:04 +0000 (UTC)
+Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
+	id 915A92890C; Mon, 24 Jun 2019 22:19:04 +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,FREEMAIL_FROM,MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED 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 334AB288D0
+	for <patchwork-linux-arm@patchwork.kernel.org>;
+ Mon, 24 Jun 2019 22:19:04 +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==;
+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])
+ 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
+DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.net;
+ s=badeba3b8450; t=1561414736;
+ bh=GysLsYTuZsd/CXGs4HdO1VCTJil5RrdvuS6/TiPl2bY=;
+ h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
+ b=gU0KSa1e5eyFsVnSCujOiYDvflXyoskJ0tc60c59NJ4k7CL076dwvum1oH1DIzsmh
+ kYOWRAvu4FZu33Bcxdtv84pgSNSHQt3P9oT0/hULw264uwuuzyjRqjnljK+4ObsjaK
+ 3VE9Nt7wobpNaeXddwRKPy0VwPBPS9Cyi6Ype8YA=
+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
+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
+ ctrl_set_bitrate()
+Date: Tue, 25 Jun 2019 00:13:15 +0200
+Message-Id: <1561414395-12518-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-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-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: devel@driverdev.osuosl.org, linux-rpi-kernel@lists.infradead.org,
+ linux-arm-kernel@lists.infradead.org, Stefan Wahren <wahrenst@gmx.net>
+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 commit 52c4dfcead49 ("Staging: vc04_services: Cleanup in
+ctrl_set_bitrate()") changed the return behavior of ctrl_set_bitrate().
+This breaks probing of bcm2835-camera:
+
+    bcm2835-v4l2: mmal_init: failed to set all camera controls: -3
+    Cleanup: Destroy video encoder
+    Cleanup: Destroy image encoder
+    Cleanup: Destroy video render
+    Cleanup: Destroy 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.
+
+Fixes: 52c4dfcead49 ("Staging: vc04_services: Cleanup in ctrl_set_bitrate()")
+Signed-off-by: Stefan Wahren <wahrenst@gmx.net>
+---
+ drivers/staging/vc04_services/bcm2835-camera/controls.c | 8 +++++---
+ 1 file changed, 5 insertions(+), 3 deletions(-)
+
+--
+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
+--- 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,
+
+ 	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));
++
++	return 0;
+ }
+
+ static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_BD718XX b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_BD718XX
new file mode 100644
index 000000000..a9e122a0c
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_COMMON_CLK_BD718XX
@@ -0,0 +1 @@
+CONFIG_COMMON_CLK_BD718XX=m
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_MFD_ROHM_BD718XX b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_ROHM_BD718XX
new file mode 100644
index 000000000..330bd6f60
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_MFD_ROHM_BD718XX
@@ -0,0 +1 @@
+CONFIG_MFD_ROHM_BD718XX=y
diff --git a/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_BD718XX b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_BD718XX
new file mode 100644
index 000000000..fb1fae154
--- /dev/null
+++ b/configs/fedora/generic/arm/aarch64/CONFIG_REGULATOR_BD718XX
@@ -0,0 +1 @@
+CONFIG_REGULATOR_BD718XX=m
diff --git a/kernel-aarch64-debug.config b/kernel-aarch64-debug.config
index e44124219..dceae8a7e 100644
--- a/kernel-aarch64-debug.config
+++ b/kernel-aarch64-debug.config
@@ -976,6 +976,7 @@ CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
@@ -3352,7 +3353,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
+CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
@@ -4862,6 +4863,7 @@ CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD718XX=m
 CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
diff --git a/kernel-aarch64.config b/kernel-aarch64.config
index ee270dfc8..438b59ef7 100644
--- a/kernel-aarch64.config
+++ b/kernel-aarch64.config
@@ -976,6 +976,7 @@ CONFIG_CNIC=m
 # CONFIG_CODA_FS is not set
 # CONFIG_COMEDI is not set
 # CONFIG_COMMON_CLK_AXG_AUDIO is not set
+CONFIG_COMMON_CLK_BD718XX=m
 # CONFIG_COMMON_CLK_CDCE706 is not set
 # CONFIG_COMMON_CLK_CDCE925 is not set
 # CONFIG_COMMON_CLK_CS2000_CP is not set
@@ -3333,7 +3334,7 @@ CONFIG_MFD_QCOM_RPM=m
 # CONFIG_MFD_RETU is not set
 CONFIG_MFD_RK808=y
 # CONFIG_MFD_RN5T618 is not set
-# CONFIG_MFD_ROHM_BD718XX is not set
+CONFIG_MFD_ROHM_BD718XX=y
 # CONFIG_MFD_RT5033 is not set
 # CONFIG_MFD_SEC_CORE is not set
 # CONFIG_MFD_SI476X_CORE is not set
@@ -4841,6 +4842,7 @@ CONFIG_REGULATOR_ACT8865=m
 CONFIG_REGULATOR_ANATOP=m
 CONFIG_REGULATOR_AS3722=m
 CONFIG_REGULATOR_AXP20X=m
+CONFIG_REGULATOR_BD718XX=m
 CONFIG_REGULATOR_BD9571MWV=m
 # CONFIG_REGULATOR_DA9210 is not set
 # CONFIG_REGULATOR_DA9211 is not set
diff --git a/kernel.spec b/kernel.spec
index 4cbfaba84..5aefd330d 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -575,6 +575,8 @@ Patch330: ARM-cpufreq-support-for-Raspberry-Pi.patch
 
 Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
 
+Patch332: bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
+
 # Tegra bits
 Patch340: arm64-tegra-jetson-tx1-fixes.patch