2023.01 RC3
This commit is contained in:
Peter Robinson
parent
8bcd936f72
commit
70b0c177c3
|
|
@ -1,92 +0,0 @@
|
|||
From 17096f20920205200b88d6d8facdbef0d3d3d3e8 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Sun, 4 Sep 2022 22:22:50 +0100
|
||||
Subject: [PATCH] Revert "power: pmic: rk8xx: Support sysreset shutdown method"
|
||||
|
||||
This reverts commit ad607512f5757f4485968efd5bcf2c0245a8a235.
|
||||
---
|
||||
drivers/power/pmic/rk8xx.c | 50 +-------------------------------------
|
||||
1 file changed, 1 insertion(+), 49 deletions(-)
|
||||
|
||||
diff --git a/drivers/power/pmic/rk8xx.c b/drivers/power/pmic/rk8xx.c
|
||||
index 25ef621f8df..8d703112c38 100644
|
||||
--- a/drivers/power/pmic/rk8xx.c
|
||||
+++ b/drivers/power/pmic/rk8xx.c
|
||||
@@ -6,50 +6,10 @@
|
||||
|
||||
#include <common.h>
|
||||
#include <dm.h>
|
||||
-#include <dm/lists.h>
|
||||
#include <errno.h>
|
||||
#include <log.h>
|
||||
#include <power/rk8xx_pmic.h>
|
||||
#include <power/pmic.h>
|
||||
-#include <sysreset.h>
|
||||
-
|
||||
-static int rk8xx_sysreset_request(struct udevice *dev, enum sysreset_t type)
|
||||
-{
|
||||
- struct rk8xx_priv *priv = dev_get_priv(dev->parent);
|
||||
-
|
||||
- if (type != SYSRESET_POWER_OFF)
|
||||
- return -EPROTONOSUPPORT;
|
||||
-
|
||||
- switch (priv->variant) {
|
||||
- case RK805_ID:
|
||||
- case RK808_ID:
|
||||
- case RK816_ID:
|
||||
- case RK818_ID:
|
||||
- pmic_clrsetbits(dev->parent, REG_DEVCTRL, 0, BIT(0));
|
||||
- break;
|
||||
- case RK809_ID:
|
||||
- case RK817_ID:
|
||||
- pmic_clrsetbits(dev->parent, RK817_REG_SYS_CFG3, 0,
|
||||
- BIT(0));
|
||||
- break;
|
||||
- default:
|
||||
- printf("Unknown PMIC RK%x: Cannot shutdown\n",
|
||||
- priv->variant);
|
||||
- return -EPROTONOSUPPORT;
|
||||
- };
|
||||
-
|
||||
- return -EINPROGRESS;
|
||||
-}
|
||||
-
|
||||
-static struct sysreset_ops rk8xx_sysreset_ops = {
|
||||
- .request = rk8xx_sysreset_request,
|
||||
-};
|
||||
-
|
||||
-U_BOOT_DRIVER(rk8xx_sysreset) = {
|
||||
- .name = "rk8xx_sysreset",
|
||||
- .id = UCLASS_SYSRESET,
|
||||
- .ops = &rk8xx_sysreset_ops,
|
||||
-};
|
||||
|
||||
/* In the event of a plug-in and the appropriate option has been
|
||||
* selected, we simply shutdown instead of continue the normal boot
|
||||
@@ -133,7 +93,7 @@ static int rk8xx_read(struct udevice *dev, uint reg, uint8_t *buff, int len)
|
||||
static int rk8xx_bind(struct udevice *dev)
|
||||
{
|
||||
ofnode regulators_node;
|
||||
- int children, ret;
|
||||
+ int children;
|
||||
|
||||
regulators_node = dev_read_subnode(dev, "regulators");
|
||||
if (!ofnode_valid(regulators_node)) {
|
||||
@@ -144,14 +104,6 @@ static int rk8xx_bind(struct udevice *dev)
|
||||
|
||||
debug("%s: '%s' - found regulators subnode\n", __func__, dev->name);
|
||||
|
||||
- if (CONFIG_IS_ENABLED(SYSRESET)) {
|
||||
- ret = device_bind_driver_to_node(dev, "rk8xx_sysreset",
|
||||
- "rk8xx_sysreset",
|
||||
- dev_ofnode(dev), NULL);
|
||||
- if (ret)
|
||||
- return ret;
|
||||
- }
|
||||
-
|
||||
children = pmic_bind_children(dev, regulators_node, pmic_children_info);
|
||||
if (!children)
|
||||
debug("%s: %s - no child found\n", __func__, dev->name);
|
||||
--
|
||||
2.37.3
|
||||
|
||||
|
|
@ -1,25 +0,0 @@
|
|||
From 11ff7f20123629bb4271db41a170e9ad69126dc2 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Robinson <pbrobinson@gmail.com>
|
||||
Date: Thu, 24 Nov 2022 13:39:05 +0000
|
||||
Subject: [PATCH] add VIDEO_LOGO to tools-only to build bmp_logo
|
||||
|
||||
Signed-off-by: Peter Robinson <pbrobinson@gmail.com>
|
||||
---
|
||||
configs/tools-only_defconfig | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
|
||||
index 86464d2f075..c3b3b387818 100644
|
||||
--- a/configs/tools-only_defconfig
|
||||
+++ b/configs/tools-only_defconfig
|
||||
@@ -27,6 +27,7 @@ CONFIG_DM_RTC=y
|
||||
CONFIG_SOUND=y
|
||||
CONFIG_SYSRESET=y
|
||||
CONFIG_TIMER=y
|
||||
+CONFIG_VIDEO=y
|
||||
# CONFIG_VIRTIO_MMIO is not set
|
||||
# CONFIG_VIRTIO_PCI is not set
|
||||
# CONFIG_VIRTIO_SANDBOX is not set
|
||||
--
|
||||
2.38.1
|
||||
|
||||
|
|
@ -0,0 +1,148 @@
|
|||
From patchwork Sat Dec 3 12:31:29 2022
|
||||
Content-Type: text/plain; charset="utf-8"
|
||||
MIME-Version: 1.0
|
||||
Content-Transfer-Encoding: 7bit
|
||||
X-Patchwork-Submitter: Michal Suchanek <msuchanek@suse.de>
|
||||
X-Patchwork-Id: 1711682
|
||||
X-Patchwork-Delegate: ykai007@gmail.com
|
||||
Return-Path: <u-boot-bounces@lists.denx.de>
|
||||
X-Original-To: incoming@patchwork.ozlabs.org
|
||||
Delivered-To: patchwork-incoming@legolas.ozlabs.org
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
spf=pass (sender SPF authorized) smtp.mailfrom=lists.denx.de
|
||||
(client-ip=2a01:238:438b:c500:173d:9f52:ddab:ee01; helo=phobos.denx.de;
|
||||
envelope-from=u-boot-bounces@lists.denx.de; receiver=<UNKNOWN>)
|
||||
Authentication-Results: legolas.ozlabs.org;
|
||||
dkim=pass (1024-bit key;
|
||||
unprotected) header.d=suse.de header.i=@suse.de header.a=rsa-sha256
|
||||
header.s=susede2_rsa header.b=wxtn4xc3;
|
||||
dkim=pass header.d=suse.de header.i=@suse.de header.a=ed25519-sha256
|
||||
header.s=susede2_ed25519 header.b=ITqbCEv6;
|
||||
dkim-atps=neutral
|
||||
Received: from phobos.denx.de (phobos.denx.de
|
||||
[IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
|
||||
key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384)
|
||||
(No client certificate requested)
|
||||
by legolas.ozlabs.org (Postfix) with ESMTPS id 4NPThH74WSz23mf
|
||||
for <incoming@patchwork.ozlabs.org>; Sat, 3 Dec 2022 23:31:43 +1100 (AEDT)
|
||||
Received: from h2850616.stratoserver.net (localhost [IPv6:::1])
|
||||
by phobos.denx.de (Postfix) with ESMTP id 70D68810F9;
|
||||
Sat, 3 Dec 2022 13:31:39 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=pass (p=none dis=none) header.from=suse.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dkim=pass (1024-bit key;
|
||||
unprotected) header.d=suse.de header.i=@suse.de header.b="wxtn4xc3";
|
||||
dkim=permerror (0-bit key) header.d=suse.de header.i=@suse.de
|
||||
header.b="ITqbCEv6";
|
||||
dkim-atps=neutral
|
||||
Received: by phobos.denx.de (Postfix, from userid 109)
|
||||
id 7B90681581; Sat, 3 Dec 2022 13:31:37 +0100 (CET)
|
||||
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on phobos.denx.de
|
||||
X-Spam-Level:
|
||||
X-Spam-Status: No, score=-2.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
|
||||
DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,SPF_HELO_NONE,SPF_PASS
|
||||
autolearn=ham autolearn_force=no version=3.4.2
|
||||
Received: from smtp-out1.suse.de (smtp-out1.suse.de
|
||||
[IPv6:2001:67c:2178:6::1c])
|
||||
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits))
|
||||
(No client certificate requested)
|
||||
by phobos.denx.de (Postfix) with ESMTPS id 5AD2380FF4
|
||||
for <u-boot@lists.denx.de>; Sat, 3 Dec 2022 13:31:35 +0100 (CET)
|
||||
Authentication-Results: phobos.denx.de;
|
||||
dmarc=pass (p=none dis=none) header.from=suse.de
|
||||
Authentication-Results: phobos.denx.de;
|
||||
spf=pass smtp.mailfrom=msuchanek@suse.de
|
||||
Received: from relay2.suse.de (relay2.suse.de [149.44.160.134])
|
||||
by smtp-out1.suse.de (Postfix) with ESMTP id 1F15E21BBE;
|
||||
Sat, 3 Dec 2022 12:31:35 +0000 (UTC)
|
||||
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=suse.de;
|
||||
s=susede2_rsa;
|
||||
t=1670070695;
|
||||
h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
|
||||
mime-version:mime-version:
|
||||
content-transfer-encoding:content-transfer-encoding;
|
||||
bh=MxiYvt7AyD2raveb0nYOqctq9SwZhhFlUOQQnvLVaQg=;
|
||||
b=wxtn4xc3CKeoPgie/R/AdIrpA2ywBATIqA9KAfa1GEXdWlIf74tVDuaz5iMJ6BpeskOSl2
|
||||
nLeJEQA332T9Aqr4B56t0lQVfOXL5KgwD6soHX23k0CyNtimBjQflyDa7qPsrlB71ZXEow
|
||||
vE4Uuu65zoYtywT4VY23ipPBExIch5c=
|
||||
DKIM-Signature: v=1; a=ed25519-sha256; c=relaxed/relaxed; d=suse.de;
|
||||
s=susede2_ed25519; t=1670070695;
|
||||
h=from:from:reply-to:date:date:message-id:message-id:to:to:cc:cc:
|
||||
mime-version:mime-version:
|
||||
content-transfer-encoding:content-transfer-encoding;
|
||||
bh=MxiYvt7AyD2raveb0nYOqctq9SwZhhFlUOQQnvLVaQg=;
|
||||
b=ITqbCEv62X454NT22kzCNg+NOS6Iu0cxcF+xhUtLc6CDIy3Cv4GXp20Wi7qIeywhmkKMLT
|
||||
bzobwsBrib9t1NDw==
|
||||
Received: from naga.suse.cz (unknown [10.100.224.114])
|
||||
by relay2.suse.de (Postfix) with ESMTP id 719FC2C141;
|
||||
Sat, 3 Dec 2022 12:31:34 +0000 (UTC)
|
||||
From: Michal Suchanek <msuchanek@suse.de>
|
||||
To: u-boot@lists.denx.de
|
||||
Cc: Michal Suchanek <msuchanek@suse.de>, Simon Glass <sjg@chromium.org>,
|
||||
Philipp Tomsich <philipp.tomsich@vrull.eu>,
|
||||
Kever Yang <kever.yang@rock-chips.com>,
|
||||
Peter Robinson <pbrobinson@gmail.com>
|
||||
Subject: [PATCH] rockchip: Pinebook Pro: Do not initialize i2c before
|
||||
relocation
|
||||
Date: Sat, 3 Dec 2022 13:31:29 +0100
|
||||
Message-Id: <20221203123129.27645-1-msuchanek@suse.de>
|
||||
X-Mailer: git-send-email 2.38.1
|
||||
MIME-Version: 1.0
|
||||
X-BeenThere: u-boot@lists.denx.de
|
||||
X-Mailman-Version: 2.1.39
|
||||
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: <https://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>
|
||||
Errors-To: u-boot-bounces@lists.denx.de
|
||||
Sender: "U-Boot" <u-boot-bounces@lists.denx.de>
|
||||
X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de
|
||||
X-Virus-Status: Clean
|
||||
|
||||
The i2c locks up when initialized before relocation, and it stays broken
|
||||
in Linux as well breaking the ability to boot Linux.
|
||||
|
||||
The i2c bus and pmic was not actually used in pre-reloc before
|
||||
commit ad607512f575 ("power: pmic: rk8xx: Support sysreset shutdown method")
|
||||
|
||||
The cause is not known.
|
||||
|
||||
This is board-specific, other boards that do not add the option to
|
||||
include the i2c bus in pre-reloc DT are not affected.
|
||||
|
||||
Signed-off-by: Michal Suchanek <msuchanek@suse.de>
|
||||
---
|
||||
|
||||
This is not tested, my board does not currentl;y boot at all, YMMV
|
||||
---
|
||||
arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi | 8 --------
|
||||
1 file changed, 8 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
||||
index 2d87bea933..fd87102c0b 100644
|
||||
--- a/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
||||
+++ b/arch/arm/dts/rk3399-pinebook-pro-u-boot.dtsi
|
||||
@@ -20,14 +20,6 @@
|
||||
rockchip,panel = <&edp_panel>;
|
||||
};
|
||||
|
||||
-&i2c0 {
|
||||
- u-boot,dm-pre-reloc;
|
||||
-};
|
||||
-
|
||||
-&rk808 {
|
||||
- u-boot,dm-pre-reloc;
|
||||
-};
|
||||
-
|
||||
&sdhci {
|
||||
max-frequency = <25000000>;
|
||||
u-boot,dm-pre-reloc;
|
||||
2
sources
2
sources
|
|
@ -1 +1 @@
|
|||
SHA512 (u-boot-2023.01-rc2.tar.bz2) = fd3c25db53c59ec2a101955582a5e240b178e7e3e29e9a0070687411ff5bbe0f2bb1bb398198572ba9724870482c947432bc5256da7f7761bed693e8c613b433
|
||||
SHA512 (u-boot-2023.01-rc3.tar.bz2) = fe48fbe285003b44095f420355919cb0a69613bdf17483c6fcace387f079b590a4ae4258813d676d1a84476853b70096287516e618bffb4702ee7f160ec3f764
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
%global candidate rc2
|
||||
%global candidate rc3
|
||||
%if 0%{?rhel}
|
||||
%bcond_with toolsonly
|
||||
%else
|
||||
|
|
@ -7,7 +7,7 @@
|
|||
|
||||
Name: uboot-tools
|
||||
Version: 2023.01
|
||||
Release: 0.1%{?candidate:.%{candidate}}%{?dist}
|
||||
Release: 0.2%{?candidate:.%{candidate}}%{?dist}
|
||||
Summary: U-Boot utilities
|
||||
License: GPLv2+ BSD LGPL-2.1+ LGPL-2.0+
|
||||
URL: http://www.denx.de/wiki/U-Boot
|
||||
|
|
@ -29,8 +29,7 @@ Patch5: rpi-bcm2835_sdhost-firmware-managed-clock.patch
|
|||
Patch6: rpi-Copy-properties-from-firmware-DT-to-loaded-DT.patch
|
||||
# Rockchips improvements
|
||||
Patch7: rockchip-Add-initial-support-for-the-PinePhone-Pro.patch
|
||||
Patch8: 0001-Revert-power-pmic-rk8xx-Support-sysreset-shutdown-me.patch
|
||||
Patch9: 0001-add-VIDEO_LOGO-to-tools-only-to-build-bmp_logo.patch
|
||||
Patch8: rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch
|
||||
|
||||
BuildRequires: bc
|
||||
BuildRequires: bison
|
||||
|
|
@ -213,6 +212,9 @@ cp -p board/sunxi/README.nand builds/docs/README.sunxi-nand
|
|||
%endif
|
||||
|
||||
%changelog
|
||||
* Mon Dec 05 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.2.rc3
|
||||
- Update to 2023.01 RC3
|
||||
|
||||
* Thu Nov 24 2022 Peter Robinson <pbrobinson@fedoraproject.org> - 2023.01-0.1.rc2
|
||||
- Update to U-Boot 2023.01 RC2
|
||||
- Update Pinephone Pro patches
|
||||
|
|
|
|||
Loading…
Reference in New Issue