Merge remote-tracking branch 'up/master' into master-riscv64
Signed-off-by: David Abdurachmanov <david.abdurachmanov@sifive.com>
This commit is contained in:
commit
b54ad78b02
|
@ -1,46 +0,0 @@
|
|||
From 3b6df7e8130719b6bd83be241eb455f2aa862e9f Mon Sep 17 00:00:00 2001
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Fri, 14 Jun 2019 09:28:32 +0200
|
||||
Subject: [PATCH] HID: logitech-dj: Fix forwarding of very long HID++ reports
|
||||
|
||||
The HID++ spec also defines very long HID++ reports, with a reportid of
|
||||
0x12. The MX5000 and MX5500 keyboards use 0x12 output reports for sending
|
||||
messages to display on their buildin LCD.
|
||||
|
||||
Userspace (libmx5000) supports this, in order for this to work when talking
|
||||
to the HID devices instantiated for the keyboard by hid-logitech-dj,
|
||||
we need to properly forward these reports to the device.
|
||||
|
||||
This commit fixes logi_dj_ll_raw_request not forwarding these reports.
|
||||
|
||||
Fixes: f2113c3020ef ("HID: logitech-dj: add support for Logitech Bluetooth Mini-Receiver")
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
drivers/hid/hid-logitech-dj.c | 4 +++-
|
||||
1 file changed, 3 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/hid/hid-logitech-dj.c b/drivers/hid/hid-logitech-dj.c
|
||||
index 865b179d0a62..aedbe18182db 100644
|
||||
--- a/drivers/hid/hid-logitech-dj.c
|
||||
+++ b/drivers/hid/hid-logitech-dj.c
|
||||
@@ -30,6 +30,7 @@
|
||||
|
||||
#define REPORT_ID_HIDPP_SHORT 0x10
|
||||
#define REPORT_ID_HIDPP_LONG 0x11
|
||||
+#define REPORT_ID_HIDPP_VERY_LONG 0x12
|
||||
|
||||
#define HIDPP_REPORT_SHORT_LENGTH 7
|
||||
#define HIDPP_REPORT_LONG_LENGTH 20
|
||||
@@ -1242,7 +1243,8 @@ static int logi_dj_ll_raw_request(struct hid_device *hid,
|
||||
int ret;
|
||||
|
||||
if ((buf[0] == REPORT_ID_HIDPP_SHORT) ||
|
||||
- (buf[0] == REPORT_ID_HIDPP_LONG)) {
|
||||
+ (buf[0] == REPORT_ID_HIDPP_LONG) ||
|
||||
+ (buf[0] == REPORT_ID_HIDPP_VERY_LONG)) {
|
||||
if (count < 2)
|
||||
return -EINVAL;
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -1,54 +0,0 @@
|
|||
From c8f57936ab21a1430ae2209fa874e842d13552d3 Mon Sep 17 00:00:00 2001
|
||||
From: Jeremy Cline <jcline@redhat.com>
|
||||
Date: Tue, 11 Jun 2019 14:59:23 +0000
|
||||
Subject: [PATCH] Revert "Bluetooth: Align minimum encryption key size for LE
|
||||
and BR/EDR connections"
|
||||
|
||||
This reverts commit d5bb334a8e171b262e48f378bd2096c0ea458265.
|
||||
|
||||
This patch broke a number of older bluetooth devices and while an RFC
|
||||
that fixes this patch has been posted upstream, it has not been merged
|
||||
and there are still a few folks reporting problems.
|
||||
|
||||
Signed-off-by: Jeremy Cline <jcline@redhat.com>
|
||||
---
|
||||
include/net/bluetooth/hci_core.h | 3 ---
|
||||
net/bluetooth/hci_conn.c | 8 --------
|
||||
2 files changed, 11 deletions(-)
|
||||
|
||||
diff --git a/include/net/bluetooth/hci_core.h b/include/net/bluetooth/hci_core.h
|
||||
index 05b1b96f4d9e..094e61e07030 100644
|
||||
--- a/include/net/bluetooth/hci_core.h
|
||||
+++ b/include/net/bluetooth/hci_core.h
|
||||
@@ -190,9 +190,6 @@ struct adv_info {
|
||||
|
||||
#define HCI_MAX_SHORT_NAME_LENGTH 10
|
||||
|
||||
-/* Min encryption key size to match with SMP */
|
||||
-#define HCI_MIN_ENC_KEY_SIZE 7
|
||||
-
|
||||
/* Default LE RPA expiry time, 15 minutes */
|
||||
#define HCI_DEFAULT_RPA_TIMEOUT (15 * 60)
|
||||
|
||||
diff --git a/net/bluetooth/hci_conn.c b/net/bluetooth/hci_conn.c
|
||||
index 3cf0764d5793..bd4978ce8c45 100644
|
||||
--- a/net/bluetooth/hci_conn.c
|
||||
+++ b/net/bluetooth/hci_conn.c
|
||||
@@ -1276,14 +1276,6 @@ int hci_conn_check_link_mode(struct hci_conn *conn)
|
||||
!test_bit(HCI_CONN_ENCRYPT, &conn->flags))
|
||||
return 0;
|
||||
|
||||
- /* The minimum encryption key size needs to be enforced by the
|
||||
- * host stack before establishing any L2CAP connections. The
|
||||
- * specification in theory allows a minimum of 1, but to align
|
||||
- * BR/EDR and LE transports, a minimum of 7 is chosen.
|
||||
- */
|
||||
- if (conn->enc_key_size < HCI_MIN_ENC_KEY_SIZE)
|
||||
- return 0;
|
||||
-
|
||||
return 1;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -0,0 +1,41 @@
|
|||
From a7edc17544709d20f800dc0898096365a3d68613 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Sun, 2 Jun 2019 16:36:15 +0200
|
||||
Subject: [PATCH] acpi/arm64: ignore 5.1 FADTs that are reported as 5.0
|
||||
|
||||
Some Qualcomm Snapdragon based laptops built to run Microsoft Windows
|
||||
are clearly ACPI 5.1 based, given that that is the first ACPI revision
|
||||
that supports ARM, and introduced the FADT 'arm_boot_flags' field,
|
||||
which has a non-zero field on those systems.
|
||||
|
||||
So in these cases, infer from the ARM boot flags that the FADT must be
|
||||
5.1 or later, and treat it as 5.1.
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
arch/arm64/kernel/acpi.c | 10 +++++++---
|
||||
1 file changed, 7 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c
|
||||
index 803f0494dd3e3..7722e85fb69c3 100644
|
||||
--- a/arch/arm64/kernel/acpi.c
|
||||
+++ b/arch/arm64/kernel/acpi.c
|
||||
@@ -155,10 +155,14 @@ static int __init acpi_fadt_sanity_check(void)
|
||||
*/
|
||||
if (table->revision < 5 ||
|
||||
(table->revision == 5 && fadt->minor_revision < 1)) {
|
||||
- pr_err("Unsupported FADT revision %d.%d, should be 5.1+\n",
|
||||
+ pr_err(FW_BUG "Unsupported FADT revision %d.%d, should be 5.1+\n",
|
||||
table->revision, fadt->minor_revision);
|
||||
- ret = -EINVAL;
|
||||
- goto out;
|
||||
+
|
||||
+ if (!fadt->arm_boot_flags) {
|
||||
+ ret = -EINVAL;
|
||||
+ goto out;
|
||||
+ }
|
||||
+ pr_err("FADT has ARM boot flags set, assuming 5.1\n");
|
||||
}
|
||||
|
||||
if (!(fadt->flags & ACPI_FADT_HW_REDUCED)) {
|
||||
|
|
@ -0,0 +1,30 @@
|
|||
From 7b87bc98ab598ae40ef1818fb0c420d61dd87ed1 Mon Sep 17 00:00:00 2001
|
||||
From: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Date: Mon, 3 Jun 2019 08:37:11 +0200
|
||||
Subject: [PATCH] acpi: make AC and battery drivers available on !X86
|
||||
|
||||
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/acpi/Kconfig | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/acpi/Kconfig b/drivers/acpi/Kconfig
|
||||
index e016f7a6ed136..3c8011e7b0d7c 100644
|
||||
--- a/drivers/acpi/Kconfig
|
||||
+++ b/drivers/acpi/Kconfig
|
||||
@@ -155,7 +155,6 @@ config ACPI_EC_DEBUGFS
|
||||
|
||||
config ACPI_AC
|
||||
tristate "AC Adapter"
|
||||
- depends on X86
|
||||
select POWER_SUPPLY
|
||||
default y
|
||||
help
|
||||
@@ -168,7 +167,6 @@ config ACPI_AC
|
||||
|
||||
config ACPI_BATTERY
|
||||
tristate "Battery"
|
||||
- depends on X86
|
||||
select POWER_SUPPLY
|
||||
default y
|
||||
help
|
|
@ -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";
|
File diff suppressed because it is too large
Load Diff
|
@ -0,0 +1,293 @@
|
|||
From 0ab5b9df0c9f07ae747ddc678d4e423c42f69624 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:06 +0100
|
||||
Subject: [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI
|
||||
|
||||
Add a match table to allow automatic probing of ACPI device
|
||||
QCOM0220. Ignore clock attainment errors. Set default clock
|
||||
frequency value.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index db075bc0d952..9e3b8a98688d 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/err.h>
|
||||
@@ -483,6 +484,14 @@ static const struct i2c_algorithm geni_i2c_algo = {
|
||||
.functionality = geni_i2c_func,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id geni_i2c_acpi_match[] = {
|
||||
+ { "QCOM0220"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static int geni_i2c_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct geni_i2c_dev *gi2c;
|
||||
@@ -502,7 +511,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return PTR_ERR(gi2c->se.base);
|
||||
|
||||
gi2c->se.clk = devm_clk_get(&pdev->dev, "se");
|
||||
- if (IS_ERR(gi2c->se.clk)) {
|
||||
+ if (IS_ERR(gi2c->se.clk) && !has_acpi_companion(&pdev->dev)) {
|
||||
ret = PTR_ERR(gi2c->se.clk);
|
||||
dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret);
|
||||
return ret;
|
||||
@@ -516,6 +525,9 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
gi2c->clk_freq_out = KHZ(100);
|
||||
}
|
||||
|
||||
+ if (has_acpi_companion(&pdev->dev))
|
||||
+ ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev));
|
||||
+
|
||||
gi2c->irq = platform_get_irq(pdev, 0);
|
||||
if (gi2c->irq < 0) {
|
||||
dev_err(&pdev->dev, "IRQ error for i2c-geni\n");
|
||||
@@ -660,6 +672,7 @@ static struct platform_driver geni_i2c_driver = {
|
||||
.name = "geni_i2c",
|
||||
.pm = &geni_i2c_pm_ops,
|
||||
.of_match_table = geni_i2c_dt_match,
|
||||
+ .acpi_match_table = ACPI_PTR(geni_i2c_acpi_match),
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 5a0639fed6e05977d85c4824354e73d0a2fa92ef Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:07 +0100
|
||||
Subject: [PATCH 2/8] i2c: i2c-qcom-geni: Signify successful driver probe
|
||||
|
||||
The Qualcomm Geni I2C driver currently probes silently which can be
|
||||
confusing when debugging potential issues. Add a low level (INFO)
|
||||
print when each I2C controller is successfully initially set-up.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index 9e3b8a98688d..a89bfce5388e 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
@@ -596,6 +596,8 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ dev_dbg(&pdev->dev, "Geni-I2C adaptor successfully added\n");
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 6f202eb6dbccf3172616a620faf934bf6195a0f9 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:08 +0100
|
||||
Subject: [PATCH 3/8] pinctrl: msm: Add ability for drivers to supply a
|
||||
reserved GPIO list
|
||||
|
||||
When booting MSM based platforms with Device Tree or some ACPI
|
||||
implementations, it is possible to provide a list of reserved pins
|
||||
via the 'gpio-reserved-ranges' and 'gpios' properties respectively.
|
||||
However some ACPI tables are not populated with this information,
|
||||
thus it has to come from a knowledgable device driver instead.
|
||||
|
||||
Here we provide the MSM common driver with additional support to
|
||||
parse this informtion and correctly populate the widely used
|
||||
'valid_mask'.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/pinctrl-msm.c | 18 ++++++++++++++++++
|
||||
drivers/pinctrl/qcom/pinctrl-msm.h | 1 +
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
index 6e319bcc2326..80682b017a47 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
@@ -599,8 +599,23 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip)
|
||||
int ret;
|
||||
unsigned int len, i;
|
||||
unsigned int max_gpios = pctrl->soc->ngpios;
|
||||
+ const int *reserved = pctrl->soc->reserved_gpios;
|
||||
u16 *tmp;
|
||||
|
||||
+ /* Driver provided reserved list overrides DT and ACPI */
|
||||
+ if (reserved) {
|
||||
+ bitmap_fill(chip->valid_mask, max_gpios);
|
||||
+ for (i = 0; reserved[i] >= 0; i++) {
|
||||
+ if (i >= max_gpios || reserved[i] >= max_gpios) {
|
||||
+ dev_err(pctrl->dev, "invalid list of reserved GPIOs\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ clear_bit(reserved[i], chip->valid_mask);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
/* The number of GPIOs in the ACPI tables */
|
||||
len = ret = device_property_read_u16_array(pctrl->dev, "gpios", NULL,
|
||||
0);
|
||||
@@ -956,6 +971,9 @@ static void msm_gpio_irq_handler(struct irq_desc *desc)
|
||||
|
||||
static bool msm_gpio_needs_valid_mask(struct msm_pinctrl *pctrl)
|
||||
{
|
||||
+ if (pctrl->soc->reserved_gpios)
|
||||
+ return true;
|
||||
+
|
||||
return device_property_read_u16_array(pctrl->dev, "gpios", NULL, 0) > 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
index b724581c605c..48569cda8471 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
@@ -113,6 +113,7 @@ struct msm_pinctrl_soc_data {
|
||||
bool pull_no_keeper;
|
||||
const char *const *tiles;
|
||||
unsigned int ntiles;
|
||||
+ const int *reserved_gpios;
|
||||
};
|
||||
|
||||
extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 568ff4c9723d761164416fdf876232f5b14cf3ad Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:09 +0100
|
||||
Subject: [PATCH 4/8] pinctrl: qcom: sdm845: Provide ACPI support
|
||||
|
||||
This patch provides basic support for booting with ACPI instead
|
||||
of the currently supported Device Tree. When doing so there are a
|
||||
couple of differences which we need to taken into consideration.
|
||||
|
||||
Firstly, the SDM850 ACPI tables omit information pertaining to the
|
||||
4 reserved GPIOs on the platform. If Linux attempts to touch/
|
||||
initialise any of these lines, the firmware will restart the
|
||||
platform.
|
||||
|
||||
Secondly, when booting with ACPI, it is expected that the firmware
|
||||
will set-up things like; Regulators, Clocks, Pin Functions, etc in
|
||||
their ideal configuration. Thus, the possible Pin Functions
|
||||
available to this platform are not advertised when providing the
|
||||
higher GPIOD/Pinctrl APIs with pin information.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/Kconfig | 2 +-
|
||||
drivers/pinctrl/qcom/pinctrl-sdm845.c | 36 ++++++++++++++++++++++++++-
|
||||
2 files changed, 36 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
|
||||
index 890d0a3a790b..27ab585a639c 100644
|
||||
--- a/drivers/pinctrl/qcom/Kconfig
|
||||
+++ b/drivers/pinctrl/qcom/Kconfig
|
||||
@@ -169,7 +169,7 @@ config PINCTRL_SDM660
|
||||
|
||||
config PINCTRL_SDM845
|
||||
tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
|
||||
- depends on GPIOLIB && OF
|
||||
+ depends on GPIOLIB && (OF || ACPI)
|
||||
select PINCTRL_MSM
|
||||
help
|
||||
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
index c97f20fca5fd..98a438dba711 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
@@ -1277,6 +1278,10 @@ static const struct msm_pingroup sdm845_groups[] = {
|
||||
UFS_RESET(ufs_reset, 0x99f000),
|
||||
};
|
||||
|
||||
+static const int sdm845_acpi_reserved_gpios[] = {
|
||||
+ 0, 1, 2, 3, 81, 82, 83, 84, -1
|
||||
+};
|
||||
+
|
||||
static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.pins = sdm845_pins,
|
||||
.npins = ARRAY_SIZE(sdm845_pins),
|
||||
@@ -1287,11 +1292,39 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.ngpios = 150,
|
||||
};
|
||||
|
||||
+static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = {
|
||||
+ .pins = sdm845_pins,
|
||||
+ .npins = ARRAY_SIZE(sdm845_pins),
|
||||
+ .groups = sdm845_groups,
|
||||
+ .ngroups = ARRAY_SIZE(sdm845_groups),
|
||||
+ .reserved_gpios = sdm845_acpi_reserved_gpios,
|
||||
+ .ngpios = 150,
|
||||
+};
|
||||
+
|
||||
static int sdm845_pinctrl_probe(struct platform_device *pdev)
|
||||
{
|
||||
- return msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ int ret;
|
||||
+
|
||||
+ if (pdev->dev.of_node) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ } else if (has_acpi_companion(&pdev->dev)) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_acpi_pinctrl);
|
||||
+ } else {
|
||||
+ dev_err(&pdev->dev, "DT and ACPI disabled\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = {
|
||||
+ { "QCOM0217"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sdm845_pinctrl_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static const struct of_device_id sdm845_pinctrl_of_match[] = {
|
||||
{ .compatible = "qcom,sdm845-pinctrl", },
|
||||
{ },
|
||||
@@ -1302,6 +1335,7 @@ static struct platform_driver sdm845_pinctrl_driver = {
|
||||
.name = "sdm845-pinctrl",
|
||||
.pm = &msm_pinctrl_dev_pm_ops,
|
||||
.of_match_table = sdm845_pinctrl_of_match,
|
||||
+ .acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match),
|
||||
},
|
||||
.probe = sdm845_pinctrl_probe,
|
||||
.remove = msm_pinctrl_remove,
|
||||
--
|
||||
2.21.0
|
|
@ -1,35 +0,0 @@
|
|||
From 02260a619efe574d0f6c2a4420b8b76c6802294e Mon Sep 17 00:00:00 2001
|
||||
From: Ezequiel Garcia <ezequiel@collabora.com>
|
||||
Date: Fri, 15 Feb 2019 12:25:39 -0300
|
||||
Subject: arm64: dts: rockchip: Enable tsadc device on rock960
|
||||
|
||||
Enable the thermal sensor. This device also provides
|
||||
temperature shutdown protection. The shutdown value is
|
||||
set at 110C, as tested by the vendor.
|
||||
|
||||
Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com>
|
||||
Signed-off-by: Heiko Stuebner <heiko@sntech.de>
|
||||
---
|
||||
arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
|
||||
index e40e66e33a5e..2927db4dda9d 100644
|
||||
--- a/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
|
||||
+++ b/arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi
|
||||
@@ -527,6 +527,13 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&tsadc {
|
||||
+ rockchip,hw-tshut-mode = <1>;
|
||||
+ rockchip,hw-tshut-polarity = <1>;
|
||||
+ rockchip,hw-tshut-temp = <110000>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&uart0 {
|
||||
pinctrl-names = "default";
|
||||
pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
|
||||
--
|
||||
cgit 1.2-0.3.lf.el7
|
|
@ -0,0 +1,83 @@
|
|||
From 9ceb22fbffbad710db2c91ed32e4e73503f13301 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Tue, 25 Jun 2019 19:12:10 +0100
|
||||
Subject: [PATCH] scsi: ufs-qcom: Add support for platforms booting ACPI
|
||||
|
||||
New Qualcomm AArch64 based laptops are now available which use UFS
|
||||
as their primary data storage medium. These devices are supplied
|
||||
with ACPI support out of the box. This patch ensures the Qualcomm
|
||||
UFS driver will be bound when the "QCOM24A5" H/W device is
|
||||
advertised as present.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/scsi/ufs/ufs-qcom.c | 23 ++++++++++++++++++++---
|
||||
1 file changed, 20 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/drivers/scsi/ufs/ufs-qcom.c b/drivers/scsi/ufs/ufs-qcom.c
|
||||
index b4d1b5c22987..ee4b1da1e223 100644
|
||||
--- a/drivers/scsi/ufs/ufs-qcom.c
|
||||
+++ b/drivers/scsi/ufs/ufs-qcom.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (c) 2013-2016, Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/time.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
@@ -161,6 +162,9 @@ static int ufs_qcom_init_lane_clks(struct ufs_qcom_host *host)
|
||||
int err = 0;
|
||||
struct device *dev = host->hba->dev;
|
||||
|
||||
+ if (has_acpi_companion(dev))
|
||||
+ return 0;
|
||||
+
|
||||
err = ufs_qcom_host_clk_get(dev, "rx_lane0_sync_clk",
|
||||
&host->rx_l0_sync_clk, false);
|
||||
if (err)
|
||||
@@ -1127,9 +1131,13 @@ static int ufs_qcom_init(struct ufs_hba *hba)
|
||||
__func__, err);
|
||||
goto out_variant_clear;
|
||||
} else if (IS_ERR(host->generic_phy)) {
|
||||
- err = PTR_ERR(host->generic_phy);
|
||||
- dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
|
||||
- goto out_variant_clear;
|
||||
+ if (has_acpi_companion(dev)) {
|
||||
+ host->generic_phy = NULL;
|
||||
+ } else {
|
||||
+ err = PTR_ERR(host->generic_phy);
|
||||
+ dev_err(dev, "%s: PHY get failed %d\n", __func__, err);
|
||||
+ goto out_variant_clear;
|
||||
+ }
|
||||
}
|
||||
|
||||
err = ufs_qcom_bus_register(host);
|
||||
@@ -1599,6 +1607,14 @@ static const struct of_device_id ufs_qcom_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, ufs_qcom_of_match);
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id ufs_qcom_acpi_match[] = {
|
||||
+ { "QCOM24A5" },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, ufs_qcom_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static const struct dev_pm_ops ufs_qcom_pm_ops = {
|
||||
.suspend = ufshcd_pltfrm_suspend,
|
||||
.resume = ufshcd_pltfrm_resume,
|
||||
@@ -1615,6 +1631,7 @@ static struct platform_driver ufs_qcom_pltform = {
|
||||
.name = "ufshcd-qcom",
|
||||
.pm = &ufs_qcom_pm_ops,
|
||||
.of_match_table = of_match_ptr(ufs_qcom_of_match),
|
||||
+ .acpi_match_table = ACPI_PTR(ufs_qcom_acpi_match),
|
||||
},
|
||||
};
|
||||
module_platform_driver(ufs_qcom_pltform);
|
||||
--
|
||||
2.21.0
|
||||
|
|
@ -0,0 +1,185 @@
|
|||
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: 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 0546514BB
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
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 E6FEC288DC
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
Wed, 26 Jun 2019 15:49:01 +0000 (UTC)
|
||||
Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486)
|
||||
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:
|
||||
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 73ADC288DC
|
||||
for <patchwork-linux-arm@patchwork.kernel.org>;
|
||||
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=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 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 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=1561564113;
|
||||
bh=mWLTbdtxGfwZ13vnfxlQDfv6DzwTGycBEng3zNk/XaE=;
|
||||
h=X-UI-Sender-Class:From:To:Cc:Subject:Date;
|
||||
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
|
||||
(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 V2] staging: bcm2835-camera: Restore return behavior of
|
||||
ctrl_set_bitrate()
|
||||
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: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-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
|
||||
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, 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>
|
||||
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().
|
||||
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
|
||||
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, 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>
|
||||
---
|
||||
.../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..c251164 100644
|
||||
--- a/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
||||
+++ b/drivers/staging/vc04_services/bcm2835-camera/controls.c
|
||||
@@ -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));
|
||||
+ 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;
|
||||
}
|
||||
|
||||
static int ctrl_set_bitrate_mode(struct bm2835_mmal_dev *dev,
|
File diff suppressed because it is too large
Load Diff
|
@ -1 +0,0 @@
|
|||
# CONFIG_PCIE_ROCKCHIP is not set
|
|
@ -0,0 +1 @@
|
|||
CONFIG_ACPI_AC=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_ACPI_BATTERY=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_COMMON_CLK_BD718XX=m
|
|
@ -0,0 +1 @@
|
|||
CONFIG_MFD_ROHM_BD718XX=y
|
|
@ -0,0 +1 @@
|
|||
CONFIG_REGULATOR_BD718XX=m
|
|
@ -1 +0,0 @@
|
|||
CONFIG_MFD_88PM800=m
|
|
@ -1 +0,0 @@
|
|||
# CONFIG_REGULATOR_88PM800 is not set
|
2
gitrev
2
gitrev
|
@ -1 +1 @@
|
|||
bed3c0d84e7e25c8e0964d297794f4c215b01f33
|
||||
6fbc7275c7a9ba97877050335f290341a1fd8dbf
|
||||
|
|
|
@ -36,6 +36,7 @@ CONFIG_ACCESSIBILITY=y
|
|||
CONFIG_ACENIC=m
|
||||
# CONFIG_ACENIC_OMIT_TIGON_I is not set
|
||||
# CONFIG_ACORN_PARTITION is not set
|
||||
CONFIG_ACPI_AC=y
|
||||
CONFIG_ACPI_ALS=m
|
||||
# CONFIG_ACPI_APEI_EINJ is not set
|
||||
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
|
||||
|
@ -44,6 +45,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
|
|||
CONFIG_ACPI_APEI_PCIEAER=y
|
||||
CONFIG_ACPI_APEI_SEA=y
|
||||
CONFIG_ACPI_APEI=y
|
||||
CONFIG_ACPI_BATTERY=y
|
||||
CONFIG_ACPI_BGRT=y
|
||||
CONFIG_ACPI_BUTTON=y
|
||||
CONFIG_ACPI_CONFIGFS=m
|
||||
|
@ -974,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
|
||||
|
@ -3350,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
|
||||
|
@ -4387,7 +4390,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
|
||||
|
@ -4861,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
|
||||
|
|
|
@ -36,6 +36,7 @@ CONFIG_ACCESSIBILITY=y
|
|||
CONFIG_ACENIC=m
|
||||
# CONFIG_ACENIC_OMIT_TIGON_I is not set
|
||||
# CONFIG_ACORN_PARTITION is not set
|
||||
CONFIG_ACPI_AC=y
|
||||
CONFIG_ACPI_ALS=m
|
||||
# CONFIG_ACPI_APEI_EINJ is not set
|
||||
# CONFIG_ACPI_APEI_ERST_DEBUG is not set
|
||||
|
@ -44,6 +45,7 @@ CONFIG_ACPI_APEI_MEMORY_FAILURE=y
|
|||
CONFIG_ACPI_APEI_PCIEAER=y
|
||||
CONFIG_ACPI_APEI_SEA=y
|
||||
CONFIG_ACPI_APEI=y
|
||||
CONFIG_ACPI_BATTERY=y
|
||||
CONFIG_ACPI_BGRT=y
|
||||
CONFIG_ACPI_BUTTON=y
|
||||
CONFIG_ACPI_CONFIGFS=m
|
||||
|
@ -974,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
|
||||
|
@ -3331,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
|
||||
|
@ -4367,7 +4370,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
|
||||
|
@ -4840,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
|
||||
|
|
|
@ -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
|
||||
|
@ -4506,7 +4506,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
|
||||
|
@ -4976,7 +4975,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
|
||||
|
|
|
@ -4342,7 +4342,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
|
||||
|
|
|
@ -4323,7 +4323,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
|
||||
|
|
|
@ -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
|
||||
|
@ -4487,7 +4487,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
|
||||
|
@ -4956,7 +4955,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
|
||||
|
|
|
@ -3313,8 +3313,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
|
||||
|
|
|
@ -3294,8 +3294,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
|
||||
|
|
|
@ -3046,8 +3046,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
|
||||
|
|
|
@ -3025,8 +3025,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
|
||||
|
|
|
@ -3020,8 +3020,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
|
||||
|
|
|
@ -2999,8 +2999,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
|
||||
|
|
|
@ -3361,8 +3361,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
|
||||
|
|
|
@ -3342,8 +3342,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
|
||||
|
|
64
kernel.spec
64
kernel.spec
|
@ -22,6 +22,8 @@ Summary: The Linux kernel
|
|||
|
||||
%if %{zipmodules}
|
||||
%global zipsed -e 's/\.ko$/\.ko.xz/'
|
||||
# for parallel xz processes, replace with 1 to go back to single process
|
||||
%global zcpu `nproc --all`
|
||||
%endif
|
||||
|
||||
# define buildid .local
|
||||
|
@ -67,9 +69,9 @@ Summary: The Linux kernel
|
|||
# The next upstream release sublevel (base_sublevel+1)
|
||||
%define upstream_sublevel %(echo $((%{base_sublevel} + 1)))
|
||||
# The rc snapshot level
|
||||
%global rcrev 5
|
||||
%global rcrev 7
|
||||
# The git snapshot level
|
||||
%define gitrev 2
|
||||
%define gitrev 0
|
||||
# Set rpm version accordingly
|
||||
%define rpmversion 5.%{upstream_sublevel}.0
|
||||
%endif
|
||||
|
@ -122,7 +124,7 @@ Summary: The Linux kernel
|
|||
# Set debugbuildsenabled to 1 for production (build separate debug kernels)
|
||||
# and 0 for rawhide (all kernels are debug kernels).
|
||||
# See also 'make debug' and 'make release'.
|
||||
%define debugbuildsenabled 0
|
||||
%define debugbuildsenabled 1
|
||||
|
||||
# Kernel headers are being split out into a separate package
|
||||
%if 0%{?fedora}
|
||||
|
@ -142,7 +144,7 @@ Summary: The Linux kernel
|
|||
# pkg_release is what we'll fill in for the rpm Release: field
|
||||
%if 0%{?released_kernel}
|
||||
|
||||
%define pkg_release %{fedora_build}%{?buildid}.2.riscv64%{?dist}
|
||||
%define pkg_release %{fedora_build}%{?buildid}.0.riscv64%{?dist}
|
||||
|
||||
%else
|
||||
|
||||
|
@ -157,7 +159,7 @@ Summary: The Linux kernel
|
|||
%else
|
||||
%define gittag .git0
|
||||
%endif
|
||||
%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.2.riscv64%{?dist}
|
||||
%define pkg_release 0%{?rctag}%{?gittag}.%{fedora_build}%{?buildid}.0.riscv64%{?dist}
|
||||
|
||||
%endif
|
||||
|
||||
|
@ -561,17 +563,27 @@ 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
|
||||
|
||||
Patch306: arm64-rock960-enable-tsadc.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
|
||||
|
||||
Patch331: watchdog-bcm2835_wdt-Fix-module-autoload.patch
|
||||
|
||||
Patch332: bcm2835-camera-Restore-return-behavior-of-ctrl_set_bitrate.patch
|
||||
|
||||
Patch333: bcm2835-vchiq-use-interruptible-waits.patch
|
||||
|
||||
# Tegra bits
|
||||
Patch340: arm64-tegra-jetson-tx1-fixes.patch
|
||||
|
||||
# qcom bits
|
||||
Patch350: qcom-Provide-support-for-ACPI.patch
|
||||
# QCom ACPI device support pieces
|
||||
Patch350: arm64-qcom-pinctrl-support-for-ACPI.patch
|
||||
Patch351: arm64-acpi-ignore-5.1-fadts-reported-as-5.0.patch
|
||||
Patch352: arm64-acpi-make-ac-and-battery-drivers-available-on-non-x86.patch
|
||||
Patch353: arm64-qcom-DWC3-USB-Add-support-for-ACPI-based-AArch64-Laptops.patch
|
||||
Patch354: arm64-ufs-qcom-Add-support-for-platforms-booting-ACPI.patch
|
||||
|
||||
# 400 - IBM (ppc/s390x) patches
|
||||
|
||||
|
@ -592,12 +604,6 @@ Patch527: v2-powerpc-mm-mark-more-tlb-functions-as-__always_inline.patch
|
|||
|
||||
Patch530: crypto-ghash-fix-unaligned-memory-access-in-ghash_setkey.patch
|
||||
|
||||
# Fix for new Logitech wireless keyboard support in 5.2, submitted upstream
|
||||
Patch534: 0001-HID-logitech-dj-Fix-forwarding-of-very-long-HID-repo.patch
|
||||
|
||||
# Fix for broken bluetooth, reverted in upstream stable, not yet in Torvald's tree
|
||||
Patch535: Revert-Bluetooth-Align-minimum-encryption-key-size.patch
|
||||
|
||||
# RISC-V SECCOMP support v2 (not posted on linux-riscv yet)
|
||||
Patch550: 0001-riscv-add-SECCOMP-support.patch
|
||||
|
||||
|
@ -1574,7 +1580,7 @@ BuildKernel %make_target %kernel_image %{_use_vdso}
|
|||
fi \
|
||||
fi \
|
||||
if [ "%{zipmodules}" -eq "1" ]; then \
|
||||
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs xz; \
|
||||
find $RPM_BUILD_ROOT/lib/modules/ -type f -name '*.ko' | xargs -P%{zcpu} xz; \
|
||||
fi \
|
||||
%{nil}
|
||||
|
||||
|
@ -1839,6 +1845,34 @@ fi
|
|||
#
|
||||
#
|
||||
%changelog
|
||||
* Mon Jul 01 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc7.git0.1
|
||||
- Linux v5.2-rc7
|
||||
|
||||
* Mon Jul 01 2019 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||
- Disable debugging options.
|
||||
|
||||
* Fri Jun 28 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git2.1
|
||||
- Linux v5.2-rc6-93-g556e2f6020bf
|
||||
|
||||
* Tue Jun 25 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git1.1
|
||||
- Linux v5.2-rc6-15-g249155c20f9b
|
||||
- Reenable debugging options.
|
||||
|
||||
* Mon Jun 24 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc6.git0.1
|
||||
- Linux v5.2-rc6
|
||||
|
||||
* Mon Jun 24 2019 Justin M. Forbes <jforbes@fedoraproject.org>
|
||||
- Disable debugging options.
|
||||
|
||||
* Sat Jun 22 2019 Peter Robinson <pbrobinson@fedoraproject.org>
|
||||
- QCom ACPI fixes
|
||||
|
||||
* Fri Jun 21 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git4.1
|
||||
- Linux v5.2-rc5-290-g4ae004a9bca8
|
||||
|
||||
* Thu Jun 20 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git3.1
|
||||
- Linux v5.2-rc5-239-g241e39004581
|
||||
|
||||
* Wed Jun 19 2019 Justin M. Forbes <jforbes@fedoraproject.org> - 5.2.0-0.rc5.git2.1
|
||||
- Linux v5.2-rc5-224-gbed3c0d84e7e
|
||||
|
||||
|
|
|
@ -1,841 +0,0 @@
|
|||
From 0ab5b9df0c9f07ae747ddc678d4e423c42f69624 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:06 +0100
|
||||
Subject: [PATCH 1/8] i2c: i2c-qcom-geni: Provide support for ACPI
|
||||
|
||||
Add a match table to allow automatic probing of ACPI device
|
||||
QCOM0220. Ignore clock attainment errors. Set default clock
|
||||
frequency value.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 15 ++++++++++++++-
|
||||
1 file changed, 14 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index db075bc0d952..9e3b8a98688d 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
#include <linux/err.h>
|
||||
@@ -483,6 +484,14 @@ static const struct i2c_algorithm geni_i2c_algo = {
|
||||
.functionality = geni_i2c_func,
|
||||
};
|
||||
|
||||
+#ifdef CONFIG_ACPI
|
||||
+static const struct acpi_device_id geni_i2c_acpi_match[] = {
|
||||
+ { "QCOM0220"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, geni_i2c_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static int geni_i2c_probe(struct platform_device *pdev)
|
||||
{
|
||||
struct geni_i2c_dev *gi2c;
|
||||
@@ -502,7 +511,7 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return PTR_ERR(gi2c->se.base);
|
||||
|
||||
gi2c->se.clk = devm_clk_get(&pdev->dev, "se");
|
||||
- if (IS_ERR(gi2c->se.clk)) {
|
||||
+ if (IS_ERR(gi2c->se.clk) && !has_acpi_companion(&pdev->dev)) {
|
||||
ret = PTR_ERR(gi2c->se.clk);
|
||||
dev_err(&pdev->dev, "Err getting SE Core clk %d\n", ret);
|
||||
return ret;
|
||||
@@ -516,6 +525,9 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
gi2c->clk_freq_out = KHZ(100);
|
||||
}
|
||||
|
||||
+ if (has_acpi_companion(&pdev->dev))
|
||||
+ ACPI_COMPANION_SET(&gi2c->adap.dev, ACPI_COMPANION(&pdev->dev));
|
||||
+
|
||||
gi2c->irq = platform_get_irq(pdev, 0);
|
||||
if (gi2c->irq < 0) {
|
||||
dev_err(&pdev->dev, "IRQ error for i2c-geni\n");
|
||||
@@ -660,6 +672,7 @@ static struct platform_driver geni_i2c_driver = {
|
||||
.name = "geni_i2c",
|
||||
.pm = &geni_i2c_pm_ops,
|
||||
.of_match_table = geni_i2c_dt_match,
|
||||
+ .acpi_match_table = ACPI_PTR(geni_i2c_acpi_match),
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 5a0639fed6e05977d85c4824354e73d0a2fa92ef Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:07 +0100
|
||||
Subject: [PATCH 2/8] i2c: i2c-qcom-geni: Signify successful driver probe
|
||||
|
||||
The Qualcomm Geni I2C driver currently probes silently which can be
|
||||
confusing when debugging potential issues. Add a low level (INFO)
|
||||
print when each I2C controller is successfully initially set-up.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/i2c/busses/i2c-qcom-geni.c | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/i2c/busses/i2c-qcom-geni.c b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
index 9e3b8a98688d..a89bfce5388e 100644
|
||||
--- a/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
+++ b/drivers/i2c/busses/i2c-qcom-geni.c
|
||||
@@ -596,6 +596,8 @@ static int geni_i2c_probe(struct platform_device *pdev)
|
||||
return ret;
|
||||
}
|
||||
|
||||
+ dev_dbg(&pdev->dev, "Geni-I2C adaptor successfully added\n");
|
||||
+
|
||||
return 0;
|
||||
}
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 6f202eb6dbccf3172616a620faf934bf6195a0f9 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:08 +0100
|
||||
Subject: [PATCH 3/8] pinctrl: msm: Add ability for drivers to supply a
|
||||
reserved GPIO list
|
||||
|
||||
When booting MSM based platforms with Device Tree or some ACPI
|
||||
implementations, it is possible to provide a list of reserved pins
|
||||
via the 'gpio-reserved-ranges' and 'gpios' properties respectively.
|
||||
However some ACPI tables are not populated with this information,
|
||||
thus it has to come from a knowledgable device driver instead.
|
||||
|
||||
Here we provide the MSM common driver with additional support to
|
||||
parse this informtion and correctly populate the widely used
|
||||
'valid_mask'.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/pinctrl-msm.c | 18 ++++++++++++++++++
|
||||
drivers/pinctrl/qcom/pinctrl-msm.h | 1 +
|
||||
2 files changed, 19 insertions(+)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.c b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
index 6e319bcc2326..80682b017a47 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.c
|
||||
@@ -599,8 +599,23 @@ static int msm_gpio_init_valid_mask(struct gpio_chip *chip)
|
||||
int ret;
|
||||
unsigned int len, i;
|
||||
unsigned int max_gpios = pctrl->soc->ngpios;
|
||||
+ const int *reserved = pctrl->soc->reserved_gpios;
|
||||
u16 *tmp;
|
||||
|
||||
+ /* Driver provided reserved list overrides DT and ACPI */
|
||||
+ if (reserved) {
|
||||
+ bitmap_fill(chip->valid_mask, max_gpios);
|
||||
+ for (i = 0; reserved[i] >= 0; i++) {
|
||||
+ if (i >= max_gpios || reserved[i] >= max_gpios) {
|
||||
+ dev_err(pctrl->dev, "invalid list of reserved GPIOs\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ clear_bit(reserved[i], chip->valid_mask);
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+ }
|
||||
+
|
||||
/* The number of GPIOs in the ACPI tables */
|
||||
len = ret = device_property_read_u16_array(pctrl->dev, "gpios", NULL,
|
||||
0);
|
||||
@@ -956,6 +971,9 @@ static void msm_gpio_irq_handler(struct irq_desc *desc)
|
||||
|
||||
static bool msm_gpio_needs_valid_mask(struct msm_pinctrl *pctrl)
|
||||
{
|
||||
+ if (pctrl->soc->reserved_gpios)
|
||||
+ return true;
|
||||
+
|
||||
return device_property_read_u16_array(pctrl->dev, "gpios", NULL, 0) > 0;
|
||||
}
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-msm.h b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
index b724581c605c..48569cda8471 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-msm.h
|
||||
@@ -113,6 +113,7 @@ struct msm_pinctrl_soc_data {
|
||||
bool pull_no_keeper;
|
||||
const char *const *tiles;
|
||||
unsigned int ntiles;
|
||||
+ const int *reserved_gpios;
|
||||
};
|
||||
|
||||
extern const struct dev_pm_ops msm_pinctrl_dev_pm_ops;
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 568ff4c9723d761164416fdf876232f5b14cf3ad Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:09 +0100
|
||||
Subject: [PATCH 4/8] pinctrl: qcom: sdm845: Provide ACPI support
|
||||
|
||||
This patch provides basic support for booting with ACPI instead
|
||||
of the currently supported Device Tree. When doing so there are a
|
||||
couple of differences which we need to taken into consideration.
|
||||
|
||||
Firstly, the SDM850 ACPI tables omit information pertaining to the
|
||||
4 reserved GPIOs on the platform. If Linux attempts to touch/
|
||||
initialise any of these lines, the firmware will restart the
|
||||
platform.
|
||||
|
||||
Secondly, when booting with ACPI, it is expected that the firmware
|
||||
will set-up things like; Regulators, Clocks, Pin Functions, etc in
|
||||
their ideal configuration. Thus, the possible Pin Functions
|
||||
available to this platform are not advertised when providing the
|
||||
higher GPIOD/Pinctrl APIs with pin information.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/pinctrl/qcom/Kconfig | 2 +-
|
||||
drivers/pinctrl/qcom/pinctrl-sdm845.c | 36 ++++++++++++++++++++++++++-
|
||||
2 files changed, 36 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/pinctrl/qcom/Kconfig b/drivers/pinctrl/qcom/Kconfig
|
||||
index 890d0a3a790b..27ab585a639c 100644
|
||||
--- a/drivers/pinctrl/qcom/Kconfig
|
||||
+++ b/drivers/pinctrl/qcom/Kconfig
|
||||
@@ -169,7 +169,7 @@ config PINCTRL_SDM660
|
||||
|
||||
config PINCTRL_SDM845
|
||||
tristate "Qualcomm Technologies Inc SDM845 pin controller driver"
|
||||
- depends on GPIOLIB && OF
|
||||
+ depends on GPIOLIB && (OF || ACPI)
|
||||
select PINCTRL_MSM
|
||||
help
|
||||
This is the pinctrl, pinmux, pinconf and gpiolib driver for the
|
||||
diff --git a/drivers/pinctrl/qcom/pinctrl-sdm845.c b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
index c97f20fca5fd..98a438dba711 100644
|
||||
--- a/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
+++ b/drivers/pinctrl/qcom/pinctrl-sdm845.c
|
||||
@@ -3,6 +3,7 @@
|
||||
* Copyright (c) 2016-2018, The Linux Foundation. All rights reserved.
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/module.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/platform_device.h>
|
||||
@@ -1277,6 +1278,10 @@ static const struct msm_pingroup sdm845_groups[] = {
|
||||
UFS_RESET(ufs_reset, 0x99f000),
|
||||
};
|
||||
|
||||
+static const int sdm845_acpi_reserved_gpios[] = {
|
||||
+ 0, 1, 2, 3, 81, 82, 83, 84, -1
|
||||
+};
|
||||
+
|
||||
static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.pins = sdm845_pins,
|
||||
.npins = ARRAY_SIZE(sdm845_pins),
|
||||
@@ -1287,11 +1292,39 @@ static const struct msm_pinctrl_soc_data sdm845_pinctrl = {
|
||||
.ngpios = 150,
|
||||
};
|
||||
|
||||
+static const struct msm_pinctrl_soc_data sdm845_acpi_pinctrl = {
|
||||
+ .pins = sdm845_pins,
|
||||
+ .npins = ARRAY_SIZE(sdm845_pins),
|
||||
+ .groups = sdm845_groups,
|
||||
+ .ngroups = ARRAY_SIZE(sdm845_groups),
|
||||
+ .reserved_gpios = sdm845_acpi_reserved_gpios,
|
||||
+ .ngpios = 150,
|
||||
+};
|
||||
+
|
||||
static int sdm845_pinctrl_probe(struct platform_device *pdev)
|
||||
{
|
||||
- return msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ int ret;
|
||||
+
|
||||
+ if (pdev->dev.of_node) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_pinctrl);
|
||||
+ } else if (has_acpi_companion(&pdev->dev)) {
|
||||
+ ret = msm_pinctrl_probe(pdev, &sdm845_acpi_pinctrl);
|
||||
+ } else {
|
||||
+ dev_err(&pdev->dev, "DT and ACPI disabled\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+
|
||||
+ return ret;
|
||||
}
|
||||
|
||||
+#if CONFIG_ACPI
|
||||
+static const struct acpi_device_id sdm845_pinctrl_acpi_match[] = {
|
||||
+ { "QCOM0217"},
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, sdm845_pinctrl_acpi_match);
|
||||
+#endif
|
||||
+
|
||||
static const struct of_device_id sdm845_pinctrl_of_match[] = {
|
||||
{ .compatible = "qcom,sdm845-pinctrl", },
|
||||
{ },
|
||||
@@ -1302,6 +1335,7 @@ static struct platform_driver sdm845_pinctrl_driver = {
|
||||
.name = "sdm845-pinctrl",
|
||||
.pm = &msm_pinctrl_dev_pm_ops,
|
||||
.of_match_table = sdm845_pinctrl_of_match,
|
||||
+ .acpi_match_table = ACPI_PTR(sdm845_pinctrl_acpi_match),
|
||||
},
|
||||
.probe = sdm845_pinctrl_probe,
|
||||
.remove = msm_pinctrl_remove,
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 1960f541ea437ed1c704db11b9ca24a5248b31de Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:10 +0100
|
||||
Subject: [PATCH 5/8] soc: qcom: geni: Add support for ACPI
|
||||
|
||||
When booting with ACPI as the active set of configuration tables,
|
||||
all; clocks, regulators, pin functions ect are expected to be at
|
||||
their ideal values/levels/rates, thus the associated frameworks
|
||||
are unavailable. Ensure calls to these APIs are shielded when
|
||||
ACPI is enabled.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Acked-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
|
||||
---
|
||||
drivers/soc/qcom/qcom-geni-se.c | 21 +++++++++++++++------
|
||||
1 file changed, 15 insertions(+), 6 deletions(-)
|
||||
|
||||
diff --git a/drivers/soc/qcom/qcom-geni-se.c b/drivers/soc/qcom/qcom-geni-se.c
|
||||
index 6b8ef01472e9..d5cf953b4337 100644
|
||||
--- a/drivers/soc/qcom/qcom-geni-se.c
|
||||
+++ b/drivers/soc/qcom/qcom-geni-se.c
|
||||
@@ -1,6 +1,7 @@
|
||||
// SPDX-License-Identifier: GPL-2.0
|
||||
// Copyright (c) 2017-2018, The Linux Foundation. All rights reserved.
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/clk.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/dma-mapping.h>
|
||||
@@ -450,6 +451,9 @@ int geni_se_resources_off(struct geni_se *se)
|
||||
{
|
||||
int ret;
|
||||
|
||||
+ if (has_acpi_companion(se->dev))
|
||||
+ return 0;
|
||||
+
|
||||
ret = pinctrl_pm_select_sleep_state(se->dev);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -487,6 +491,9 @@ int geni_se_resources_on(struct geni_se *se)
|
||||
{
|
||||
int ret;
|
||||
|
||||
+ if (has_acpi_companion(se->dev))
|
||||
+ return 0;
|
||||
+
|
||||
ret = geni_se_clks_on(se);
|
||||
if (ret)
|
||||
return ret;
|
||||
@@ -724,12 +731,14 @@ static int geni_se_probe(struct platform_device *pdev)
|
||||
if (IS_ERR(wrapper->base))
|
||||
return PTR_ERR(wrapper->base);
|
||||
|
||||
- wrapper->ahb_clks[0].id = "m-ahb";
|
||||
- wrapper->ahb_clks[1].id = "s-ahb";
|
||||
- ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
|
||||
- if (ret) {
|
||||
- dev_err(dev, "Err getting AHB clks %d\n", ret);
|
||||
- return ret;
|
||||
+ if (!has_acpi_companion(&pdev->dev)) {
|
||||
+ wrapper->ahb_clks[0].id = "m-ahb";
|
||||
+ wrapper->ahb_clks[1].id = "s-ahb";
|
||||
+ ret = devm_clk_bulk_get(dev, NUM_AHB_CLKS, wrapper->ahb_clks);
|
||||
+ if (ret) {
|
||||
+ dev_err(dev, "Err getting AHB clks %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
}
|
||||
|
||||
dev_set_drvdata(dev, wrapper);
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 0b10a369e159e4b76d1a786f613a2f061cdc3246 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Mon, 10 Jun 2019 10:31:02 +0100
|
||||
Subject: [PATCH 6/8] usb: dwc3: qcom: Add support for booting with ACPI
|
||||
|
||||
In Linux, the DWC3 core exists as its own independent platform device.
|
||||
Thus when describing relationships in Device Tree, the current default
|
||||
boot configuration table option, the DWC3 core often resides as a child
|
||||
of the platform specific node. Both of which are given their own
|
||||
address space descriptions and the drivers can be mostly agnostic to
|
||||
each other.
|
||||
|
||||
However, other Operating Systems have taken a more monolithic approach,
|
||||
which is evident in the configuration ACPI tables for the Qualcomm
|
||||
Snapdragon SDM850, where all DWC3 (core and platform) components are
|
||||
described under a single IO memory region.
|
||||
|
||||
To ensure successful booting using the supplied ACPI tables, we need to
|
||||
devise a way to chop up the address regions provided and subsequently
|
||||
register the DWC3 core with the resultant information, which is
|
||||
precisely what this patch aims to achieve.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
drivers/usb/dwc3/Kconfig | 2 +-
|
||||
drivers/usb/dwc3/dwc3-qcom.c | 206 ++++++++++++++++++++++++++++++-----
|
||||
2 files changed, 179 insertions(+), 29 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/dwc3/Kconfig b/drivers/usb/dwc3/Kconfig
|
||||
index 4a62045cc812..89abc6078703 100644
|
||||
--- a/drivers/usb/dwc3/Kconfig
|
||||
+++ b/drivers/usb/dwc3/Kconfig
|
||||
@@ -128,7 +128,7 @@ config USB_DWC3_QCOM
|
||||
tristate "Qualcomm Platform"
|
||||
depends on ARCH_QCOM || COMPILE_TEST
|
||||
depends on EXTCON || !EXTCON
|
||||
- depends on OF
|
||||
+ depends on (OF || ACPI)
|
||||
default USB_DWC3
|
||||
help
|
||||
Some Qualcomm SoCs use DesignWare Core IP for USB2/3
|
||||
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
index 184df4daa590..1e1f12b7991d 100644
|
||||
--- a/drivers/usb/dwc3/dwc3-qcom.c
|
||||
+++ b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
@@ -4,6 +4,7 @@
|
||||
* Inspired by dwc3-of-simple.c
|
||||
*/
|
||||
|
||||
+#include <linux/acpi.h>
|
||||
#include <linux/io.h>
|
||||
#include <linux/of.h>
|
||||
#include <linux/clk.h>
|
||||
@@ -38,6 +39,20 @@
|
||||
#define PWR_EVNT_LPM_IN_L2_MASK BIT(4)
|
||||
#define PWR_EVNT_LPM_OUT_L2_MASK BIT(5)
|
||||
|
||||
+#define SDM845_QSCRATCH_BASE_OFFSET 0xf8800
|
||||
+#define SDM845_QSCRATCH_SIZE 0x400
|
||||
+#define SDM845_DWC3_CORE_SIZE 0xcd00
|
||||
+
|
||||
+struct dwc3_acpi_pdata {
|
||||
+ u32 qscratch_base_offset;
|
||||
+ u32 qscratch_base_size;
|
||||
+ u32 dwc3_core_base_size;
|
||||
+ int hs_phy_irq_index;
|
||||
+ int dp_hs_phy_irq_index;
|
||||
+ int dm_hs_phy_irq_index;
|
||||
+ int ss_phy_irq_index;
|
||||
+};
|
||||
+
|
||||
struct dwc3_qcom {
|
||||
struct device *dev;
|
||||
void __iomem *qscratch_base;
|
||||
@@ -56,6 +71,8 @@ struct dwc3_qcom {
|
||||
struct notifier_block vbus_nb;
|
||||
struct notifier_block host_nb;
|
||||
|
||||
+ const struct dwc3_acpi_pdata *acpi_pdata;
|
||||
+
|
||||
enum usb_dr_mode mode;
|
||||
bool is_suspended;
|
||||
bool pm_suspended;
|
||||
@@ -300,12 +317,27 @@ static void dwc3_qcom_select_utmi_clk(struct dwc3_qcom *qcom)
|
||||
PIPE_UTMI_CLK_DIS);
|
||||
}
|
||||
|
||||
+static int dwc3_qcom_get_irq(struct platform_device *pdev,
|
||||
+ const char *name, int num)
|
||||
+{
|
||||
+ struct device_node *np = pdev->dev.of_node;
|
||||
+ int ret;
|
||||
+
|
||||
+ if (np)
|
||||
+ ret = platform_get_irq_byname(pdev, name);
|
||||
+ else
|
||||
+ ret = platform_get_irq(pdev, num);
|
||||
+
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
static int dwc3_qcom_setup_irq(struct platform_device *pdev)
|
||||
{
|
||||
struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
|
||||
+ const struct dwc3_acpi_pdata *pdata = qcom->acpi_pdata;
|
||||
int irq, ret;
|
||||
-
|
||||
- irq = platform_get_irq_byname(pdev, "hs_phy_irq");
|
||||
+ irq = dwc3_qcom_get_irq(pdev, "hs_phy_irq",
|
||||
+ pdata ? pdata->hs_phy_irq_index : -1);
|
||||
if (irq > 0) {
|
||||
/* Keep wakeup interrupts disabled until suspend */
|
||||
irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
||||
@@ -320,7 +352,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
|
||||
qcom->hs_phy_irq = irq;
|
||||
}
|
||||
|
||||
- irq = platform_get_irq_byname(pdev, "dp_hs_phy_irq");
|
||||
+ irq = dwc3_qcom_get_irq(pdev, "dp_hs_phy_irq",
|
||||
+ pdata ? pdata->dp_hs_phy_irq_index : -1);
|
||||
if (irq > 0) {
|
||||
irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
||||
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
|
||||
@@ -334,7 +367,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
|
||||
qcom->dp_hs_phy_irq = irq;
|
||||
}
|
||||
|
||||
- irq = platform_get_irq_byname(pdev, "dm_hs_phy_irq");
|
||||
+ irq = dwc3_qcom_get_irq(pdev, "dm_hs_phy_irq",
|
||||
+ pdata ? pdata->dm_hs_phy_irq_index : -1);
|
||||
if (irq > 0) {
|
||||
irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
||||
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
|
||||
@@ -348,7 +382,8 @@ static int dwc3_qcom_setup_irq(struct platform_device *pdev)
|
||||
qcom->dm_hs_phy_irq = irq;
|
||||
}
|
||||
|
||||
- irq = platform_get_irq_byname(pdev, "ss_phy_irq");
|
||||
+ irq = dwc3_qcom_get_irq(pdev, "ss_phy_irq",
|
||||
+ pdata ? pdata->ss_phy_irq_index : -1);
|
||||
if (irq > 0) {
|
||||
irq_set_status_flags(irq, IRQ_NOAUTOEN);
|
||||
ret = devm_request_threaded_irq(qcom->dev, irq, NULL,
|
||||
@@ -371,11 +406,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
|
||||
struct device_node *np = dev->of_node;
|
||||
int i;
|
||||
|
||||
- qcom->num_clocks = count;
|
||||
-
|
||||
- if (!count)
|
||||
+ if (!np || !count)
|
||||
return 0;
|
||||
|
||||
+ qcom->num_clocks = count;
|
||||
+
|
||||
qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
|
||||
sizeof(struct clk *), GFP_KERNEL);
|
||||
if (!qcom->clks)
|
||||
@@ -409,12 +444,103 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
|
||||
return 0;
|
||||
}
|
||||
|
||||
-static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
+static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
|
||||
{
|
||||
+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
|
||||
+ struct device *dev = &pdev->dev;
|
||||
+ struct resource *res, *child_res = NULL;
|
||||
+ int irq;
|
||||
+ int ret;
|
||||
+
|
||||
+ qcom->dwc3 = platform_device_alloc("dwc3", PLATFORM_DEVID_AUTO);
|
||||
+ if (!qcom->dwc3)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ qcom->dwc3->dev.parent = dev;
|
||||
+ qcom->dwc3->dev.type = dev->type;
|
||||
+ qcom->dwc3->dev.dma_mask = dev->dma_mask;
|
||||
+ qcom->dwc3->dev.dma_parms = dev->dma_parms;
|
||||
+ qcom->dwc3->dev.coherent_dma_mask = dev->coherent_dma_mask;
|
||||
+
|
||||
+ child_res = kcalloc(2, sizeof(*child_res), GFP_KERNEL);
|
||||
+ if (!child_res)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
+ if (!res) {
|
||||
+ dev_err(&pdev->dev, "failed to get memory resource\n");
|
||||
+ ret = -ENODEV;
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ child_res[0].flags = res->flags;
|
||||
+ child_res[0].start = res->start;
|
||||
+ child_res[0].end = child_res[0].start +
|
||||
+ qcom->acpi_pdata->dwc3_core_base_size;
|
||||
+
|
||||
+ irq = platform_get_irq(pdev, 0);
|
||||
+ child_res[1].flags = IORESOURCE_IRQ;
|
||||
+ child_res[1].start = child_res[1].end = irq;
|
||||
+
|
||||
+ ret = platform_device_add_resources(qcom->dwc3, child_res, 2);
|
||||
+ if (ret) {
|
||||
+ dev_err(&pdev->dev, "failed to add resources\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
+ ret = platform_device_add(qcom->dwc3);
|
||||
+ if (ret)
|
||||
+ dev_err(&pdev->dev, "failed to add device\n");
|
||||
+
|
||||
+out:
|
||||
+ kfree(child_res);
|
||||
+ return ret;
|
||||
+}
|
||||
+
|
||||
+static int dwc3_qcom_of_register_core(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
|
||||
struct device_node *np = pdev->dev.of_node, *dwc3_np;
|
||||
struct device *dev = &pdev->dev;
|
||||
+ int ret;
|
||||
+
|
||||
+ dwc3_np = of_get_child_by_name(np, "dwc3");
|
||||
+ if (!dwc3_np) {
|
||||
+ dev_err(dev, "failed to find dwc3 core child\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ ret = of_platform_populate(np, NULL, NULL, dev);
|
||||
+ if (ret) {
|
||||
+ dev_err(dev, "failed to register dwc3 core - %d\n", ret);
|
||||
+ return ret;
|
||||
+ }
|
||||
+
|
||||
+ qcom->dwc3 = of_find_device_by_node(dwc3_np);
|
||||
+ if (!qcom->dwc3) {
|
||||
+ dev_err(dev, "failed to get dwc3 platform device\n");
|
||||
+ return -ENODEV;
|
||||
+ }
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
+
|
||||
+static const struct dwc3_acpi_pdata sdm845_acpi_pdata = {
|
||||
+ .qscratch_base_offset = SDM845_QSCRATCH_BASE_OFFSET,
|
||||
+ .qscratch_base_size = SDM845_QSCRATCH_SIZE,
|
||||
+ .dwc3_core_base_size = SDM845_DWC3_CORE_SIZE,
|
||||
+ .hs_phy_irq_index = 1,
|
||||
+ .dp_hs_phy_irq_index = 4,
|
||||
+ .dm_hs_phy_irq_index = 3,
|
||||
+ .ss_phy_irq_index = 2
|
||||
+};
|
||||
+
|
||||
+static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
+{
|
||||
+ struct device_node *np = pdev->dev.of_node;
|
||||
+ struct device *dev = &pdev->dev;
|
||||
struct dwc3_qcom *qcom;
|
||||
- struct resource *res;
|
||||
+ struct resource *res, *parent_res = NULL;
|
||||
int ret, i;
|
||||
bool ignore_pipe_clk;
|
||||
|
||||
@@ -425,6 +551,14 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
platform_set_drvdata(pdev, qcom);
|
||||
qcom->dev = &pdev->dev;
|
||||
|
||||
+ if (ACPI_HANDLE(dev)) {
|
||||
+ qcom->acpi_pdata = acpi_device_get_match_data(dev);
|
||||
+ if (!qcom->acpi_pdata) {
|
||||
+ dev_err(&pdev->dev, "no supporting ACPI device data\n");
|
||||
+ return -EINVAL;
|
||||
+ }
|
||||
+ }
|
||||
+
|
||||
qcom->resets = devm_reset_control_array_get_optional_exclusive(dev);
|
||||
if (IS_ERR(qcom->resets)) {
|
||||
ret = PTR_ERR(qcom->resets);
|
||||
@@ -454,7 +588,21 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
res = platform_get_resource(pdev, IORESOURCE_MEM, 0);
|
||||
- qcom->qscratch_base = devm_ioremap_resource(dev, res);
|
||||
+
|
||||
+ if (np) {
|
||||
+ parent_res = res;
|
||||
+ } else {
|
||||
+ parent_res = kmemdup(res, sizeof(struct resource), GFP_KERNEL);
|
||||
+ if (!parent_res)
|
||||
+ return -ENOMEM;
|
||||
+
|
||||
+ parent_res->start = res->start +
|
||||
+ qcom->acpi_pdata->qscratch_base_offset;
|
||||
+ parent_res->end = parent_res->start +
|
||||
+ qcom->acpi_pdata->qscratch_base_size;
|
||||
+ }
|
||||
+
|
||||
+ qcom->qscratch_base = devm_ioremap_resource(dev, parent_res);
|
||||
if (IS_ERR(qcom->qscratch_base)) {
|
||||
dev_err(dev, "failed to map qscratch, err=%d\n", ret);
|
||||
ret = PTR_ERR(qcom->qscratch_base);
|
||||
@@ -462,13 +610,8 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
}
|
||||
|
||||
ret = dwc3_qcom_setup_irq(pdev);
|
||||
- if (ret)
|
||||
- goto clk_disable;
|
||||
-
|
||||
- dwc3_np = of_get_child_by_name(np, "dwc3");
|
||||
- if (!dwc3_np) {
|
||||
- dev_err(dev, "failed to find dwc3 core child\n");
|
||||
- ret = -ENODEV;
|
||||
+ if (ret) {
|
||||
+ dev_err(dev, "failed to setup IRQs, err=%d\n", ret);
|
||||
goto clk_disable;
|
||||
}
|
||||
|
||||
@@ -481,16 +624,13 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
if (ignore_pipe_clk)
|
||||
dwc3_qcom_select_utmi_clk(qcom);
|
||||
|
||||
- ret = of_platform_populate(np, NULL, NULL, dev);
|
||||
- if (ret) {
|
||||
- dev_err(dev, "failed to register dwc3 core - %d\n", ret);
|
||||
- goto clk_disable;
|
||||
- }
|
||||
+ if (np)
|
||||
+ ret = dwc3_qcom_of_register_core(pdev);
|
||||
+ else
|
||||
+ ret = dwc3_qcom_acpi_register_core(pdev);
|
||||
|
||||
- qcom->dwc3 = of_find_device_by_node(dwc3_np);
|
||||
- if (!qcom->dwc3) {
|
||||
- dev_err(&pdev->dev, "failed to get dwc3 platform device\n");
|
||||
- ret = -ENODEV;
|
||||
+ if (ret) {
|
||||
+ dev_err(dev, "failed to register DWC3 Core, err=%d\n", ret);
|
||||
goto depopulate;
|
||||
}
|
||||
|
||||
@@ -514,7 +654,10 @@ static int dwc3_qcom_probe(struct platform_device *pdev)
|
||||
return 0;
|
||||
|
||||
depopulate:
|
||||
- of_platform_depopulate(&pdev->dev);
|
||||
+ if (np)
|
||||
+ of_platform_depopulate(&pdev->dev);
|
||||
+ else
|
||||
+ platform_device_put(pdev);
|
||||
clk_disable:
|
||||
for (i = qcom->num_clocks - 1; i >= 0; i--) {
|
||||
clk_disable_unprepare(qcom->clks[i]);
|
||||
@@ -601,6 +744,12 @@ static const struct of_device_id dwc3_qcom_of_match[] = {
|
||||
};
|
||||
MODULE_DEVICE_TABLE(of, dwc3_qcom_of_match);
|
||||
|
||||
+static const struct acpi_device_id dwc3_qcom_acpi_match[] = {
|
||||
+ { "QCOM2430", (unsigned long)&sdm845_acpi_pdata },
|
||||
+ { },
|
||||
+};
|
||||
+MODULE_DEVICE_TABLE(acpi, dwc3_qcom_acpi_match);
|
||||
+
|
||||
static struct platform_driver dwc3_qcom_driver = {
|
||||
.probe = dwc3_qcom_probe,
|
||||
.remove = dwc3_qcom_remove,
|
||||
@@ -608,6 +757,7 @@ static struct platform_driver dwc3_qcom_driver = {
|
||||
.name = "dwc3-qcom",
|
||||
.pm = &dwc3_qcom_dev_pm_ops,
|
||||
.of_match_table = dwc3_qcom_of_match,
|
||||
+ .acpi_match_table = ACPI_PTR(dwc3_qcom_acpi_match),
|
||||
},
|
||||
};
|
||||
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 2511cdbc0cdd6dea8226fbb984418f06bc1983a9 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:12 +0100
|
||||
Subject: [PATCH 7/8] usb: dwc3: qcom: Start USB in 'host mode' on the SDM845
|
||||
|
||||
When booting with Device Tree, the current default boot configuration
|
||||
table option, the request to boot via 'host mode' comes from the
|
||||
'dr_mode' property. A property of the same name can be used inside
|
||||
ACPI tables too. However it is missing from the SDM845's ACPI tables
|
||||
so we have to supply this information using Platform Device Properties
|
||||
instead.
|
||||
|
||||
This does not change the behaviour of any currently supported devices.
|
||||
The property is only set on ACPI enabled platforms, thus for H/W
|
||||
booting DT, unless a 'dr_mode' property is present, the default is
|
||||
still OTG (On-The-Go) as per [0]. Any new ACPI devices added will
|
||||
also be able to over-ride this implementation by providing a 'dr_mode'
|
||||
property in their ACPI tables. In cases where 'dr_mode' is omitted
|
||||
from the tables AND 'host mode' should not be the default (very
|
||||
unlikely), then we will have to add some way of choosing between them
|
||||
at run time - most likely by ACPI HID.
|
||||
|
||||
[0] Documentation/devicetree/bindings/usb/generic.txt
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
---
|
||||
drivers/usb/dwc3/dwc3-qcom.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
index 1e1f12b7991d..55ba04254e38 100644
|
||||
--- a/drivers/usb/dwc3/dwc3-qcom.c
|
||||
+++ b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
@@ -444,6 +444,11 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
|
||||
return 0;
|
||||
}
|
||||
|
||||
+static const struct property_entry dwc3_qcom_acpi_properties[] = {
|
||||
+ PROPERTY_ENTRY_STRING("dr_mode", "host"),
|
||||
+ {}
|
||||
+};
|
||||
+
|
||||
static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
|
||||
{
|
||||
struct dwc3_qcom *qcom = platform_get_drvdata(pdev);
|
||||
@@ -488,6 +493,13 @@ static int dwc3_qcom_acpi_register_core(struct platform_device *pdev)
|
||||
goto out;
|
||||
}
|
||||
|
||||
+ ret = platform_device_add_properties(qcom->dwc3,
|
||||
+ dwc3_qcom_acpi_properties);
|
||||
+ if (ret < 0) {
|
||||
+ dev_err(&pdev->dev, "failed to add properties\n");
|
||||
+ goto out;
|
||||
+ }
|
||||
+
|
||||
ret = platform_device_add(qcom->dwc3);
|
||||
if (ret)
|
||||
dev_err(&pdev->dev, "failed to add device\n");
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 63a5217702e09f913bcc2d1c98285e7f3d9d1f31 Mon Sep 17 00:00:00 2001
|
||||
From: Lee Jones <lee.jones@linaro.org>
|
||||
Date: Mon, 10 Jun 2019 09:42:13 +0100
|
||||
Subject: [PATCH 8/8] usb: dwc3: qcom: Improve error handling
|
||||
|
||||
dwc3_qcom_clk_init() is called with of_count_phandle_with_args() as an
|
||||
argument. If of_count_phandle_with_args() returns an error, the number
|
||||
of clocks will be a negative value and will lead to undefined behaviour.
|
||||
|
||||
Ensure we check for an error before attempting to blindly use the value.
|
||||
|
||||
Signed-off-by: Lee Jones <lee.jones@linaro.org>
|
||||
Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org>
|
||||
---
|
||||
drivers/usb/dwc3/dwc3-qcom.c | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/dwc3/dwc3-qcom.c b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
index 55ba04254e38..e4dac82abd7d 100644
|
||||
--- a/drivers/usb/dwc3/dwc3-qcom.c
|
||||
+++ b/drivers/usb/dwc3/dwc3-qcom.c
|
||||
@@ -409,6 +409,9 @@ static int dwc3_qcom_clk_init(struct dwc3_qcom *qcom, int count)
|
||||
if (!np || !count)
|
||||
return 0;
|
||||
|
||||
+ if (count < 0)
|
||||
+ return count;
|
||||
+
|
||||
qcom->num_clocks = count;
|
||||
|
||||
qcom->clks = devm_kcalloc(dev, qcom->num_clocks,
|
||||
--
|
||||
2.21.0
|
||||
|
3
sources
3
sources
|
@ -1,3 +1,2 @@
|
|||
SHA512 (linux-5.1.tar.xz) = ae96f347badc95f1f3acf506c52b6cc23c0bd09ce8f4ce6705d4b4058b62593059bba1bc603c8d8b00a2f19131e7e56c31ac62b45883a346fa61d655e178f236
|
||||
SHA512 (patch-5.2-rc5.xz) = ee7caea50dccd299182da1453ca2a6f3f4947d544da81703e00b7f63e7c99d19975d4a34261282bbce36a8cf08060a60e51c095189a3aa43fdc34b67b05004c7
|
||||
SHA512 (patch-5.2-rc5-git2.xz) = c4ec98b8e357e4ff7049c0c73c922922fc708e71f0bae871b4a1c99d82631fe3f498a55931cc3c065454ef79189a0b7dfcff1250de4647c572cedb46714ed6b9
|
||||
SHA512 (patch-5.2-rc7.xz) = 07e23e8003f2c69b194fa59a5bd8ea3d200f7c16d4577c2b55b0e78d48c083c2770c941dbd32221a313c63f3954ac071eef7bce03d85eeaa3f32f78c378841d6
|
||||
|
|
Loading…
Reference in New Issue