2019.10 RC2
This commit is contained in:
Peter Robinson
parent
d1ce3181e9
commit
d66aef9a14
File diff suppressed because it is too large
Load Diff
@ -1,262 +0,0 @@
|
||||
From patchwork Mon Jul 29 13:52:27 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
X-Patchwork-Id: 1138381
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=fail (p=none dis=none) header.from=linaro.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=linaro.org header.i=@linaro.org
|
||||
header.b="WyWxUYr0"; dkim-atps=neutral
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45y1NM4Q0Qz9sBt
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 29 Jul 2019 23:52:51 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 3FE81C21DCA; Mon, 29 Jul 2019 13:52:48 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3,
|
||||
RCVD_IN_MSPIKE_WL,
|
||||
T_DKIM_INVALID autolearn=unavailable autolearn_force=no
|
||||
version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id 744C2C21D56;
|
||||
Mon, 29 Jul 2019 13:52:45 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 4CD6EC21D56; Mon, 29 Jul 2019 13:52:44 +0000 (UTC)
|
||||
Received: from mail-pf1-f193.google.com (mail-pf1-f193.google.com
|
||||
[209.85.210.193])
|
||||
by lists.denx.de (Postfix) with ESMTPS id A797CC21CB6
|
||||
for <u-boot@lists.denx.de>; Mon, 29 Jul 2019 13:52:43 +0000 (UTC)
|
||||
Received: by mail-pf1-f193.google.com with SMTP id i189so28084100pfg.10
|
||||
for <u-boot@lists.denx.de>; Mon, 29 Jul 2019 06:52:43 -0700 (PDT)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
|
||||
h=from:to:cc:subject:date:message-id;
|
||||
bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=;
|
||||
b=WyWxUYr0OxZM2s1uFdLeSMmcp5oyNnL8MU4JHdEwgNt1lJd7Utgi3AQ3Lzc7gFM0BL
|
||||
XMcezhoSk3X3IeUtcJhysMP3DP7sbY5roK8NFp1oTVNKPvCneRKiAVtqgHQMXuzVV+nb
|
||||
078IoKyU10IHRfQUEtrjZ4p2lwaQPPnC07YzMtENo+uGH6y0Zs76Wxj4Kx0IUhxYZa8O
|
||||
APPOKpyDCtM0+D1TowK0w39vyWoF5ORjfsn8KHDaq6Xkkgu6Lor0pNA4N1NtrHjid3V4
|
||||
l1Qqe+1arhC9hkEp8ZegM8NKpk5z94MRxtSX0M+hcNz0CXCSEE8sfrQ+A/ndY7gvLn3L
|
||||
Yajg==
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20161025;
|
||||
h=x-gm-message-state:from:to:cc:subject:date:message-id;
|
||||
bh=3FPv5tbwMZSlglyfdX7Tp9nk6Cmnwv8xAql9ei/9XMI=;
|
||||
b=kGpw9+JaJZ7VhtOe4HxM/24olmF5cPFaw94JpSXNUxVtSBAx45xFv4eymfEVtCBswg
|
||||
tqAXbRuIfaOceGoIbtZA5pgcnwnRB1d6Vv0zbF5eoiXCtjjn+3xKx2sbPM0kdIPNtJph
|
||||
dr+5gKiLRUOqvGCMKEvmBtU/gTqa+3oMGQ3alzpd5QjPnfIj3eYmCWpXjCg1sOSUbvdx
|
||||
DxKGKqCk2EAYLRBVI+r3RGlea1Ccyrdma6G+KjhwAS1E9KnTw4Pt0ehttBAEHylukS21
|
||||
vMVC54pX1tuKHLI5q5Q2hqXBf1I6AaZ0saGg3h5iO+MBUz6CgzSBu6yfHvyuJhR/JdtK
|
||||
6w3g==
|
||||
X-Gm-Message-State: APjAAAXrm30Hcs5qRxqy46mx7q1uHtii+pHCdOM+5yq8fhHcHocjMIJn
|
||||
A2hlX799KPgmg40gXYkCkQCW
|
||||
X-Google-Smtp-Source: APXvYqxt2EtMzNxTXZlfwUpo1lD/FyVZHuM5wM5aogloWnIt7GCC/yn8I0XXZ7c9Gx5++D2yLhrvJw==
|
||||
X-Received: by 2002:a63:1765:: with SMTP id 37mr35777700pgx.447.1564408361779;
|
||||
Mon, 29 Jul 2019 06:52:41 -0700 (PDT)
|
||||
Received: from localhost.localdomain ([103.59.133.81])
|
||||
by smtp.googlemail.com with ESMTPSA id
|
||||
i137sm62554902pgc.4.2019.07.29.06.52.38
|
||||
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
|
||||
Mon, 29 Jul 2019 06:52:41 -0700 (PDT)
|
||||
From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
To: kever.yang@rock-chips.com,
|
||||
philipp.tomsich@theobroma-systems.com
|
||||
Date: Mon, 29 Jul 2019 19:22:27 +0530
|
||||
Message-Id: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org>
|
||||
X-Mailer: git-send-email 2.17.1
|
||||
Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de,
|
||||
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
Subject: [U-Boot] [PATCH v2 1/2] arm: dts: rock960: Enable booting from eMMC
|
||||
when using SPL
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
This commits enables booting from eMMC when using SPL on 96Boards
|
||||
Rock960 board by adding SDHCI to boot order. Since the SDHCI driver
|
||||
already has the reloc flag, this works straightaway. While we are at it,
|
||||
let's also include the common u-boot dtsi for rk3399.
|
||||
|
||||
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
---
|
||||
|
||||
Changes in v2:
|
||||
|
||||
* Moved the change to <board>-u-boot.dtsi as spotted by Peter.
|
||||
|
||||
arch/arm/dts/rk3399-rock960-u-boot.dtsi | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/dts/rk3399-rock960-u-boot.dtsi b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||
index 5256f6d3f2..4850debdf0 100644
|
||||
--- a/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||
+++ b/arch/arm/dts/rk3399-rock960-u-boot.dtsi
|
||||
@@ -3,4 +3,11 @@
|
||||
* Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
|
||||
*/
|
||||
|
||||
+#include "rk3399-u-boot.dtsi"
|
||||
#include "rk3399-sdram-lpddr3-2GB-1600.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ chosen {
|
||||
+ u-boot,spl-boot-order = &sdhci, &sdmmc;
|
||||
+ };
|
||||
+};
|
||||
|
||||
From patchwork Mon Jul 29 13:52:28 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
X-Patchwork-Id: 1138382
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=fail (p=none dis=none) header.from=linaro.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
dkim=fail reason="signature verification failed" (2048-bit key;
|
||||
unprotected) header.d=linaro.org header.i=@linaro.org
|
||||
header.b="I/oZzIEr"; dkim-atps=neutral
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45y1Ns4wdXz9sBt
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 29 Jul 2019 23:53:17 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 68C65C21DDC; Mon, 29 Jul 2019 13:53:01 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-0.0 required=5.0 tests=RCVD_IN_MSPIKE_H3,
|
||||
RCVD_IN_MSPIKE_WL,
|
||||
T_DKIM_INVALID autolearn=unavailable autolearn_force=no
|
||||
version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id E09FFC21DB5;
|
||||
Mon, 29 Jul 2019 13:52:59 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 81FF8C21DFB; Mon, 29 Jul 2019 13:52:51 +0000 (UTC)
|
||||
Received: from mail-pg1-f196.google.com (mail-pg1-f196.google.com
|
||||
[209.85.215.196])
|
||||
by lists.denx.de (Postfix) with ESMTPS id 4A806C21E31
|
||||
for <u-boot@lists.denx.de>; Mon, 29 Jul 2019 13:52:48 +0000 (UTC)
|
||||
Received: by mail-pg1-f196.google.com with SMTP id s1so22006632pgr.2
|
||||
for <u-boot@lists.denx.de>; Mon, 29 Jul 2019 06:52:48 -0700 (PDT)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google;
|
||||
h=from:to:cc:subject:date:message-id:in-reply-to:references;
|
||||
bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=;
|
||||
b=I/oZzIEr7tYSrBDPxym2AlLU8ZdN3EGquuY5N/ry7Vv5U5riF6Q2yHuBCa6xZK4zZS
|
||||
pIy9wesXLpKQcLxrUvpu6SnZeEh6EKlq//AojFiDGFwINxgC/IYvny7F/9xU0k2EgwQt
|
||||
FSM859QYUEM22zEtk8tFWFYJjP1k0wKB4mWoXCyK7NP/LkdrAvprlMSKFpmoeV37mvRs
|
||||
ajFaVQbBwluibDwuST7sH2huCwaP4AuMor4IXlLIXHVA+J27ghX4k7n+6Oj23L8LPc4y
|
||||
6bPJnPvAHlx4jUco3/IK1IBAvZwFAylGAM1qEoWSiiV2iLmjYsrcrBRm3XRy1IbZ1cq8
|
||||
G6Sw==
|
||||
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
|
||||
d=1e100.net; s=20161025;
|
||||
h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to
|
||||
:references;
|
||||
bh=gt12XFZLAmGoM4GrNfchORnQFKGUVndeEjBMHCG7lcE=;
|
||||
b=JfG8sw0VQKGTtXTXhpi8k/WlOzJ4Us5POL/f4501qVIY3emIvOTb5Ce7q49YhIQ+LL
|
||||
zN84aZJVYIpRlbfoxcXzWpYKlfI87yV/GUkck1PJGVHaK80t76wkie9uL/8GRdCawNgS
|
||||
b1B5SgBU4hsIsDGd+xV0mExbWNvsy/h6fvZkfrtARhWgjzL49xgnUd841/iWp8teLfw4
|
||||
/OqF+dxLcNgPRCQlbRmiFU/i9ywonwEH3NVLaygUqh8lxw1U4o4QhTwOOfzK0mx91Ybp
|
||||
jWmqLakr4wXO5Ih2tBjdQ1b4e07UBgGR8SzdD5n24WUrvy3fBzSIeqlnAss+70EoOGML
|
||||
ixYw==
|
||||
X-Gm-Message-State: APjAAAViCoU69CbeN+RPaNsqwOd6kKu6iQicolMLDsc/nDNpWj8X2pDZ
|
||||
Q88+Mu1ogtYsvYb63814wt4G
|
||||
X-Google-Smtp-Source: APXvYqyS8NrywDBj415S/KbF/5oGplbBDQdupMHZ/JrZfmw72r4T5Ifq/+OdJUaph2elH1tzrs99cg==
|
||||
X-Received: by 2002:a63:a346:: with SMTP id v6mr58285420pgn.57.1564408366723;
|
||||
Mon, 29 Jul 2019 06:52:46 -0700 (PDT)
|
||||
Received: from localhost.localdomain ([103.59.133.81])
|
||||
by smtp.googlemail.com with ESMTPSA id
|
||||
i137sm62554902pgc.4.2019.07.29.06.52.43
|
||||
(version=TLS1_3 cipher=AEAD-AES256-GCM-SHA384 bits=256/256);
|
||||
Mon, 29 Jul 2019 06:52:46 -0700 (PDT)
|
||||
From: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
To: kever.yang@rock-chips.com,
|
||||
philipp.tomsich@theobroma-systems.com
|
||||
Date: Mon, 29 Jul 2019 19:22:28 +0530
|
||||
Message-Id: <20190729135228.2878-2-manivannan.sadhasivam@linaro.org>
|
||||
X-Mailer: git-send-email 2.17.1
|
||||
In-Reply-To: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org>
|
||||
References: <20190729135228.2878-1-manivannan.sadhasivam@linaro.org>
|
||||
Cc: sahaj.sarup@linaro.org, u-boot@lists.denx.de,
|
||||
Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
Subject: [U-Boot] [PATCH v2 2/2] arm: dts: ficus: Enable booting from eMMC
|
||||
when using SPL
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
This commits enables booting from eMMC when using SPL on 96Boards
|
||||
Ficus board by adding SDHCI to boot order. Since the SDHCI driver
|
||||
already has the reloc flag, this works straightaway. While we are at it,
|
||||
let's also include the common u-boot dtsi for rk3399.
|
||||
|
||||
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
---
|
||||
|
||||
Changes in v2:
|
||||
|
||||
* Moved the change to <board>-u-boot.dtsi as spotted by Peter.
|
||||
|
||||
arch/arm/dts/rk3399-ficus-u-boot.dtsi | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/arch/arm/dts/rk3399-ficus-u-boot.dtsi b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
|
||||
index eab86bdb30..f3f7aa7c45 100644
|
||||
--- a/arch/arm/dts/rk3399-ficus-u-boot.dtsi
|
||||
+++ b/arch/arm/dts/rk3399-ficus-u-boot.dtsi
|
||||
@@ -3,4 +3,11 @@
|
||||
* Copyright (C) 2019 Jagan Teki <jagan@amarulasolutions.com>
|
||||
*/
|
||||
|
||||
+#include "rk3399-u-boot.dtsi"
|
||||
#include "rk3399-sdram-ddr3-1600.dtsi"
|
||||
+
|
||||
+/ {
|
||||
+ chosen {
|
||||
+ u-boot,spl-boot-order = &sdhci, &sdmmc;
|
||||
+ };
|
||||
+};
|
||||
@ -1,415 +0,0 @@
|
||||
From patchwork Sun Jun 30 16:01:53 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Mark Kettenis <kettenis@openbsd.org>
|
||||
X-Patchwork-Id: 1124932
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=openbsd.org
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45cFdR5qfcz9sBp
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 1 Jul 2019 02:02:35 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 69EB1C21DFD; Sun, 30 Jun 2019 16:02:22 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable
|
||||
autolearn_force=no version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id A34D5C21D56;
|
||||
Sun, 30 Jun 2019 16:02:07 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id E8483C21D56; Sun, 30 Jun 2019 16:02:05 +0000 (UTC)
|
||||
Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net
|
||||
[194.109.24.30])
|
||||
by lists.denx.de (Postfix) with ESMTPS id 88FC8C21C27
|
||||
for <u-boot@lists.denx.de>; Sun, 30 Jun 2019 16:02:05 +0000 (UTC)
|
||||
Received: from barber.sibelius.xs4all.nl ([83.163.83.176])
|
||||
by smtp-cloud9.xs4all.net with ESMTP
|
||||
id hcHChhlcYAOfNhcHEhina2; Sun, 30 Jun 2019 18:02:04 +0200
|
||||
From: Mark Kettenis <kettenis@openbsd.org>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Sun, 30 Jun 2019 18:01:53 +0200
|
||||
Message-Id: <20190630160156.51934-2-kettenis@openbsd.org>
|
||||
X-Mailer: git-send-email 2.21.0
|
||||
In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
References: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
MIME-Version: 1.0
|
||||
X-CMAE-Envelope: MS4wfLmEqKVrnQUzr99m+sewry4ejdvlsajihZ5fdwiyysrW7rHASkwT0EpvsDOXqW6cF7dQRh9fkLtTaJfdf4G0dKtcZjzy8i16ml/DtpRuO9PJFqcz0gBT
|
||||
8elsIXsJQPTnECIi3VFXugCXTgv8xgf9nsYOGsNpMpAop2NQ0gD5nksNRwnypHXYRO0b9cbZq82nwtPShl36CmI5hfMTI+zBeEEVjesvYmW9K73GUT503U6P
|
||||
N/ohWQ8Ta35iWY0w5Rz2gMrBId0UTcIU4s5vRIp+cNmXPjnu09qT22WLAZcTT1PwhNb672Tji0a2TUU/zZkfVKI/ZmTvN6utmGPOx9GkOXPYpNJw2jzpwKhq
|
||||
aMYImgg7RpoqHrOttDtjtRD8sohh3w==
|
||||
Cc: Mark Kettenis <kettenis@openbsd.org>
|
||||
Subject: [U-Boot] [PATCH v2 1/4] rockchip: clk: rk3399: handle clk_enable
|
||||
requests for USB3
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
The "simple" OF glue layer for the Designware USB3 core enables
|
||||
all refernced clocks. These need to be need to be implemented
|
||||
otherwise the driver fails to probe. A dummy implementation
|
||||
that simply returns success is sufficient since the RK3399 comes
|
||||
out of reset with all clock gates open.
|
||||
|
||||
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
---
|
||||
drivers/clk/rockchip/clk_rk3399.c | 12 ++++++++++++
|
||||
1 file changed, 12 insertions(+)
|
||||
|
||||
diff --git a/drivers/clk/rockchip/clk_rk3399.c b/drivers/clk/rockchip/clk_rk3399.c
|
||||
index 79007b8682..d9950c159b 100644
|
||||
--- a/drivers/clk/rockchip/clk_rk3399.c
|
||||
+++ b/drivers/clk/rockchip/clk_rk3399.c
|
||||
@@ -1080,6 +1080,18 @@ static int rk3399_clk_enable(struct clk *clk)
|
||||
case PCLK_GMAC:
|
||||
/* Required to successfully probe the Designware GMAC driver */
|
||||
return 0;
|
||||
+
|
||||
+ case SCLK_USB3OTG0_REF:
|
||||
+ case SCLK_USB3OTG1_REF:
|
||||
+ case SCLK_USB3OTG0_SUSPEND:
|
||||
+ case SCLK_USB3OTG1_SUSPEND:
|
||||
+ case ACLK_USB3OTG0:
|
||||
+ case ACLK_USB3OTG1:
|
||||
+ case ACLK_USB3_RKSOC_AXI_PERF:
|
||||
+ case ACLK_USB3:
|
||||
+ case ACLK_USB3_GRF:
|
||||
+ /* Required to successfully probe the Designware USB3 driver */
|
||||
+ return 0;
|
||||
}
|
||||
|
||||
debug("%s: unsupported clk %ld\n", __func__, clk->id);
|
||||
|
||||
From patchwork Sun Jun 30 16:01:54 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Mark Kettenis <kettenis@openbsd.org>
|
||||
X-Patchwork-Id: 1124933
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=openbsd.org
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45cFff0fKJz9sBp
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 1 Jul 2019 02:03:37 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id B9E06C21E08; Sun, 30 Jun 2019 16:02:35 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable
|
||||
autolearn_force=no version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id 3FB43C21DE8;
|
||||
Sun, 30 Jun 2019 16:02:08 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 6525AC21D56; Sun, 30 Jun 2019 16:02:06 +0000 (UTC)
|
||||
Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net
|
||||
[194.109.24.30])
|
||||
by lists.denx.de (Postfix) with ESMTPS id 1AF59C21C27
|
||||
for <u-boot@lists.denx.de>; Sun, 30 Jun 2019 16:02:06 +0000 (UTC)
|
||||
Received: from barber.sibelius.xs4all.nl ([83.163.83.176])
|
||||
by smtp-cloud9.xs4all.net with ESMTP
|
||||
id hcHChhlcYAOfNhcHFhinaO; Sun, 30 Jun 2019 18:02:06 +0200
|
||||
From: Mark Kettenis <kettenis@openbsd.org>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Sun, 30 Jun 2019 18:01:54 +0200
|
||||
Message-Id: <20190630160156.51934-3-kettenis@openbsd.org>
|
||||
X-Mailer: git-send-email 2.21.0
|
||||
In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
References: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
MIME-Version: 1.0
|
||||
X-CMAE-Envelope: MS4wfKRPj13LkDsqDLlh3dPjepDM22UaNHBR/NtZWFq6HmRoAycq/QLfscmB7RQ6Qr1EzV6RrTtOvCYZiuXKQbTJzDBJd2l/C/wPc01PHXZYBVSolpSIx7Ly
|
||||
hMIN5wJInIHRjMUa8hqeaSNSBFz2GpCd4GNFk2Jv/DgHOiymkEftLBJQaPXPh0rdCGL8BGlEXKM1wseWX1aDf8efNApZ7outHAjzlrnS1hELt4c9zmfVQCMQ
|
||||
lLQCSp7/S40oWg5OqC4X+ShBDOf9hrWZAHsoVInsS+diZkcnbIo7vT3N6zADrDcZoVO1I4NDa9c/YcVbLDdJv9yoHVHjFSNI3i0gBRMmnctZfmlWaYN0IrLC
|
||||
820zukHfOpaNEqKNAvPamCZLovpdOQ==
|
||||
Cc: Mark Kettenis <kettenis@openbsd.org>
|
||||
Subject: [U-Boot] [PATCH v2 2/4] usb: dwc3-of-simple: Add support for RK3399
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
Add compatible string for RK3399 and enable it by default on
|
||||
Rockchip platforms with USB3 support.
|
||||
|
||||
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
---
|
||||
drivers/usb/host/Kconfig | 1 +
|
||||
drivers/usb/host/dwc3-of-simple.c | 1 +
|
||||
2 files changed, 2 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/host/Kconfig b/drivers/usb/host/Kconfig
|
||||
index b1188bcbf5..ac68aa2d27 100644
|
||||
--- a/drivers/usb/host/Kconfig
|
||||
+++ b/drivers/usb/host/Kconfig
|
||||
@@ -24,6 +24,7 @@ config USB_XHCI_DWC3
|
||||
config USB_XHCI_DWC3_OF_SIMPLE
|
||||
bool "DesignWare USB3 DRD Generic OF Simple Glue Layer"
|
||||
depends on DM_USB
|
||||
+ default y if ARCH_ROCKCHIP
|
||||
default y if DRA7XX
|
||||
help
|
||||
Support USB2/3 functionality in simple SoC integrations with
|
||||
diff --git a/drivers/usb/host/dwc3-of-simple.c b/drivers/usb/host/dwc3-of-simple.c
|
||||
index b118997f6e..45df614b09 100644
|
||||
--- a/drivers/usb/host/dwc3-of-simple.c
|
||||
+++ b/drivers/usb/host/dwc3-of-simple.c
|
||||
@@ -92,6 +92,7 @@ static int dwc3_of_simple_remove(struct udevice *dev)
|
||||
|
||||
static const struct udevice_id dwc3_of_simple_ids[] = {
|
||||
{ .compatible = "amlogic,meson-gxl-dwc3" },
|
||||
+ { .compatible = "rockchip,rk3399-dwc3" },
|
||||
{ .compatible = "ti,dwc3" },
|
||||
{ }
|
||||
};
|
||||
|
||||
From patchwork Sun Jun 30 16:01:55 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Mark Kettenis <kettenis@openbsd.org>
|
||||
X-Patchwork-Id: 1124934
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=openbsd.org
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45cFg20RQ2z9sBp
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 1 Jul 2019 02:03:57 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id BB0E3C21D8E; Sun, 30 Jun 2019 16:02:51 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable
|
||||
autolearn_force=no version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id D894FC21DC1;
|
||||
Sun, 30 Jun 2019 16:02:12 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id 5461AC21C27; Sun, 30 Jun 2019 16:02:07 +0000 (UTC)
|
||||
Received: from lb2-smtp-cloud9.xs4all.net (lb2-smtp-cloud9.xs4all.net
|
||||
[194.109.24.26])
|
||||
by lists.denx.de (Postfix) with ESMTPS id 05FE4C21C27
|
||||
for <u-boot@lists.denx.de>; Sun, 30 Jun 2019 16:02:07 +0000 (UTC)
|
||||
Received: from barber.sibelius.xs4all.nl ([83.163.83.176])
|
||||
by smtp-cloud9.xs4all.net with ESMTP
|
||||
id hcHChhlcYAOfNhcHGhinal; Sun, 30 Jun 2019 18:02:07 +0200
|
||||
From: Mark Kettenis <kettenis@openbsd.org>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Sun, 30 Jun 2019 18:01:55 +0200
|
||||
Message-Id: <20190630160156.51934-4-kettenis@openbsd.org>
|
||||
X-Mailer: git-send-email 2.21.0
|
||||
In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
References: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
MIME-Version: 1.0
|
||||
X-CMAE-Envelope: MS4wfLs+8eVNa+4q5xvZxgD/7JFk5FDJvpyZbd3cSrXacdnFSq2kAy8QdBLQqG7pFgMwbbkh/zgisVHcqIrbLR4AS1bVVdY9OiI3glthx583ANub4fv/+FYG
|
||||
p2vXmJ/g7+CCFcVSIOoJhY+thnwEIzY6/Azt309X5FXHFUhNyCIBYgwmeyfWokqW63nRuxAp4EwLljFsrFdd+RFtBY1nL3qyzpTszLkJg1yWdTar2dRe4svQ
|
||||
oKXYd53kLhrnEWbesbCU0A2fpCT0KpWLXQGntr26HUrGujJxrdYRV4v9LX7FF4B1E5SuWpr3TmT0h9a7Z8CVprD6p5ZwpVLJ1GjFlgQGHB97Y1CKq2I0khV6
|
||||
JLYxojKfL1uhNq0F7gI/5ImOsua0rw==
|
||||
Cc: Mark Kettenis <kettenis@openbsd.org>
|
||||
Subject: [U-Boot] [PATCH v2 3/4] usb: xhci-dwc3: Add USB2 PHY configuration
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
Configure USB2 PHY register based on "phy_type" property and
|
||||
handle all the quirks that are relevant for Rockchip RK3399 SoCs.
|
||||
|
||||
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
---
|
||||
drivers/usb/host/xhci-dwc3.c | 20 ++++++++++++++++++++
|
||||
1 file changed, 20 insertions(+)
|
||||
|
||||
diff --git a/drivers/usb/host/xhci-dwc3.c b/drivers/usb/host/xhci-dwc3.c
|
||||
index 83b9f119e7..9e8cae7ae4 100644
|
||||
--- a/drivers/usb/host/xhci-dwc3.c
|
||||
+++ b/drivers/usb/host/xhci-dwc3.c
|
||||
@@ -118,6 +118,8 @@ static int xhci_dwc3_probe(struct udevice *dev)
|
||||
struct dwc3 *dwc3_reg;
|
||||
enum usb_dr_mode dr_mode;
|
||||
struct xhci_dwc3_platdata *plat = dev_get_platdata(dev);
|
||||
+ const char *phy;
|
||||
+ u32 reg;
|
||||
int ret;
|
||||
|
||||
hccr = (struct xhci_hccr *)((uintptr_t)dev_read_addr(dev));
|
||||
@@ -132,6 +134,24 @@ static int xhci_dwc3_probe(struct udevice *dev)
|
||||
|
||||
dwc3_core_init(dwc3_reg);
|
||||
|
||||
+ /* Set dwc3 usb2 phy config */
|
||||
+ reg = readl(&dwc3_reg->g_usb2phycfg[0]);
|
||||
+
|
||||
+ phy = dev_read_string(dev, "phy_type");
|
||||
+ if (phy && strcmp(phy, "utmi_wide") == 0) {
|
||||
+ reg |= DWC3_GUSB2PHYCFG_PHYIF;
|
||||
+ reg &= ~DWC3_GUSB2PHYCFG_USBTRDTIM_MASK;
|
||||
+ reg |= DWC3_GUSB2PHYCFG_USBTRDTIM_16BIT;
|
||||
+ }
|
||||
+
|
||||
+ if (dev_read_bool(dev, "snps,dis_enblslpm-quirk"))
|
||||
+ reg &= ~DWC3_GUSB2PHYCFG_ENBLSLPM;
|
||||
+
|
||||
+ if (dev_read_bool(dev, "snps,dis-u2-freeclk-exists-quirk"))
|
||||
+ reg &= ~DWC3_GUSB2PHYCFG_U2_FREECLK_EXISTS;
|
||||
+
|
||||
+ writel(reg, &dwc3_reg->g_usb2phycfg[0]);
|
||||
+
|
||||
dr_mode = usb_get_dr_mode(dev_of_offset(dev));
|
||||
if (dr_mode == USB_DR_MODE_UNKNOWN)
|
||||
/* by default set dual role mode to HOST */
|
||||
|
||||
From patchwork Sun Jun 30 16:01:56 2019
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Mark Kettenis <kettenis@openbsd.org>
|
||||
X-Patchwork-Id: 1124935
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@bilbo.ozlabs.org
|
||||
Authentication-Results: ozlabs.org;
|
||||
spf=none (mailfrom) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=81.169.180.215; helo=lists.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de;
|
||||
receiver=<UNKNOWN>)
|
||||
Authentication-Results: ozlabs.org;
|
||||
dmarc=none (p=none dis=none) header.from=openbsd.org
|
||||
Received: from lists.denx.de (dione.denx.de [81.169.180.215])
|
||||
by ozlabs.org (Postfix) with ESMTP id 45cFgS2Mb4z9sBp
|
||||
for <incoming@patchwork.ozlabs.org>;
|
||||
Mon, 1 Jul 2019 02:04:20 +1000 (AEST)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id D32B4C21DD3; Sun, 30 Jun 2019 16:03:04 +0000 (UTC)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=0.0 required=5.0 tests=none autolearn=unavailable
|
||||
autolearn_force=no version=3.4.0
|
||||
Received: from lists.denx.de (localhost [IPv6:::1])
|
||||
by lists.denx.de (Postfix) with ESMTP id 5BF87C21E08;
|
||||
Sun, 30 Jun 2019 16:02:22 +0000 (UTC)
|
||||
Received: by lists.denx.de (Postfix, from userid 105)
|
||||
id EBB2FC21E2F; Sun, 30 Jun 2019 16:02:11 +0000 (UTC)
|
||||
Received: from lb3-smtp-cloud9.xs4all.net (lb3-smtp-cloud9.xs4all.net
|
||||
[194.109.24.30])
|
||||
by lists.denx.de (Postfix) with ESMTPS id 0D156C21DD7
|
||||
for <u-boot@lists.denx.de>; Sun, 30 Jun 2019 16:02:08 +0000 (UTC)
|
||||
Received: from barber.sibelius.xs4all.nl ([83.163.83.176])
|
||||
by smtp-cloud9.xs4all.net with ESMTP
|
||||
id hcHChhlcYAOfNhcHHhinbC; Sun, 30 Jun 2019 18:02:08 +0200
|
||||
From: Mark Kettenis <kettenis@openbsd.org>
|
||||
To: u-boot@lists.denx.de
|
||||
Date: Sun, 30 Jun 2019 18:01:56 +0200
|
||||
Message-Id: <20190630160156.51934-5-kettenis@openbsd.org>
|
||||
X-Mailer: git-send-email 2.21.0
|
||||
In-Reply-To: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
References: <20190630160156.51934-1-kettenis@openbsd.org>
|
||||
MIME-Version: 1.0
|
||||
X-CMAE-Envelope: MS4wfJt9aWnppnn1FrjUcIi+mVdSRXltWTpfX80VJftNdkow/RTDLd6RZhxL11k74NYLPOqe/UXQb2nIzkxqBuBVF3W1CvkWIgzYeNmbJTAbSmMsNnS491Uk
|
||||
prEsRguT84I6QPh+YWtHv2yd9XN9NF5OkpHj05XsG0kmkXk0lLv42fxlsheATPb7hRo4UrN94niQPmKEWbW7fbHZgiIpp3W8JZ9ei3TLOx+t1TdA6uz3mFki
|
||||
Xbwobdnaw3EpuVLHgTbKQWpdVl1n3+c2VK61rlNusZ+c8+ofBbSsiA3rybSGzm2gOBWDQiMrw05hTuZs2lluyqocc/i5dK+ODagwBGwH7IIgKBq2qMaKA6Sl
|
||||
ymPOVIvlveSrgV/bugKVyUGhkerl7A==
|
||||
Cc: Mark Kettenis <kettenis@openbsd.org>
|
||||
Subject: [U-Boot] [PATCH v2 4/4] rockchip: xhci: Remove RK3399 support
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.18
|
||||
Precedence: list
|
||||
List-Id: U-Boot discussion <u-boot.lists.denx.de>
|
||||
List-Unsubscribe: <https://lists.denx.de/options/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=unsubscribe>
|
||||
List-Archive: <http://lists.denx.de/pipermail/u-boot/>
|
||||
List-Post: <mailto:u-boot@lists.denx.de>
|
||||
List-Help: <mailto:u-boot-request@lists.denx.de?subject=help>
|
||||
List-Subscribe: <https://lists.denx.de/listinfo/u-boot>,
|
||||
<mailto:u-boot-request@lists.denx.de?subject=subscribe>
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
|
||||
Remove RK3399 compatible strings as this driver is no longer
|
||||
used on that SoC.
|
||||
|
||||
Signed-off-by: Mark Kettenis <kettenis@openbsd.org>
|
||||
Reviewed-by: Kever Yang <kever.yang@rock-chips.com>
|
||||
---
|
||||
drivers/usb/host/xhci-rockchip.c | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/drivers/usb/host/xhci-rockchip.c b/drivers/usb/host/xhci-rockchip.c
|
||||
index f19bea3a91..e7b0dbcca5 100644
|
||||
--- a/drivers/usb/host/xhci-rockchip.c
|
||||
+++ b/drivers/usb/host/xhci-rockchip.c
|
||||
@@ -167,7 +167,6 @@ static int xhci_usb_remove(struct udevice *dev)
|
||||
}
|
||||
|
||||
static const struct udevice_id xhci_usb_ids[] = {
|
||||
- { .compatible = "rockchip,rk3399-xhci" },
|
||||
{ .compatible = "rockchip,rk3328-xhci" },
|
||||
{ }
|
||||
};
|
||||
@@ -187,7 +186,6 @@ U_BOOT_DRIVER(usb_xhci) = {
|
||||
};
|
||||
|
||||
static const struct udevice_id usb_phy_ids[] = {
|
||||
- { .compatible = "rockchip,rk3399-usb3-phy" },
|
||||
{ .compatible = "rockchip,rk3328-usb3-phy" },
|
||||
{ }
|
||||
};
|
||||
@ -1,799 +0,0 @@
|
||||
From 15c14b923f29dc69d51964e63f4ed35a7ffcd97f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Fri, 28 Jun 2019 14:09:02 +0100
|
||||
Subject: [PATCH 1/6] arm64: rockchip: rock960: sync dts files from Linux
|
||||
5.2-rc6
|
||||
|
||||
Sync the dts files for the Rock960 boards from Linux to get the
|
||||
latest changes and fixes for the devices.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
arch/arm/dts/rk3399-ficus.dts | 92 ++++++++++++-
|
||||
arch/arm/dts/rk3399-rock960.dts | 91 +++++++++++-
|
||||
arch/arm/dts/rk3399-rock960.dtsi | 229 +++++++++++++++++++++++++------
|
||||
3 files changed, 366 insertions(+), 46 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/rk3399-ficus.dts b/arch/arm/dts/rk3399-ficus.dts
|
||||
index 4b2dd82b67..6b059bd7a0 100644
|
||||
--- a/arch/arm/dts/rk3399-ficus.dts
|
||||
+++ b/arch/arm/dts/rk3399-ficus.dts
|
||||
@@ -23,6 +23,52 @@
|
||||
clock-output-names = "clkin_gmac";
|
||||
#clock-cells = <0>;
|
||||
};
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>,
|
||||
+ <&user_led4>, <&wlan_led>, <&bt_led>;
|
||||
+
|
||||
+ user_led1 {
|
||||
+ label = "red:user1";
|
||||
+ gpios = <&gpio4 25 0>;
|
||||
+ linux,default-trigger = "heartbeat";
|
||||
+ };
|
||||
+
|
||||
+ user_led2 {
|
||||
+ label = "red:user2";
|
||||
+ gpios = <&gpio4 26 0>;
|
||||
+ linux,default-trigger = "mmc0";
|
||||
+ };
|
||||
+
|
||||
+ user_led3 {
|
||||
+ label = "red:user3";
|
||||
+ gpios = <&gpio4 30 0>;
|
||||
+ linux,default-trigger = "mmc1";
|
||||
+ };
|
||||
+
|
||||
+ user_led4 {
|
||||
+ label = "red:user4";
|
||||
+ gpios = <&gpio1 0 0>;
|
||||
+ panic-indicator;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ wlan_active_led {
|
||||
+ label = "red:wlan";
|
||||
+ gpios = <&gpio1 1 0>;
|
||||
+ linux,default-trigger = "phy0tx";
|
||||
+ default-state = "off";
|
||||
+ };
|
||||
+
|
||||
+ bt_active_led {
|
||||
+ label = "red:bt";
|
||||
+ gpios = <&gpio1 4 0>;
|
||||
+ linux,default-trigger = "hci0-power";
|
||||
+ default-state = "off";
|
||||
+ };
|
||||
+ };
|
||||
};
|
||||
|
||||
&gmac {
|
||||
@@ -49,23 +95,63 @@
|
||||
gmac {
|
||||
rgmii_sleep_pins: rgmii-sleep-pins {
|
||||
rockchip,pins =
|
||||
- <3 15 RK_FUNC_GPIO &pcfg_output_low>;
|
||||
+ <3 RK_PB7 RK_FUNC_GPIO &pcfg_output_low>;
|
||||
};
|
||||
};
|
||||
|
||||
pcie {
|
||||
pcie_drv: pcie-drv {
|
||||
rockchip,pins =
|
||||
- <1 24 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ <1 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
|
||||
usb2 {
|
||||
host_vbus_drv: host-vbus-drv {
|
||||
rockchip,pins =
|
||||
- <4 27 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ <4 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
+
|
||||
+ leds {
|
||||
+ user_led1: user_led1 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led2: user_led2 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led3: user_led3 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led4: user_led4 {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PA0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ wlan_led: wlan_led {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PA1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ bt_led: bt_led {
|
||||
+ rockchip,pins =
|
||||
+ <1 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ dr_mode = "host";
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_1 {
|
||||
+ dr_mode = "host";
|
||||
};
|
||||
|
||||
&vcc3v3_pcie {
|
||||
diff --git a/arch/arm/dts/rk3399-rock960.dts b/arch/arm/dts/rk3399-rock960.dts
|
||||
index 7e06bc97e5..12285c51cc 100644
|
||||
--- a/arch/arm/dts/rk3399-rock960.dts
|
||||
+++ b/arch/arm/dts/rk3399-rock960.dts
|
||||
@@ -1,6 +1,6 @@
|
||||
-// SPDX-License-Identifier: GPL-2.0+
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
/*
|
||||
- * Copyright (C) 2018 Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
|
||||
+ * Copyright (c) 2018 Linaro Ltd.
|
||||
*/
|
||||
|
||||
/dts-v1/;
|
||||
@@ -13,6 +13,53 @@
|
||||
chosen {
|
||||
stdout-path = "serial2:1500000n8";
|
||||
};
|
||||
+
|
||||
+ leds {
|
||||
+ compatible = "gpio-leds";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&user_led1>, <&user_led2>, <&user_led3>,
|
||||
+ <&user_led4>, <&wlan_led>, <&bt_led>;
|
||||
+
|
||||
+ user_led1 {
|
||||
+ label = "green:user1";
|
||||
+ gpios = <&gpio4 RK_PC2 0>;
|
||||
+ linux,default-trigger = "heartbeat";
|
||||
+ };
|
||||
+
|
||||
+ user_led2 {
|
||||
+ label = "green:user2";
|
||||
+ gpios = <&gpio4 RK_PC6 0>;
|
||||
+ linux,default-trigger = "mmc0";
|
||||
+ };
|
||||
+
|
||||
+ user_led3 {
|
||||
+ label = "green:user3";
|
||||
+ gpios = <&gpio4 RK_PD0 0>;
|
||||
+ linux,default-trigger = "mmc1";
|
||||
+ };
|
||||
+
|
||||
+ user_led4 {
|
||||
+ label = "green:user4";
|
||||
+ gpios = <&gpio4 RK_PD4 0>;
|
||||
+ panic-indicator;
|
||||
+ linux,default-trigger = "none";
|
||||
+ };
|
||||
+
|
||||
+ wlan_active_led {
|
||||
+ label = "yellow:wlan";
|
||||
+ gpios = <&gpio4 RK_PD5 0>;
|
||||
+ linux,default-trigger = "phy0tx";
|
||||
+ default-state = "off";
|
||||
+ };
|
||||
+
|
||||
+ bt_active_led {
|
||||
+ label = "blue:bt";
|
||||
+ gpios = <&gpio4 RK_PD6 0>;
|
||||
+ linux,default-trigger = "hci0-power";
|
||||
+ default-state = "off";
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
};
|
||||
|
||||
&pcie0 {
|
||||
@@ -20,6 +67,38 @@
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
+ leds {
|
||||
+ user_led1: user_led1 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PC2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led2: user_led2 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PC6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led3: user_led3 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD0 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ user_led4: user_led4 {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ wlan_led: wlan_led {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD5 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ bt_led: bt_led {
|
||||
+ rockchip,pins =
|
||||
+ <4 RK_PD6 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
pcie {
|
||||
pcie_drv: pcie-drv {
|
||||
rockchip,pins =
|
||||
@@ -35,6 +114,14 @@
|
||||
};
|
||||
};
|
||||
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ dr_mode = "otg";
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_1 {
|
||||
+ dr_mode = "host";
|
||||
+};
|
||||
+
|
||||
&vcc3v3_pcie {
|
||||
gpio = <&gpio2 5 GPIO_ACTIVE_HIGH>;
|
||||
};
|
||||
diff --git a/arch/arm/dts/rk3399-rock960.dtsi b/arch/arm/dts/rk3399-rock960.dtsi
|
||||
index 51644d6d02..c7d48d41e1 100644
|
||||
--- a/arch/arm/dts/rk3399-rock960.dtsi
|
||||
+++ b/arch/arm/dts/rk3399-rock960.dtsi
|
||||
@@ -1,13 +1,32 @@
|
||||
-// SPDX-License-Identifier: GPL-2.0+
|
||||
+// SPDX-License-Identifier: (GPL-2.0+ OR MIT)
|
||||
/*
|
||||
+ * Copyright (c) 2018 Collabora Ltd.
|
||||
+ * Copyright (c) 2018 Fuzhou Rockchip Electronics Co., Ltd.
|
||||
* Copyright (c) 2018 Linaro Ltd.
|
||||
*/
|
||||
|
||||
-#include <dt-bindings/pwm/pwm.h>
|
||||
-#include <dt-bindings/pinctrl/rockchip.h>
|
||||
#include "rk3399.dtsi"
|
||||
+#include "rk3399-opp.dtsi"
|
||||
|
||||
/ {
|
||||
+ sdio_pwrseq: sdio-pwrseq {
|
||||
+ compatible = "mmc-pwrseq-simple";
|
||||
+ clocks = <&rk808 1>;
|
||||
+ clock-names = "ext_clock";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&wifi_enable_h>;
|
||||
+ reset-gpios = <&gpio0 RK_PB2 GPIO_ACTIVE_LOW>;
|
||||
+ };
|
||||
+
|
||||
+ vcc12v_dcin: vcc12v-dcin {
|
||||
+ compatible = "regulator-fixed";
|
||||
+ regulator-name = "vcc12v_dcin";
|
||||
+ regulator-min-microvolt = <12000000>;
|
||||
+ regulator-max-microvolt = <12000000>;
|
||||
+ regulator-always-on;
|
||||
+ regulator-boot-on;
|
||||
+ };
|
||||
+
|
||||
vcc1v8_s0: vcc1v8-s0 {
|
||||
compatible = "regulator-fixed";
|
||||
regulator-name = "vcc1v8_s0";
|
||||
@@ -16,12 +35,13 @@
|
||||
regulator-always-on;
|
||||
};
|
||||
|
||||
- vcc_sys: vcc-sys {
|
||||
+ vcc5v0_sys: vcc5v0-sys {
|
||||
compatible = "regulator-fixed";
|
||||
- regulator-name = "vcc_sys";
|
||||
+ regulator-name = "vcc5v0_sys";
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
regulator-always-on;
|
||||
+ vin-supply = <&vcc12v_dcin>;
|
||||
};
|
||||
|
||||
vcc3v3_sys: vcc3v3-sys {
|
||||
@@ -30,7 +50,7 @@
|
||||
regulator-min-microvolt = <3300000>;
|
||||
regulator-max-microvolt = <3300000>;
|
||||
regulator-always-on;
|
||||
- vin-supply = <&vcc_sys>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
|
||||
vcc3v3_pcie: vcc3v3-pcie-regulator {
|
||||
@@ -54,20 +74,8 @@
|
||||
regulator-min-microvolt = <5000000>;
|
||||
regulator-max-microvolt = <5000000>;
|
||||
regulator-always-on;
|
||||
- vin-supply = <&vcc_sys>;
|
||||
- };
|
||||
-
|
||||
- vdd_log: vdd-log {
|
||||
- compatible = "pwm-regulator";
|
||||
- pwms = <&pwm2 0 25000 0>;
|
||||
- regulator-name = "vdd_log";
|
||||
- regulator-min-microvolt = <800000>;
|
||||
- regulator-max-microvolt = <1400000>;
|
||||
- regulator-always-on;
|
||||
- regulator-boot-on;
|
||||
- vin-supply = <&vcc_sys>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
};
|
||||
-
|
||||
};
|
||||
|
||||
&cpu_l0 {
|
||||
@@ -98,7 +106,19 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&gpu {
|
||||
+ mali-supply = <&vdd_gpu>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&hdmi {
|
||||
+ ddc-i2c-bus = <&i2c3>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&hdmi_cec>;
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&hdmi_sound {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
@@ -118,7 +138,7 @@
|
||||
regulator-ramp-delay = <1000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
- vin-supply = <&vcc_sys>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
status = "okay";
|
||||
|
||||
regulator-state-mem {
|
||||
@@ -136,7 +156,7 @@
|
||||
regulator-ramp-delay = <1000>;
|
||||
regulator-always-on;
|
||||
regulator-boot-on;
|
||||
- vin-supply = <&vcc_sys>;
|
||||
+ vin-supply = <&vcc5v0_sys>;
|
||||
regulator-state-mem {
|
||||
regulator-off-in-suspend;
|
||||
};
|
||||
@@ -154,16 +174,16 @@
|
||||
#clock-cells = <1>;
|
||||
clock-output-names = "xin32k", "rk808-clkout2";
|
||||
|
||||
- vcc1-supply = <&vcc_sys>;
|
||||
- vcc2-supply = <&vcc_sys>;
|
||||
- vcc3-supply = <&vcc_sys>;
|
||||
- vcc4-supply = <&vcc_sys>;
|
||||
- vcc6-supply = <&vcc_sys>;
|
||||
- vcc7-supply = <&vcc_sys>;
|
||||
+ vcc1-supply = <&vcc5v0_sys>;
|
||||
+ vcc2-supply = <&vcc5v0_sys>;
|
||||
+ vcc3-supply = <&vcc5v0_sys>;
|
||||
+ vcc4-supply = <&vcc5v0_sys>;
|
||||
+ vcc6-supply = <&vcc5v0_sys>;
|
||||
+ vcc7-supply = <&vcc5v0_sys>;
|
||||
vcc8-supply = <&vcc3v3_sys>;
|
||||
- vcc9-supply = <&vcc_sys>;
|
||||
- vcc10-supply = <&vcc_sys>;
|
||||
- vcc11-supply = <&vcc_sys>;
|
||||
+ vcc9-supply = <&vcc5v0_sys>;
|
||||
+ vcc10-supply = <&vcc5v0_sys>;
|
||||
+ vcc11-supply = <&vcc5v0_sys>;
|
||||
vcc12-supply = <&vcc3v3_sys>;
|
||||
vddio-supply = <&vcc_1v8>;
|
||||
|
||||
@@ -344,6 +364,10 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&i2s2 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&io_domains {
|
||||
bt656-supply = <&vcc1v8_s0>; /* bt656_gpio2ab_ms */
|
||||
audio-supply = <&vcc1v8_s0>; /* audio_gpio3d4a_ms */
|
||||
@@ -370,45 +394,92 @@
|
||||
};
|
||||
|
||||
&pinctrl {
|
||||
+ bt {
|
||||
+ bt_enable_h: bt-enable-h {
|
||||
+ rockchip,pins = <0 RK_PB1 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ bt_host_wake_l: bt-host-wake-l {
|
||||
+ rockchip,pins = <0 RK_PA4 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+
|
||||
+ bt_wake_l: bt-wake-l {
|
||||
+ rockchip,pins = <2 RK_PD3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
sdmmc {
|
||||
sdmmc_bus1: sdmmc-bus1 {
|
||||
rockchip,pins =
|
||||
- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>;
|
||||
+ <4 RK_PB0 1 &pcfg_pull_up_8ma>;
|
||||
};
|
||||
|
||||
sdmmc_bus4: sdmmc-bus4 {
|
||||
rockchip,pins =
|
||||
- <4 8 RK_FUNC_1 &pcfg_pull_up_8ma>,
|
||||
- <4 9 RK_FUNC_1 &pcfg_pull_up_8ma>,
|
||||
- <4 10 RK_FUNC_1 &pcfg_pull_up_8ma>,
|
||||
- <4 11 RK_FUNC_1 &pcfg_pull_up_8ma>;
|
||||
+ <4 RK_PB0 1 &pcfg_pull_up_8ma>,
|
||||
+ <4 RK_PB1 1 &pcfg_pull_up_8ma>,
|
||||
+ <4 RK_PB2 1 &pcfg_pull_up_8ma>,
|
||||
+ <4 RK_PB3 1 &pcfg_pull_up_8ma>;
|
||||
};
|
||||
|
||||
sdmmc_clk: sdmmc-clk {
|
||||
rockchip,pins =
|
||||
- <4 12 RK_FUNC_1 &pcfg_pull_none_18ma>;
|
||||
+ <4 RK_PB4 1 &pcfg_pull_none_18ma>;
|
||||
};
|
||||
|
||||
sdmmc_cmd: sdmmc-cmd {
|
||||
rockchip,pins =
|
||||
- <4 13 RK_FUNC_1 &pcfg_pull_up_8ma>;
|
||||
+ <4 RK_PB5 1 &pcfg_pull_up_8ma>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sdio0 {
|
||||
+ sdio0_bus4: sdio0-bus4 {
|
||||
+ rockchip,pins =
|
||||
+ <2 RK_PC4 1 &pcfg_pull_up_20ma>,
|
||||
+ <2 RK_PC5 1 &pcfg_pull_up_20ma>,
|
||||
+ <2 RK_PC6 1 &pcfg_pull_up_20ma>,
|
||||
+ <2 RK_PC7 1 &pcfg_pull_up_20ma>;
|
||||
+ };
|
||||
+
|
||||
+ sdio0_cmd: sdio0-cmd {
|
||||
+ rockchip,pins =
|
||||
+ <2 RK_PD0 1 &pcfg_pull_up_20ma>;
|
||||
+ };
|
||||
+
|
||||
+ sdio0_clk: sdio0-clk {
|
||||
+ rockchip,pins =
|
||||
+ <2 RK_PD1 1 &pcfg_pull_none_20ma>;
|
||||
};
|
||||
};
|
||||
|
||||
pmic {
|
||||
pmic_int_l: pmic-int-l {
|
||||
rockchip,pins =
|
||||
- <1 21 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
+ <1 RK_PC5 RK_FUNC_GPIO &pcfg_pull_up>;
|
||||
};
|
||||
|
||||
vsel1_gpio: vsel1-gpio {
|
||||
rockchip,pins =
|
||||
- <1 17 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
+ <1 RK_PC1 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
};
|
||||
|
||||
vsel2_gpio: vsel2-gpio {
|
||||
rockchip,pins =
|
||||
- <1 14 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
+ <1 RK_PB6 RK_FUNC_GPIO &pcfg_pull_down>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ sdio-pwrseq {
|
||||
+ wifi_enable_h: wifi-enable-h {
|
||||
+ rockchip,pins =
|
||||
+ <0 RK_PB2 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
+ };
|
||||
+ };
|
||||
+
|
||||
+ wifi {
|
||||
+ wifi_host_wake_l: wifi-host-wake-l {
|
||||
+ rockchip,pins = <0 RK_PA3 RK_FUNC_GPIO &pcfg_pull_none>;
|
||||
};
|
||||
};
|
||||
};
|
||||
@@ -421,6 +492,32 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&sdio0 {
|
||||
+ bus-width = <4>;
|
||||
+ clock-frequency = <50000000>;
|
||||
+ cap-sdio-irq;
|
||||
+ cap-sd-highspeed;
|
||||
+ keep-power-in-suspend;
|
||||
+ mmc-pwrseq = <&sdio_pwrseq>;
|
||||
+ non-removable;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&sdio0_bus4 &sdio0_cmd &sdio0_clk>;
|
||||
+ sd-uhs-sdr104;
|
||||
+ #address-cells = <1>;
|
||||
+ #size-cells = <0>;
|
||||
+ status = "okay";
|
||||
+
|
||||
+ brcmf: wifi@1 {
|
||||
+ compatible = "brcm,bcm4329-fmac";
|
||||
+ reg = <1>;
|
||||
+ interrupt-parent = <&gpio0>;
|
||||
+ interrupts = <RK_PA3 GPIO_ACTIVE_HIGH>;
|
||||
+ interrupt-names = "host-wake";
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&wifi_host_wake_l>;
|
||||
+ };
|
||||
+};
|
||||
+
|
||||
&sdhci {
|
||||
bus-width = <8>;
|
||||
mmc-hs400-1_8v;
|
||||
@@ -445,16 +542,42 @@
|
||||
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>;
|
||||
+ pinctrl-0 = <&uart0_xfer &uart0_cts &uart0_rts>;
|
||||
status = "okay";
|
||||
+
|
||||
+ bluetooth {
|
||||
+ compatible = "brcm,bcm43438-bt";
|
||||
+ clocks = <&rk808 1>;
|
||||
+ clock-names = "ext_clock";
|
||||
+ device-wakeup-gpios = <&gpio2 RK_PD3 GPIO_ACTIVE_HIGH>;
|
||||
+ host-wakeup-gpios = <&gpio0 RK_PA4 GPIO_ACTIVE_HIGH>;
|
||||
+ shutdown-gpios = <&gpio0 RK_PB1 GPIO_ACTIVE_HIGH>;
|
||||
+ pinctrl-names = "default";
|
||||
+ pinctrl-0 = <&bt_host_wake_l &bt_wake_l &bt_enable_h>;
|
||||
+ };
|
||||
};
|
||||
|
||||
&uart2 {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&tcphy0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&tcphy1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&u2phy0 {
|
||||
status = "okay";
|
||||
};
|
||||
@@ -497,10 +620,34 @@
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&usbdrd3_0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_0 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usbdrd3_1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
+&usbdrd_dwc3_1 {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&vopb {
|
||||
status = "okay";
|
||||
};
|
||||
|
||||
+&vopb_mmu {
|
||||
+ status = "okay";
|
||||
+};
|
||||
+
|
||||
&vopl {
|
||||
status = "okay";
|
||||
};
|
||||
+
|
||||
+&vopl_mmu {
|
||||
+ status = "okay";
|
||||
+};
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 66584f08b1a1eb122d4796d6923ac317bdf3c8ca Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 09:24:55 +0100
|
||||
Subject: [PATCH 2/6] configs: rockchip: rock960: drop options for non-existent
|
||||
HW
|
||||
|
||||
The Rock960 doesn't contain SPI flash so drop related config options.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rock960-rk3399_defconfig | 2 --
|
||||
1 file changed, 2 deletions(-)
|
||||
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index 1958b7e190..1aa986e9cd 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -21,7 +21,6 @@ CONFIG_SYS_PROMPT="rock960 => "
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
CONFIG_CMD_GPT=y
|
||||
CONFIG_CMD_MMC=y
|
||||
-CONFIG_CMD_SF=y
|
||||
CONFIG_CMD_USB=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TIME=y
|
||||
@@ -35,7 +34,6 @@ CONFIG_MMC_DW=y
|
||||
CONFIG_MMC_DW_ROCKCHIP=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||||
-CONFIG_SF_DEFAULT_SPEED=20000000
|
||||
CONFIG_PMIC_RK8XX=y
|
||||
CONFIG_REGULATOR_PWM=y
|
||||
CONFIG_REGULATOR_RK8XX=y
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From d9f234f28a17adad9f4b08114965815516605271 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 09:57:29 +0100
|
||||
Subject: [PATCH 3/6] configs: rockchip: rock960: enable pmic and regulator
|
||||
commands
|
||||
|
||||
We have both PMIC and Regulator functionality so it's useful to
|
||||
be able to see output and debug with the commands enabled.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rock960-rk3399_defconfig | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index 1aa986e9cd..2381f0cd7e 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -21,6 +21,8 @@ CONFIG_SYS_PROMPT="rock960 => "
|
||||
CONFIG_CMD_BOOTZ=y
|
||||
CONFIG_CMD_GPT=y
|
||||
CONFIG_CMD_MMC=y
|
||||
+CONFIG_CMD_PMIC=y
|
||||
+CONFIG_CMD_REGULATOR=y
|
||||
CONFIG_CMD_USB=y
|
||||
# CONFIG_CMD_SETEXPR is not set
|
||||
CONFIG_CMD_TIME=y
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 08cf06897ef382f4568568ea4210e41ed4ae19e2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 10:29:56 +0100
|
||||
Subject: [PATCH 4/6] configs: rockchip: rock960: enable DMA for SDHCI
|
||||
controller
|
||||
|
||||
Enable the SDMA controller so the eMMC connected to the SDHCI
|
||||
controller (sdhci@fe330000) can make use of it.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rock960-rk3399_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index 2381f0cd7e..20c9cdeda3 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -35,6 +35,7 @@ CONFIG_SYS_I2C_ROCKCHIP=y
|
||||
CONFIG_MMC_DW=y
|
||||
CONFIG_MMC_DW_ROCKCHIP=y
|
||||
CONFIG_MMC_SDHCI=y
|
||||
+CONFIG_MMC_SDHCI_SDMA=y
|
||||
CONFIG_MMC_SDHCI_ROCKCHIP=y
|
||||
CONFIG_PMIC_RK8XX=y
|
||||
CONFIG_REGULATOR_PWM=y
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 1340f50ee63727804cf7634b3679fe4208c8576f Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 10:43:01 +0100
|
||||
Subject: [PATCH 5/6] configs: rockchip: rock960: Add support for USB ethernet
|
||||
adapters
|
||||
|
||||
As the Rock960 doesn't have an onboard wired ethernet interface
|
||||
it's useful to have some common USB wired ethernet devices added
|
||||
to enable testing.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rock960-rk3399_defconfig | 7 +++++++
|
||||
1 file changed, 7 insertions(+)
|
||||
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index 20c9cdeda3..90115e903b 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -48,5 +48,12 @@ CONFIG_USB=y
|
||||
CONFIG_USB_EHCI_HCD=y
|
||||
CONFIG_USB_EHCI_GENERIC=y
|
||||
CONFIG_ROCKCHIP_USB2_PHY=y
|
||||
+CONFIG_DM_ETH=y
|
||||
+CONFIG_USB_HOST_ETHER=y
|
||||
+CONFIG_USB_ETHER_ASIX88179=y
|
||||
+CONFIG_USB_ETHER_ASIX=y
|
||||
+CONFIG_USB_ETHER_MCS7830=y
|
||||
+CONFIG_USB_ETHER_RTL8152=y
|
||||
+CONFIG_USB_ETHER_SMSC95XX=y
|
||||
CONFIG_USE_TINY_PRINTF=y
|
||||
CONFIG_ERRNO_STR=y
|
||||
--
|
||||
2.21.0
|
||||
|
||||
From 1bb09008d279c533f4fd76697aa396d63c10ed58 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sat, 29 Jun 2019 18:34:57 +0100
|
||||
Subject: [PATCH 6/6] configs: rockchip: rock960: enable USB3 support
|
||||
|
||||
Enable USB3 support via the dwc3 XHCI driver.
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/rock960-rk3399_defconfig | 3 +++
|
||||
1 file changed, 3 insertions(+)
|
||||
|
||||
diff --git a/configs/rock960-rk3399_defconfig b/configs/rock960-rk3399_defconfig
|
||||
index 90115e903b..5be36383e1 100644
|
||||
--- a/configs/rock960-rk3399_defconfig
|
||||
+++ b/configs/rock960-rk3399_defconfig
|
||||
@@ -55,5 +55,8 @@ CONFIG_USB_ETHER_ASIX=y
|
||||
CONFIG_USB_ETHER_MCS7830=y
|
||||
CONFIG_USB_ETHER_RTL8152=y
|
||||
CONFIG_USB_ETHER_SMSC95XX=y
|
||||
+CONFIG_USB_XHCI_HCD=y
|
||||
+CONFIG_USB_XHCI_DWC3=y
|
||||
+# CONFIG_USB_XHCI_ROCKCHIP is not set
|
||||
CONFIG_USE_TINY_PRINTF=y
|
||||
CONFIG_ERRNO_STR=y
|
||||
--
|
||||
2.21.0
|
||||
|
||||
2
sources
2
sources
@ -1 +1 @@
|
||||
SHA512 (u-boot-2019.07.tar.bz2) = 879abf0c8773bfcdcbe7f28fc68e2b4369bcb74e276d95d510a9b2d1707e63eb01d82e304ba5a6a570552bc18bc593f27ba9b518bafa1d8f8e5bc83cf107c023
|
||||
SHA512 (u-boot-2019.10-rc2.tar.bz2) = 5a9173a1bd945736c8e0c1797b4c8fdd9833fc4e04d6b0e562c2018884da9bc10c110231b690450fb2761e19cd19ab24fc8744000c901f416ba2936c8278799e
|
||||
|
||||
@ -1,8 +1,8 @@
|
||||
#global candidate rc4
|
||||
%global candidate rc2
|
||||
|
||||
Name: uboot-tools
|
||||
Version: 2019.07
|
||||
Release: 3%{?candidate:.%{candidate}}%{?dist}
|
||||
Version: 2019.10
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
@ -26,10 +26,6 @@ Patch6: rpi-Enable-using-the-DT-provided-by-the-Raspberry-Pi.patch
|
||||
Patch7: dragonboard-fixes.patch
|
||||
Patch8: ARM-tegra-Add-NVIDIA-Jetson-Nano.patch
|
||||
Patch9: arm-tegra-defaine-fdtfile-for-all-devices.patch
|
||||
Patch10: rockchip-rk3399-Fix-USB3-support.patch
|
||||
Patch11: rockchip-rock960.patch
|
||||
Patch12: rock960-Enable-booting-from-eMMC-when-using-SPL.patch
|
||||
Patch13: Raspberry-Pi-32-64-support.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: dtc
|
||||
@ -265,6 +261,9 @@ cp -p board/warp7/README builds/docs/README.warp7
|
||||
%endif
|
||||
|
||||
%changelog
|
||||
* Wed Aug 14 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.10-0.1-rc2
|
||||
- 2019.10 RC2
|
||||
|
||||
* Sun Aug 4 2019 Peter Robinson <pbrobinson@fedoraproject.org> 2019.07-3
|
||||
- Fixes for Rock960
|
||||
- Iniital Raspberry Pi 4 support
|
||||
|
||||
Loading…
Reference in New Issue
Block a user