summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThorsten Leemhuis <fedora@leemhuis.info>2020-03-06 18:57:38 +0100
committerThorsten Leemhuis <fedora@leemhuis.info>2020-03-06 18:57:38 +0100
commit5dda76897952f6673729d314146f042465f98a83 (patch)
tree90f21a2aa7eb1776f53cc84328352c746860493a
parentc93c7889c0c686240393572a34d20e0c98836753 (diff)
parent5650295ae7d914eb931d3830d91a739dccd0915b (diff)
downloadkernel-5dda76897952f6673729d314146f042465f98a83.tar.gz
kernel-5dda76897952f6673729d314146f042465f98a83.tar.xz
kernel-5dda76897952f6673729d314146f042465f98a83.zip
Merge remote-tracking branch 'origin/master' into rawhide-user-thl-vanilla-fedora
Diffstat
-rw-r--r--ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch168
-rw-r--r--Add-support-for-the-pine64-Pinebook-Pro.patch210
-rw-r--r--gitrev2
-rw-r--r--kernel.spec14
-rw-r--r--regulator-pwm-Don-t-warn-on-probe-deferral.patch99
-rw-r--r--sources1
6 files changed, 301 insertions, 193 deletions
diff --git a/ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch b/ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch
new file mode 100644
index 000000000..dd0087104
--- /dev/null
+++ b/ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch
@@ -0,0 +1,168 @@
+From patchwork Wed Mar 4 13:24:37 2020
+Content-Type: text/plain; charset="utf-8"
+MIME-Version: 1.0
+Content-Transfer-Encoding: 7bit
+X-Patchwork-Submitter: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+X-Patchwork-Id: 11420129
+Return-Path:
+ <SRS0=pU4t=4V=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
+Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
+ [172.30.200.123])
+ by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id C6D01139A
+ for <patchwork-linux-arm@patchwork.kernel.org>;
+ Wed, 4 Mar 2020 13:24:52 +0000 (UTC)
+Received: from bombadil.infradead.org (bombadil.infradead.org
+ [198.137.202.133])
+ (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
+ (No client certificate requested)
+ by mail.kernel.org (Postfix) with ESMTPS id 8EA4C20848
+ for <patchwork-linux-arm@patchwork.kernel.org>;
+ Wed, 4 Mar 2020 13:24:52 +0000 (UTC)
+Authentication-Results: mail.kernel.org;
+ dkim=pass (2048-bit key) header.d=lists.infradead.org
+ header.i=@lists.infradead.org header.b="rVot4hOX"
+DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8EA4C20848
+Authentication-Results: mail.kernel.org;
+ dmarc=none (p=none dis=none) header.from=suse.de
+Authentication-Results: mail.kernel.org;
+ spf=none
+ smtp.mailfrom=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org
+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=8vOVvuwuEiZ/+aeWTFI6G54jitKev/MSiGHvL/NuYpM=; b=rVot4hOXzlJULi
+ AIV0tWo7xq5srSJPr0aW3ccsKyfTNsVGmB0Y4G8A2Wqd+29xOVNJGk9jIAaRqBaAEGozzfFQj8JuQ
+ YRKsDyKXSMgpM5EHFtlq7TSvY21pe6uHhTkMCYnhLdZu7BrX9V2BLfnG7b7kx+wVgh2SDk5Tu8iJI
+ 3vNkR22Qd4bIZAMQVwr97BN6IasYg2C9Q1hACZKKYVTxOvCw1MDDfedhRK9IxgZXV8eacZco5TlC+
+ 3FlBQSP6dxBhpgAZ2VSD8k94TZe8Vnj1HMmja4MShu5hUOaBMzV/cvTA0y9OFseFvzL3YES1oyPzk
+ vPYT4iiUYIWQEEsfDJoA==;
+Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
+ by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
+ id 1j9U10-0004Kq-KB; Wed, 04 Mar 2020 13:24:46 +0000
+Received: from mx2.suse.de ([195.135.220.15])
+ by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
+ id 1j9U0x-0004KG-Lg; Wed, 04 Mar 2020 13:24:45 +0000
+X-Virus-Scanned: by amavisd-new at test-mx.suse.de
+Received: from relay2.suse.de (unknown [195.135.220.254])
+ by mx2.suse.de (Postfix) with ESMTP id 28610AAC7;
+ Wed, 4 Mar 2020 13:24:42 +0000 (UTC)
+From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+To: Rob Herring <robh+dt@kernel.org>,
+ Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+Subject: [PATCH v2] ARM: dts: bcm2711: Move emmc2 into its own bus
+Date: Wed, 4 Mar 2020 14:24:37 +0100
+Message-Id: <20200304132437.20164-1-nsaenzjulienne@suse.de>
+X-Mailer: git-send-email 2.25.1
+MIME-Version: 1.0
+X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
+X-CRM114-CacheID: sfid-20200304_052443_860022_0913505C
+X-CRM114-Status: GOOD ( 14.37 )
+X-Spam-Score: -2.3 (--)
+X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
+ Content analysis details: (-2.3 points)
+ pts rule name description
+ ---- ----------------------
+ --------------------------------------------------
+ -2.3 RCVD_IN_DNSWL_MED RBL: Sender listed at https://www.dnswl.org/,
+ medium trust [195.135.220.15 listed in list.dnswl.org]
+ -0.0 SPF_PASS SPF: sender matches SPF record
+ 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
+ 0.0 RCVD_IN_MSPIKE_H3 RBL: Good reputation (+3)
+ [195.135.220.15 listed in wl.mailspike.net]
+ 0.0 RCVD_IN_MSPIKE_WL Mailspike good senders
+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: devicetree@vger.kernel.org, f.fainelli@gmail.com, phil@raspberrypi.org,
+ linux-kernel@vger.kernel.org, bcm-kernel-feedback-list@broadcom.com,
+ linux-rpi-kernel@lists.infradead.org, linux-arm-kernel@lists.infradead.org
+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
+
+Depending on bcm2711's revision its emmc2 controller might have
+different DMA constraints. Raspberry Pi 4's firmware will take care of
+updating those, but only if a certain alias is found in the device tree.
+So, move emmc2 into its own bus, so as not to pollute other devices with
+dma-ranges changes and create the emmc2bus alias.
+
+Based in Phil ELwell's downstream implementation.
+
+Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
+---
+
+Changes since v1:
+ - Add comment in dt
+ - Fix commit title
+
+ arch/arm/boot/dts/bcm2711-rpi-4-b.dts | 1 +
+ arch/arm/boot/dts/bcm2711.dtsi | 25 ++++++++++++++++++++-----
+ 2 files changed, 21 insertions(+), 5 deletions(-)
+
+diff --git a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+index 1d4b589fe233..e26ea9006378 100644
+--- a/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
++++ b/arch/arm/boot/dts/bcm2711-rpi-4-b.dts
+@@ -20,6 +20,7 @@ memory@0 {
+ };
+
+ aliases {
++ emmc2bus = &emmc2bus;
+ ethernet0 = &genet;
+ pcie0 = &pcie0;
+ };
+diff --git a/arch/arm/boot/dts/bcm2711.dtsi b/arch/arm/boot/dts/bcm2711.dtsi
+index d1e684d0acfd..a91cf68e3c4c 100644
+--- a/arch/arm/boot/dts/bcm2711.dtsi
++++ b/arch/arm/boot/dts/bcm2711.dtsi
+@@ -241,17 +241,32 @@ pwm1: pwm@7e20c800 {
+ status = "disabled";
+ };
+
++ hvs@7e400000 {
++ interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
++ };
++ };
++
++ /*
++ * emmc2 has different DMA constraints based on SoC revisions. It was
++ * moved into its own bus, so as for RPi4's firmware to update them.
++ * The firmware will find whether the emmc2bus alias is defined, and if
++ * so, it'll edit the dma-ranges property below accordingly.
++ */
++ emmc2bus: emmc2bus {
++ compatible = "simple-bus";
++ #address-cells = <2>;
++ #size-cells = <1>;
++
++ ranges = <0x0 0x7e000000 0x0 0xfe000000 0x01800000>;
++ dma-ranges = <0x0 0xc0000000 0x0 0x00000000 0x40000000>;
++
+ emmc2: emmc2@7e340000 {
+ compatible = "brcm,bcm2711-emmc2";
+- reg = <0x7e340000 0x100>;
++ reg = <0x0 0x7e340000 0x100>;
+ interrupts = <GIC_SPI 126 IRQ_TYPE_LEVEL_HIGH>;
+ clocks = <&clocks BCM2711_CLOCK_EMMC2>;
+ status = "disabled";
+ };
+-
+- hvs@7e400000 {
+- interrupts = <GIC_SPI 97 IRQ_TYPE_LEVEL_HIGH>;
+- };
+ };
+
+ arm-pmu {
diff --git a/Add-support-for-the-pine64-Pinebook-Pro.patch b/Add-support-for-the-pine64-Pinebook-Pro.patch
index 0b11d8bc1..e612a90d4 100644
--- a/Add-support-for-the-pine64-Pinebook-Pro.patch
+++ b/Add-support-for-the-pine64-Pinebook-Pro.patch
@@ -1,27 +1,27 @@
-From patchwork Sat Feb 29 14:48:16 2020
+From patchwork Wed Mar 4 21:30:22 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tobias Schramm <t.schramm@manjaro.org>
-X-Patchwork-Id: 11413869
+X-Patchwork-Id: 11420805
Return-Path:
- <SRS0=5RQY=4R=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
+ <SRS0=pU4t=4V=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
[172.30.200.123])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9EF2492A
+ by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 82C16139A
for <patchwork-linux-arm@patchwork.kernel.org>;
- Sat, 29 Feb 2020 14:49:45 +0000 (UTC)
+ Wed, 4 Mar 2020 21:31:11 +0000 (UTC)
Received: from bombadil.infradead.org (bombadil.infradead.org
[198.137.202.133])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
- by mail.kernel.org (Postfix) with ESMTPS id 77180246B6
+ by mail.kernel.org (Postfix) with ESMTPS id 6132920828
for <patchwork-linux-arm@patchwork.kernel.org>;
- Sat, 29 Feb 2020 14:49:45 +0000 (UTC)
+ Wed, 4 Mar 2020 21:31:11 +0000 (UTC)
Authentication-Results: mail.kernel.org;
dkim=pass (2048-bit key) header.d=lists.infradead.org
- header.i=@lists.infradead.org header.b="RHsOi5hi"
-DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 77180246B6
+ header.i=@lists.infradead.org header.b="HKFX/pPT"
+DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 6132920828
Authentication-Results: mail.kernel.org;
dmarc=none (p=none dis=none) header.from=manjaro.org
Authentication-Results: mail.kernel.org;
@@ -30,41 +30,39 @@ Authentication-Results: mail.kernel.org;
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:References:In-Reply-To:
- 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:
- List-Owner; bh=h/bjgfr91fZ1KZuzWySbDMgfYlU9zrxcpzCo6rLIKjo=; b=RHsOi5hiJBlboe
- 7ru5614nnG35xhPZXrji4oqJJQprDe4ZKdxlD+1WaPtfloPwy9qyrCe+omFdiwajjHHvXqOgYlAXh
- CSfc6swRfl/U4pVnZ/lUkfVOjMxjOLbhwWtsJTgpVWzrx54MZV3h+GCRhGuyL2ExXv3nTtsWlb+VC
- 5bDLE8YkSZKs89+uuj8Tp9TnIaGRXq0A+gFRFM4AhyrArlH/jBCPCcpjqR0Nlk9lKCxJdAwQFimQh
- Zm+Ge5Y7MobQdbO97Ajfo50dMMPczxqDZMaTQjYrZCUX1irgZjN6sTqK2gMJXbujfaWB9gYGlBPFU
- euENlsPFZV3/E3I9tJtw==;
+ 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=w5RNMezlBKSJB0tCSEk4sJPOWhOWYWdtbkVGYQNDXFI=; b=HKFX/pPTL0fcDF
+ R9qC74ZcvmWsNe9+XRGoe/CFa6E5wpufnBwGVBlWAMf6TP3NxrI2eK9XCD6TAmQW18/85HychEgId
+ qGCU/seUa+UV6WOVWgQ5g3Ea+6kBaMM4cYYgsYaK3h3VlUQQtM3SvPArRNF1VYcj1uZiwX1ek7PO6
+ B8Btks26iWloBhYYW62B5FA9wYcw0+Bcg2DE9NyPZ1i63GA6P8esgYpDnGLkmWehpZDYy8tJK00rE
+ ABbvK0xNgIIKCbbomExLAdMHg8PO14V/BNR1Bf9QBVZpnxt8xfr7GG33Znp7N1Nf19YJecmdUw5e2
+ FnFUvjvPmLh4pIdxyp6Q==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
- id 1j83R2-00067V-NF; Sat, 29 Feb 2020 14:49:44 +0000
+ id 1j9bbh-0003te-QG; Wed, 04 Mar 2020 21:31:09 +0000
Received: from mail.manjaro.org ([176.9.38.148])
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
- id 1j83Qp-0005ww-Mw; Sat, 29 Feb 2020 14:49:33 +0000
+ id 1j9bbe-0003tI-SU; Wed, 04 Mar 2020 21:31:08 +0000
Received: from localhost (localhost [127.0.0.1])
- by mail.manjaro.org (Postfix) with ESMTP id 581173C40D8B;
- Sat, 29 Feb 2020 15:49:30 +0100 (CET)
+ by mail.manjaro.org (Postfix) with ESMTP id 9C0823701125;
+ Wed, 4 Mar 2020 22:31:05 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at manjaro.org
Received: from mail.manjaro.org ([127.0.0.1])
by localhost (manjaro.org [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id LUE0dUV5ZXet; Sat, 29 Feb 2020 15:49:28 +0100 (CET)
+ with ESMTP id fkagLefmcj9V; Wed, 4 Mar 2020 22:31:03 +0100 (CET)
From: Tobias Schramm <t.schramm@manjaro.org>
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
Heiko Stuebner <heiko@sntech.de>, Andy Yan <andy.yan@rock-chips.com>,
Johan Jonker <jbx6244@gmail.com>
-Subject: [PATCH v3 1/2] dt-bindings: Add doc for pine64 Pinebook Pro
-Date: Sat, 29 Feb 2020 15:48:16 +0100
-Message-Id: <20200229144817.355678-2-t.schramm@manjaro.org>
-In-Reply-To: <20200229144817.355678-1-t.schramm@manjaro.org>
-References: <20200229144817.355678-1-t.schramm@manjaro.org>
+Subject: [PATCH v4 1/2] dt-bindings: Add doc for Pine64 Pinebook Pro
+Date: Wed, 4 Mar 2020 22:30:22 +0100
+Message-Id: <20200304213023.689983-2-t.schramm@manjaro.org>
MIME-Version: 1.0
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20200229_064931_972132_5A8F359D
-X-CRM114-Status: UNSURE ( 7.40 )
+X-CRM114-CacheID: sfid-20200304_133107_065063_D9B62F20
+X-CRM114-Status: UNSURE ( 6.54 )
X-CRM114-Notice: Please train this message.
X-Spam-Score: 0.0 (/)
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
@@ -74,8 +72,8 @@ X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
--------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [176.9.38.148 listed in list.dnswl.org]
- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
+ 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.29
Precedence: list
@@ -90,7 +88,8 @@ List-Subscribe:
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
- Alexis Ballier <aballier@gentoo.org>, Tobias Schramm <t.schramm@manjaro.org>,
+ Emmanuel Vadot <manu@freebsd.org>, Alexis Ballier <aballier@gentoo.org>,
+ Tobias Schramm <t.schramm@manjaro.org>, Rob Herring <robh@kernel.org>,
Katsuhiro Suzuki <katsuhiro@katsuster.net>, linux-kernel@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Kever Yang <kever.yang@rock-chips.com>,
@@ -102,54 +101,57 @@ 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
-This commit adds a compatible for the Pinebook Pro.
+From: Emmanuel Vadot <manu@freebsd.org>
-Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
+Add a compatible for Pine64 Pinebook Pro
+
+Signed-off-by: Emmanuel Vadot <manu@freebsd.org>
+Reviewed-by: Rob Herring <robh@kernel.org>
---
Documentation/devicetree/bindings/arm/rockchip.yaml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/Documentation/devicetree/bindings/arm/rockchip.yaml b/Documentation/devicetree/bindings/arm/rockchip.yaml
-index 874b0eaa2a75..482a0cbfb18a 100644
+index 874b0eaa2a75..17f0ab0b8832 100644
--- a/Documentation/devicetree/bindings/arm/rockchip.yaml
+++ b/Documentation/devicetree/bindings/arm/rockchip.yaml
-@@ -402,6 +402,11 @@ properties:
- - const: phytec,rk3288-phycore-som
- - const: rockchip,rk3288
+@@ -415,6 +415,11 @@ properties:
+ - const: pine64,rockpro64
+ - const: rockchip,rk3399
-+ - description: Pine64 Pinebook Pro
++ - description: Pine64 PinebookPro
+ items:
+ - const: pine64,pinebook-pro
+ - const: rockchip,rk3399
+
- - description: Pine64 Rock64
+ - description: Radxa Rock
items:
- - const: pine64,rock64
+ - const: radxa,rock
-From patchwork Sat Feb 29 14:48:17 2020
+From patchwork Wed Mar 4 21:30:23 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Tobias Schramm <t.schramm@manjaro.org>
-X-Patchwork-Id: 11413875
+X-Patchwork-Id: 11420809
Return-Path:
- <SRS0=5RQY=4R=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
+ <SRS0=pU4t=4V=lists.infradead.org=linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@kernel.org>
Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org
[172.30.200.123])
- by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 8087592A
+ by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id F1D201395
for <patchwork-linux-arm@patchwork.kernel.org>;
- Sat, 29 Feb 2020 14:50:09 +0000 (UTC)
+ Wed, 4 Mar 2020 21:31:26 +0000 (UTC)
Received: from bombadil.infradead.org (bombadil.infradead.org
[198.137.202.133])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
- by mail.kernel.org (Postfix) with ESMTPS id 442A12469C
+ by mail.kernel.org (Postfix) with ESMTPS id C71432084E
for <patchwork-linux-arm@patchwork.kernel.org>;
- Sat, 29 Feb 2020 14:50:09 +0000 (UTC)
+ Wed, 4 Mar 2020 21:31:26 +0000 (UTC)
Authentication-Results: mail.kernel.org;
dkim=pass (2048-bit key) header.d=lists.infradead.org
- header.i=@lists.infradead.org header.b="FlyBUQCX"
-DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 442A12469C
+ header.i=@lists.infradead.org header.b="aaCRZACh"
+DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org C71432084E
Authentication-Results: mail.kernel.org;
dmarc=none (p=none dis=none) header.from=manjaro.org
Authentication-Results: mail.kernel.org;
@@ -161,39 +163,39 @@ DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed;
List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To:
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:
- List-Owner; bh=mDLDmKMxYTjLx5H/b22LNHT76K+B14bbv7jWdIjIykg=; b=FlyBUQCXysktd8
- ET9+7KGBQLutUm6LEwJiI9hZoZmM014frNwK6UAv08zPTFTMuBrITLVO4ienTLwEZUHmtpo4t5uUi
- OGPeWMPGZhFfkU2h3V4Kze+co3lxtBq3brL/O+8fnwX7GI75Jw8wUhzopbPjq9XJsNhrMOB74OGy3
- qoimmR8pubT3ag0ngt35GX5DIlWNxzfDTz6x8h1JsRov4pD8rfJgQsnEbt3chjz8C8EazS3sdcuEF
- Ggo7qM7oAVhzc9AUdmtFx5xL+5VDUgTcdMlqyA7qIODAEayc2mNtXuUSK9dvhmdZ2z2QFi8kvZVTN
- jaRIzBTusM70Wql4uTLQ==;
+ List-Owner; bh=T4TZmXOPB1yBA/Cy6SktfxnDKyf4qoHPOaLfabPHwCI=; b=aaCRZAChIzBlJw
+ Ccci1IXygLymnzWTblUo/AuYY6tojwziDu90m20Ec1bJbXl27yBAYEeR3CEj4ELNSOiGKzqSpqE+k
+ rb7uRA7jjVfvj/gJJ2IFxGtd1CKBI6e0S+1qyN/l8ET6UykVavViDDtrsFHt7iD3X2+Bgbs9R8VLi
+ hB6gZwnuOsWb8JqpNLfrOPiCrkqTega/z2olbgct2T/Mb/85eH/l+SvyINCfyQCQyuOk9d2blYcA9
+ 1i4TJi3MpRw7Pa68BnGPO7zK/ttk4SRxKYPi3On226GN5bGg9jNgSEpALbI+CK0wrYS0mIxGg0q7k
+ Gy09LxFJP7I1IxV6BR2w==;
Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org)
by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux))
- id 1j83RP-0006jj-B8; Sat, 29 Feb 2020 14:50:07 +0000
+ id 1j9bbv-00047c-LS; Wed, 04 Mar 2020 21:31:23 +0000
Received: from mail.manjaro.org ([176.9.38.148])
by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux))
- id 1j83R2-00066x-Bh; Sat, 29 Feb 2020 14:49:47 +0000
+ id 1j9bbk-0003vp-EA; Wed, 04 Mar 2020 21:31:15 +0000
Received: from localhost (localhost [127.0.0.1])
- by mail.manjaro.org (Postfix) with ESMTP id 4B9FD3C40D8B;
- Sat, 29 Feb 2020 15:49:42 +0100 (CET)
+ by mail.manjaro.org (Postfix) with ESMTP id 26030370112C;
+ Wed, 4 Mar 2020 22:31:11 +0100 (CET)
X-Virus-Scanned: Debian amavisd-new at manjaro.org
Received: from mail.manjaro.org ([127.0.0.1])
by localhost (manjaro.org [127.0.0.1]) (amavisd-new, port 10024)
- with ESMTP id hzqNYgsWfm-j; Sat, 29 Feb 2020 15:49:39 +0100 (CET)
+ with ESMTP id OKG7wH7ZOt7o; Wed, 4 Mar 2020 22:31:07 +0100 (CET)
From: Tobias Schramm <t.schramm@manjaro.org>
To: Rob Herring <robh+dt@kernel.org>, Mark Rutland <mark.rutland@arm.com>,
Heiko Stuebner <heiko@sntech.de>, Andy Yan <andy.yan@rock-chips.com>,
Johan Jonker <jbx6244@gmail.com>
-Subject: [PATCH v3 2/2] arm64: dts: rockchip: Add initial support for Pinebook
+Subject: [PATCH v4 2/2] arm64: dts: rockchip: Add initial support for Pinebook
Pro
-Date: Sat, 29 Feb 2020 15:48:17 +0100
-Message-Id: <20200229144817.355678-3-t.schramm@manjaro.org>
-In-Reply-To: <20200229144817.355678-1-t.schramm@manjaro.org>
-References: <20200229144817.355678-1-t.schramm@manjaro.org>
+Date: Wed, 4 Mar 2020 22:30:23 +0100
+Message-Id: <20200304213023.689983-3-t.schramm@manjaro.org>
+In-Reply-To: <20200304213023.689983-2-t.schramm@manjaro.org>
+References: <20200304213023.689983-2-t.schramm@manjaro.org>
MIME-Version: 1.0
X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3
-X-CRM114-CacheID: sfid-20200229_064944_758882_2960AFAB
-X-CRM114-Status: GOOD ( 13.83 )
+X-CRM114-CacheID: sfid-20200304_133112_802914_89F85872
+X-CRM114-Status: GOOD ( 13.85 )
X-Spam-Score: 0.0 (/)
X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
Content analysis details: (0.0 points)
@@ -202,8 +204,8 @@ X-Spam-Report: SpamAssassin version 3.4.3 on bombadil.infradead.org summary:
--------------------------------------------------
-0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/,
no trust [176.9.38.148 listed in list.dnswl.org]
- 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
-0.0 SPF_PASS SPF: sender matches SPF record
+ 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record
X-BeenThere: linux-arm-kernel@lists.infradead.org
X-Mailman-Version: 2.1.29
Precedence: list
@@ -218,7 +220,8 @@ List-Subscribe:
<http://lists.infradead.org/mailman/listinfo/linux-arm-kernel>,
<mailto:linux-arm-kernel-request@lists.infradead.org?subject=subscribe>
Cc: linux-arm-kernel@lists.infradead.org, devicetree@vger.kernel.org,
- Alexis Ballier <aballier@gentoo.org>, Tobias Schramm <t.schramm@manjaro.org>,
+ Emmanuel Vadot <manu@freebsd.org>, Alexis Ballier <aballier@gentoo.org>,
+ Tobias Schramm <t.schramm@manjaro.org>,
Katsuhiro Suzuki <katsuhiro@katsuster.net>, linux-kernel@vger.kernel.org,
Douglas Anderson <dianders@chromium.org>,
Kever Yang <kever.yang@rock-chips.com>,
@@ -235,8 +238,8 @@ This commit adds initial dt support for the rk3399 based Pinebook Pro.
Signed-off-by: Tobias Schramm <t.schramm@manjaro.org>
---
arch/arm64/boot/dts/rockchip/Makefile | 1 +
- .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1105 +++++++++++++++++
- 2 files changed, 1106 insertions(+)
+ .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 1096 +++++++++++++++++
+ 2 files changed, 1097 insertions(+)
create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
diff --git a/arch/arm64/boot/dts/rockchip/Makefile b/arch/arm64/boot/dts/rockchip/Makefile
@@ -253,10 +256,10 @@ index 60d9437096c7..ae7621309e92 100644
dtb-$(CONFIG_ARCH_ROCKCHIP) += rk3399-roc-pc-mezzanine.dtb
diff --git a/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
new file mode 100644
-index 000000000000..dfade7e00051
+index 000000000000..8f77ee4f256c
--- /dev/null
+++ b/arch/arm64/boot/dts/rockchip/rk3399-pinebook-pro.dts
-@@ -0,0 +1,1105 @@
+@@ -0,0 +1,1096 @@
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
+/*
+ * Copyright (c) 2017 Fuzhou Rockchip Electronics Co., Ltd.
@@ -299,7 +302,12 @@ index 000000000000..dfade7e00051
+ #address-cells = <1>;
+ #size-cells = <0>;
+ port@0 {
++ reg = <0>;
++ #address-cells = <1>;
++ #size-cells = <0>;
++
+ panel_in_edp: endpoint@0 {
++ reg = <0>;
+ remote-endpoint = <&edp_out_panel>;
+ };
+ };
@@ -630,6 +638,14 @@ index 000000000000..dfade7e00051
+ status = "okay";
+};
+
++&cpu_b0 {
++ cpu-supply = <&vdd_cpu_b>;
++};
++
++&cpu_b1 {
++ cpu-supply = <&vdd_cpu_b>;
++};
++
+&cpu_l0 {
+ cpu-supply = <&vdd_cpu_l>;
+};
@@ -646,14 +662,6 @@ index 000000000000..dfade7e00051
+ cpu-supply = <&vdd_cpu_l>;
+};
+
-+&cpu_b0 {
-+ cpu-supply = <&vdd_cpu_b>;
-+};
-+
-+&cpu_b1 {
-+ cpu-supply = <&vdd_cpu_b>;
-+};
-+
+&edp {
+ force-hpd;
+ pinctrl-names = "default";
@@ -689,8 +697,8 @@ index 000000000000..dfade7e00051
+
+&i2c0 {
+ clock-frequency = <400000>;
-+ i2c-scl-rising-time-ns = <168>;
+ i2c-scl-falling-time-ns = <4>;
++ i2c-scl-rising-time-ns = <168>;
+ status = "okay";
+
+ rk808: pmic@1b {
@@ -949,11 +957,11 @@ index 000000000000..dfade7e00051
+ fcs,int_n = <&gpio1 RK_PA2 GPIO_ACTIVE_HIGH>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&fusb0_int_gpio>;
-+ status = "okay";
+ vbus-supply = <&vbus_typec>;
+
+ connector {
+ compatible = "usb-c-connector";
++ data-role = "host";
+ label = "USB-C";
+ op-sink-microwatt = <1000000>;
+ power-role = "dual";
@@ -968,6 +976,8 @@ index 000000000000..dfade7e00051
+ #size-cells = <0>;
+
+ port@0 {
++ reg = <0>;
++
+ usbc_hs: endpoint {
+ remote-endpoint =
+ <&u2phy0_typec_hs>;
@@ -975,6 +985,8 @@ index 000000000000..dfade7e00051
+ };
+
+ port@1 {
++ reg = <1>;
++
+ usbc_ss: endpoint {
+ remote-endpoint =
+ <&tcphy0_typec_ss>;
@@ -982,6 +994,8 @@ index 000000000000..dfade7e00051
+ };
+
+ port@2 {
++ reg = <2>;
++
+ usbc_dp: endpoint {
+ remote-endpoint =
+ <&tcphy0_typec_dp>;
@@ -996,8 +1010,8 @@ index 000000000000..dfade7e00051
+ #sound-dai-cells = <0>;
+ pinctrl-names = "default";
+ pinctrl-0 = <&i2s_8ch_mclk_gpio>, <&i2s1_2ch_bus>;
-+ rockchip,playback-channels = <8>;
+ rockchip,capture-channels = <8>;
++ rockchip,playback-channels = <8>;
+ status = "okay";
+};
+
@@ -1030,6 +1044,7 @@ index 000000000000..dfade7e00051
+ pwrbtn_gpio: pwrbtn-gpio {
+ rockchip,pins = <0 RK_PA5 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
++
+ lidbtn_gpio: lidbtn-gpio {
+ rockchip,pins = <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_up>;
+ };
@@ -1130,6 +1145,7 @@ index 000000000000..dfade7e00051
+ bt_wake_gpio: bt-wake-gpio {
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
++
+ bt_host_wake_gpio: bt-host-wake-gpio {
+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
+ };
@@ -1196,31 +1212,9 @@ index 000000000000..dfade7e00051
+
+ spiflash: flash@0 {
+ compatible = "jedec,spi-nor";
-+ m25p,fast-read;
+ reg = <0>;
++ m25p,fast-read;
+ spi-max-frequency = <10000000>;
-+ status = "okay";
-+
-+ partitions {
-+ compatible = "fixed-partitions";
-+ #address-cells = <1>;
-+ #size-cells = <1>;
-+
-+ loader@8000 {
-+ label = "loader";
-+ reg = <0x0 0x3F8000>;
-+ };
-+
-+ env@3f8000 {
-+ label = "env";
-+ reg = <0x3F8000 0x8000>;
-+ };
-+
-+ vendor@7c0000 {
-+ label = "vendor";
-+ reg = <0x7C0000 0x40000>;
-+ };
-+ };
+ };
+};
+
diff --git a/gitrev b/gitrev
index c6fb613b8..3c1a2ee7c 100644
--- a/gitrev
+++ b/gitrev
@@ -1 +1 @@
-c60c04021353c55b133519804734415f647f08bd
+aeb542a1b5c507ea117d21c3e3e012ba16f065ac
diff --git a/kernel.spec b/kernel.spec
index 69ff594bb..b2d228019 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -115,7 +115,7 @@ Summary: The Linux kernel
# The rc snapshot level
%global rcrev 4
# The git snapshot level
-%define gitrev 0
+%define gitrev 1
# Set rpm version accordingly
%define rpmversion 5.%{upstream_sublevel}.0
%endif
@@ -208,7 +208,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 1
+%define debugbuildsenabled 0
%if 0%{?fedora}
# Kernel headers are being split out into a separate package
@@ -847,6 +847,8 @@ Patch312: bcm2835-irqchip-Quiesce-IRQs-left-enabled-by-bootloader.patch
Patch313: ARM-dts-bcm283x-Add-missing-properties-to-the-PWR-LED.patch
# https://patchwork.kernel.org/patch/11406785/
Patch314: ARM-dts-bcm2711-Add-pcie0-alias.patch
+# https://patchwork.kernel.org/patch/11420129/
+Patch315: ARM-dts-bcm2711-Move-emmc2-into-its-own-bus.patch
# Tegra bits
# https://www.spinics.net/lists/linux-tegra/msg48152.html
@@ -873,7 +875,7 @@ Patch342: Add-LCD-support-for-Pine64-Pinebook-1080p.patch
Patch343: arm64-pine64-pinetab.patch
# https://www.spinics.net/lists/arm-kernel/msg789135.html
Patch344: arm64-pine64-pinephone.patch
-# v2 https://patchwork.kernel.org/cover/11413255/
+# v4 https://patchwork.kernel.org/cover/11420797/
Patch345: Add-support-for-the-pine64-Pinebook-Pro.patch
# 400 - IBM (ppc/s390x) patches
@@ -2974,6 +2976,12 @@ fi
#
#
%changelog
+* Fri Mar 06 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc4.git1.1
+- Linux v5.6-rc4-135-gaeb542a1b5c5
+
+* Fri Mar 06 2020 Jeremy Cline <jcline@redhat.com>
+- Reenable debugging options.
+
* Mon Mar 02 2020 Jeremy Cline <jcline@redhat.com> - 5.6.0-0.rc4.git0.1
- Linux v5.6-rc4
diff --git a/regulator-pwm-Don-t-warn-on-probe-deferral.patch b/regulator-pwm-Don-t-warn-on-probe-deferral.patch
index a662dd1fb..cebfae9de 100644
--- a/regulator-pwm-Don-t-warn-on-probe-deferral.patch
+++ b/regulator-pwm-Don-t-warn-on-probe-deferral.patch
@@ -1,99 +1,36 @@
-From patchwork Mon Feb 24 14:40:48 2020
-Content-Type: text/plain; charset="utf-8"
-MIME-Version: 1.0
-Content-Transfer-Encoding: 7bit
-X-Patchwork-Submitter: Jon Hunter <jonathanh@nvidia.com>
-X-Patchwork-Id: 1243162
-Return-Path: <linux-tegra-owner@vger.kernel.org>
-X-Original-To: incoming@patchwork.ozlabs.org
-Delivered-To: patchwork-incoming@bilbo.ozlabs.org
-Authentication-Results: ozlabs.org; spf=none (no SPF record)
- smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67;
- helo=vger.kernel.org;
- envelope-from=linux-tegra-owner@vger.kernel.org;
- receiver=<UNKNOWN>)
-Authentication-Results: ozlabs.org;
- dmarc=pass (p=none dis=none) header.from=nvidia.com
-Authentication-Results: ozlabs.org; dkim=pass (2048-bit key;
- unprotected) header.d=nvidia.com header.i=@nvidia.com
- header.a=rsa-sha256 header.s=n1 header.b=GMucuiiq;
- dkim-atps=neutral
-Received: from vger.kernel.org (vger.kernel.org [209.132.180.67])
- by ozlabs.org (Postfix) with ESMTP id 48R4Vx33rJz9sRf
- for <incoming@patchwork.ozlabs.org>;
- Tue, 25 Feb 2020 01:40:57 +1100 (AEDT)
-Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
- id S1727498AbgBXOkx (ORCPT <rfc822;incoming@patchwork.ozlabs.org>);
- Mon, 24 Feb 2020 09:40:53 -0500
-Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:18372 "EHLO
- hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
- with ESMTP id S1726762AbgBXOkx (ORCPT
- <rfc822;linux-tegra@vger.kernel.org>);
- Mon, 24 Feb 2020 09:40:53 -0500
-Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by
- hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
- id <B5e53e0670000>; Mon, 24 Feb 2020 06:40:39 -0800
-Received: from hqmail.nvidia.com ([172.20.161.6])
- by hqpgpgate101.nvidia.com (PGP Universal service);
- Mon, 24 Feb 2020 06:40:52 -0800
-X-PGP-Universal: processed;
- by hqpgpgate101.nvidia.com on Mon, 24 Feb 2020 06:40:52 -0800
-Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL111.nvidia.com
- (172.20.187.18) with Microsoft SMTP Server (TLS) id 15.0.1473.3;
- Mon, 24 Feb 2020 14:40:52 +0000
-Received: from rnnvemgw01.nvidia.com (10.128.109.123) by HQMAIL101.nvidia.com
- (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via
- Frontend Transport; Mon, 24 Feb 2020 14:40:52 +0000
-Received: from thunderball.nvidia.com (Not Verified[10.21.140.91]) by
- rnnvemgw01.nvidia.com with Trustwave SEG (v7, 5, 8, 10121)
- id <B5e53e0720007>; Mon, 24 Feb 2020 06:40:51 -0800
+From 0cd71b9a43ad80f4d9a8bfde6ec6db8daf447029 Mon Sep 17 00:00:00 2001
From: Jon Hunter <jonathanh@nvidia.com>
-To: Liam Girdwood <lgirdwood@gmail.com>, Mark Brown <broonie@kernel.org>,
- Thierry Reding <thierry.reding@gmail.com>
-CC: <linux-kernel@vger.kernel.org>, <linux-pwm@vger.kernel.org>,
- <linux-tegra@vger.kernel.org>, Jon Hunter <jonathanh@nvidia.com>
-Subject: [PATCH] regulator: pwm: Don't warn on probe deferral
-Date: Mon, 24 Feb 2020 14:40:48 +0000
-Message-ID: <20200224144048.6587-1-jonathanh@nvidia.com>
-X-Mailer: git-send-email 2.17.1
-X-NVConfidentiality: public
-MIME-Version: 1.0
-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
- t=1582555239; bh=xX7Mgn1VlNejVzsSKFLhZRbMP4+2YtN6WM4DdeoOEHs=;
- h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
- X-NVConfidentiality:MIME-Version:Content-Type;
- b=GMucuiiqAspPQsWQ1ebM1v5mPEShSHma2lu4iNERqE/uilIy4CUp4eHq6df8Lcsvu
- 11bCdd116mWyRJ5/F69vtHcgJHTbeaaRcf+A1/A3DLTuc6Z/PRb5jcySSX/aRCaPfA
- +au3XaR3dyBeV+xizDks3Ibot8dmHuQWswqibwwVp5Qanoow2Dj75j/Q++AU7PwM6A
- ChvWMkFCBBz6FO8SGi5jCQrCgLTrHtX90cRQZsaaQFrbBYLhLrAsdFkFM2mVLd+xqz
- rc7bwTn707Mpf71vRGfmJgoiBm/Pm1qLnRoyLBakyb0xfmEJkCP99y3nO62z9DIpDm
- DdSZ9ONzuo7vA==
-Sender: linux-tegra-owner@vger.kernel.org
-Precedence: bulk
-List-ID: <linux-tegra.vger.kernel.org>
-X-Mailing-List: linux-tegra@vger.kernel.org
+Date: Mon, 2 Mar 2020 14:14:28 +0000
+Subject: regulator: pwm: Don't warn on probe deferral
Deferred probe is an expected return value for devm_pwm_get(). Given
-that the driver deals with it properly, there's no need to output a
-warning that may potentially confuse users.
+that the driver deals with it properly, rather than warn on probe
+deferral, only output a message on probe deferral if debug level
+prints are enabled.
Signed-off-by: Jon Hunter <jonathanh@nvidia.com>
-Reviewed-by: Thierry Reding <treding@nvidia.com>
+Link: https://lore.kernel.org/r/20200302141428.14119-1-jonathanh@nvidia.com
+Signed-off-by: Mark Brown <broonie@kernel.org>
---
- drivers/regulator/pwm-regulator.c | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ drivers/regulator/pwm-regulator.c | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/drivers/regulator/pwm-regulator.c b/drivers/regulator/pwm-regulator.c
-index e74e11101fc1..fb25777a7d47 100644
+index e74e11101fc1..638329bd0745 100644
--- a/drivers/regulator/pwm-regulator.c
+++ b/drivers/regulator/pwm-regulator.c
-@@ -354,7 +354,8 @@ static int pwm_regulator_probe(struct platform_device *pdev)
+@@ -354,7 +354,11 @@ static int pwm_regulator_probe(struct platform_device *pdev)
drvdata->pwm = devm_pwm_get(&pdev->dev, NULL);
if (IS_ERR(drvdata->pwm)) {
ret = PTR_ERR(drvdata->pwm);
- dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret);
-+ if (ret != -EPROBE_DEFER)
++ if (ret == -EPROBE_DEFER)
++ dev_dbg(&pdev->dev,
++ "Failed to get PWM, deferring probe\n");
++ else
+ dev_err(&pdev->dev, "Failed to get PWM: %d\n", ret);
return ret;
}
+--
+cgit 1.2-0.3.lf.el7
diff --git a/sources b/sources
index ceb87391b..8f9a761e7 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,3 @@
SHA512 (linux-5.5.tar.xz) = fa74fdabb5e63384a39e54da05b86a9ae9ea16179524b041fbbdffc7177e80b53600ae98d76be127ba216148f9dc55fe07ab20637e22c6d6030cb4aa09eb2f86
SHA512 (patch-5.6-rc4.xz) = 4a67a168b2ab2d37693601cbf45c10c1ab3eb5118ada9dc4fa809b17b0fc8f8f4cbc9e4aa504411a41dc6d345fd1880bc69280dcabc55e2e6841d85a968bd05e
+SHA512 (patch-5.6-rc4-git1.xz) = 301c63fbdb4f9df449ddd6ffc80efe411f9bfbf14a4bb308d10661d00eb53082cdc0272417d7686d81fd3714dbb2813ec5e318024edc57e0a62e1b47bd1f21fe
generated by cgit (git 2.34.1) at 2024-05-02 19:10:24 +0000