From d245dbb379a8a206e1caf823b8229b91037b7469 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Tue, 20 Dec 2022 03:51:10 +0000 Subject: [PATCH] drop upstreamed PBP patch --- ...not-initialize-i2c-before-relocation.patch | 148 ------------------ uboot-tools.spec | 1 - 2 files changed, 149 deletions(-) delete mode 100644 rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch diff --git a/rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch b/rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch deleted file mode 100644 index c7a1992..0000000 --- a/rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch +++ /dev/null @@ -1,148 +0,0 @@ -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 -X-Patchwork-Id: 1711682 -X-Patchwork-Delegate: ykai007@gmail.com -Return-Path: -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=) -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 ; 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 ; 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 -To: u-boot@lists.denx.de -Cc: Michal Suchanek , Simon Glass , - Philipp Tomsich , - Kever Yang , - Peter Robinson -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 -List-Unsubscribe: , - -List-Archive: -List-Post: -List-Help: -List-Subscribe: , - -Errors-To: u-boot-bounces@lists.denx.de -Sender: "U-Boot" -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 ---- - -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; diff --git a/uboot-tools.spec b/uboot-tools.spec index d0de0e0..409e35b 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -29,7 +29,6 @@ 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: rockchip-Pinebook-Pro-Do-not-initialize-i2c-before-relocation.patch BuildRequires: bc BuildRequires: bison